awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename netwmicon to focusicon

This commit is contained in:
Julien Danjou 2008-02-06 20:13:41 +01:00
parent ffbcea0084
commit 170ed9882a
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -28,7 +28,7 @@ WIDGETS += widgets/taglist.c
WIDGETS += widgets/layoutinfo.c WIDGETS += widgets/layoutinfo.c
WIDGETS += widgets/textbox.c WIDGETS += widgets/textbox.c
WIDGETS += widgets/iconbox.c WIDGETS += widgets/iconbox.c
WIDGETS += widgets/netwmicon.c WIDGETS += widgets/focusicon.c
WIDGETS += widgets/progressbar.c WIDGETS += widgets/progressbar.c
WIDGETS += widgets/tasklist.c WIDGETS += widgets/tasklist.c
WIDGETS += widgets/graph.c WIDGETS += widgets/graph.c

4
awesomerc.1.txt
View File

@ -153,7 +153,7 @@ This widget shows a icon for the selected layout.
*y*:: *y*::
Vertical offset (auto-alignment if not set). Vertical offset (auto-alignment if not set).
netwmicon focusicon
~~~~~~~~~ ~~~~~~~~~
This widget shows a icon for the focused window using NET_WM_ICON or icon file set in rule. This widget shows a icon for the focused window using NET_WM_ICON or icon file set in rule.
@ -394,7 +394,7 @@ screen <integer> [MULTI]
command = <uicb-cmd> arg = <uicb-arg> command = <uicb-cmd> arg = <uicb-arg>
} }
} }
netwmicon <identifier> focusicon <identifier>
{ {
x = <integer> y = <integer> x = <integer> y = <integer>
mouse [MULTI] mouse [MULTI]

2
common/configopts.c
View File

@ -171,7 +171,7 @@ cfg_opt_t statusbar_opts[] =
CFG_SEC((char *) "taglist", widget_taglist_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 *) "layoutinfo", widget_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 *) "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), CFG_SEC((char *) "focusicon", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES),
CFG_SEC((char *) "progressbar", widget_progressbar_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "progressbar", widget_progressbar_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES),
CFG_SEC((char *) "graph", widget_graph_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "graph", widget_graph_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES),
CFG_SEC((char *) "tasklist", widget_tasklist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "tasklist", widget_tasklist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES),

2
widget.h
View File

@ -43,7 +43,7 @@ WidgetConstructor layoutinfo_new;
WidgetConstructor taglist_new; WidgetConstructor taglist_new;
WidgetConstructor textbox_new; WidgetConstructor textbox_new;
WidgetConstructor iconbox_new; WidgetConstructor iconbox_new;
WidgetConstructor netwmicon_new; WidgetConstructor focusicon_new;
WidgetConstructor progressbar_new; WidgetConstructor progressbar_new;
WidgetConstructor graph_new; WidgetConstructor graph_new;
WidgetConstructor tasklist_new; WidgetConstructor tasklist_new;

12
widgets/netwmicon.c → widgets/focusicon.c
View File

@ -1,5 +1,5 @@
/* /*
* netwmicon.c - NET_WM_ICON widget * focusicon.c - focused window icon widget
* *
* Copyright © 2007-2008 Julien Danjou <julien@danjou.info> * Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
* *
@ -19,19 +19,17 @@
* *
*/ */
#include <X11/Xmd.h>
#include <X11/Xatom.h>
#include "focus.h" #include "focus.h"
#include "tag.h" #include "tag.h"
#include "widget.h" #include "widget.h"
#include "rules.h" #include "rules.h"
#include "ewmh.h" #include "ewmh.h"
#include "common/util.h"
extern AwesomeConf globalconf; extern AwesomeConf globalconf;
static int static int
netwmicon_draw(Widget *widget, DrawCtx *ctx, int offset, focusicon_draw(Widget *widget, DrawCtx *ctx, int offset,
int used __attribute__ ((unused))) int used __attribute__ ((unused)))
{ {
Area area; Area area;
@ -95,13 +93,13 @@ netwmicon_draw(Widget *widget, DrawCtx *ctx, int offset,
} }
Widget * Widget *
netwmicon_new(Statusbar *statusbar, cfg_t *config) focusicon_new(Statusbar *statusbar, cfg_t *config)
{ {
Widget *w; Widget *w;
w = p_new(Widget, 1); w = p_new(Widget, 1);
widget_common_new(w, statusbar, config); widget_common_new(w, statusbar, config);
w->draw = netwmicon_draw; w->draw = focusicon_draw;
/* Set cache property */ /* Set cache property */
w->cache.flags = WIDGET_CACHE_CLIENTS; w->cache.flags = WIDGET_CACHE_CLIENTS;