diff --git a/Makefile.am b/Makefile.am index 4ab74cff..5391465b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,6 @@ WIDGETS = WIDGETS += widgets/taglist.c WIDGETS += widgets/layoutinfo.c WIDGETS += widgets/textbox.c -WIDGETS += widgets/focustitle.c WIDGETS += widgets/iconbox.c WIDGETS += widgets/netwmicon.c WIDGETS += widgets/progressbar.c diff --git a/awesomerc.1.txt b/awesomerc.1.txt index 004695e3..3a48d34e 100644 --- a/awesomerc.1.txt +++ b/awesomerc.1.txt @@ -164,25 +164,6 @@ This widget shows a icon for the focused window using NET_WM_ICON or icon file *y*:: Vertical offset (auto-alignment if not set). -focustitle -~~~~~~~~~~ -This widget shows the title of the focused window. - -*mouse*:: - Set mouse bindings. -*font*:: - Font to use. -*bg*:: - Background color. -*fg*:: - Foreground color. -*align*:: - Text alignement. -*x*:: - Horizontal offset (auto-alignment if not set). -*y*:: - Vertical offset (auto-alignment if not set). - tasklist ~~~~~~~~ This widget shows a list of running windows. @@ -422,19 +403,6 @@ screen [MULTI] command = arg = } } - focustitle - { - fg = - bg = - font = - align = <{center,left,right}> - x = y = - mouse [MULTI] - { - button = modkey = {, ...} - command = arg = - } - } tasklist { fg = diff --git a/common/configopts.c b/common/configopts.c index 0912f14d..9bbff2a9 100644 --- a/common/configopts.c +++ b/common/configopts.c @@ -103,17 +103,6 @@ cfg_opt_t widget_textbox_opts[] = CFG_STR((char *) "align", (char *) "center", CFGF_NONE), CFG_END() }; -cfg_opt_t widget_focustitle_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "align", (char *) "left", CFGF_NONE), - CFG_END() -}; cfg_opt_t widget_tasklist_opts[] = { CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), @@ -180,7 +169,6 @@ cfg_opt_t statusbar_opts[] = CFG_INT((char *) "width", 0, CFGF_NONE), CFG_SEC((char *) "textbox", widget_textbox_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "taglist", widget_taglist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "focustitle", widget_focustitle_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "layoutinfo", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "iconbox", widget_iconbox_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "netwmicon", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), diff --git a/widget.h b/widget.h index 32e61b4b..a832e9a7 100644 --- a/widget.h +++ b/widget.h @@ -42,7 +42,6 @@ void widget_common_new(Widget*, Statusbar *, cfg_t *); WidgetConstructor layoutinfo_new; WidgetConstructor taglist_new; WidgetConstructor textbox_new; -WidgetConstructor focustitle_new; WidgetConstructor iconbox_new; WidgetConstructor netwmicon_new; WidgetConstructor progressbar_new; diff --git a/widgets/focustitle.c b/widgets/focustitle.c deleted file mode 100644 index c072bde8..00000000 --- a/widgets/focustitle.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * focustitle.c - focus title widget - * - * Copyright © 2007 Aldo Cortesi - * Copyright © 2007-2008 Julien Danjou - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include -#include "widget.h" -#include "layout.h" -#include "tag.h" -#include "focus.h" -#include "screen.h" -#include "common/util.h" - -extern AwesomeConf globalconf; - -typedef struct -{ - Alignment align; - XColor fg; - XColor bg; -} Data; - -static int -focustitle_draw(Widget *widget, DrawCtx *ctx, int offset, int used) -{ - Data *d = widget->data; - Client *sel = focus_get_current_client(widget->statusbar->screen); - - if(!widget->user_supplied_x) - widget->area.x = widget_calculate_offset(widget->statusbar->width, - 0, - offset, - widget->alignment); - - if(!widget->user_supplied_y) - widget->area.y = 0; - - widget->area.width = widget->statusbar->width - used; - widget->area.height = widget->statusbar->height; - - if(sel) - { - draw_text(ctx, widget->area, - d->align, - widget->font->height / 2, widget->font, sel->name, - d->fg, d->bg); - if(sel->isfloating || sel->ismax) - draw_circle(ctx, widget->area.x, widget->area.y, - (widget->font->height + 2) / 4, - sel->ismax, d->fg); - } - else - draw_rectangle(ctx, widget->area, True, d->bg); - - return widget->area.width; -} - -Widget * -focustitle_new(Statusbar *statusbar, cfg_t *config) -{ - Widget *w; - Data *d; - char *buf; - int phys_screen = get_phys_screen(statusbar->screen); - - w = p_new(Widget, 1); - widget_common_new(w, statusbar, config); - w->draw = focustitle_draw; - w->alignment = AlignFlex; - w->data = d = p_new(Data, 1); - - if((buf = cfg_getstr(config, "fg"))) - d->fg = draw_color_new(globalconf.display, phys_screen, buf); - else - d->fg = globalconf.screens[statusbar->screen].colors_selected[ColFG]; - - if((buf = cfg_getstr(config, "bg"))) - d->bg = draw_color_new(globalconf.display, phys_screen, buf); - else - d->bg = globalconf.screens[statusbar->screen].colors_selected[ColBG]; - - d->align = draw_get_align(cfg_getstr(config, "align")); - - if((buf = cfg_getstr(config, "font"))) - w->font = XftFontOpenName(globalconf.display, get_phys_screen(statusbar->screen), buf); - - if(!w->font) - w->font = globalconf.screens[statusbar->screen].font; - - /* Set cache property */ - w->cache.flags = WIDGET_CACHE_CLIENTS | WIDGET_CACHE_TAGS; - - return w; -} - -// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80