It was not defined here (nor I would want to use it) and the feature
was of dubious usefulness.
Keeping these 600+ lines of #ifdef'ed code for no good reason is not worth it.
As a side effect, src/framewin.c becomes more readable.
---
src/WindowMaker.h | 8 --
src/def_pixmaps.h | 4 -
src/dialog.c | 9 --
src/event.c | 5 -
src/extend_pixmaps.h | 117 ---------------------
src/framewin.c | 283 ++------------------------------------------------
src/framewin.h | 63 +-----------
src/screen.c | 18 ---
src/wconfig.h.in | 8 --
src/wdefaults.c | 15 ---
src/window.c | 78 --------------
src/window.h | 16 ---
src/winspector.c | 43 +--------
13 files changed, 16 insertions(+), 651 deletions(-)
delete mode 100644 src/extend_pixmaps.h
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 1a5b323..b7e7e10 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -107,15 +107,7 @@ typedef enum {
#define WBUT_BROKENCLOSE 1
#define WBUT_ICONIFY 2
#define WBUT_KILL 3
-#ifdef XKB_BUTTON_HINT
-#define WBUT_XKBGROUP1 4
-#define WBUT_XKBGROUP2 5
-#define WBUT_XKBGROUP3 6
-#define WBUT_XKBGROUP4 7
-#define PRED_BPIXMAPS 8 /* reserved for 4 groups */
-#else
#define PRED_BPIXMAPS 4 /* count of WBUT icons */
-#endif /* XKB_BUTTON_HINT */
/* cursors */
#define WCUR_DEFAULT 0
diff --git a/src/def_pixmaps.h b/src/def_pixmaps.h
index 07c8b6b..9f02414 100644
--- a/src/def_pixmaps.h
+++ b/src/def_pixmaps.h
@@ -97,8 +97,4 @@ static char *PRED_ICONIFY_XPM[] = {
".........."
};
-#ifdef XKB_BUTTON_HINT
-#include "extend_pixmaps.h"
-#endif /* XKB_BUTTON_HINT */
-
diff --git a/src/dialog.c b/src/dialog.c
index 6ee0703..752732b 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1314,9 +1314,6 @@ void wShowInfoPanel(WScreen * scr)
WSETUFLAG(wwin, no_closable, 0);
WSETUFLAG(wwin, no_close_button, 0);
-#ifdef XKB_BUTTON_HINT
- wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON);
-#endif
wWindowUpdateButtonImages(wwin);
wFrameWindowShowButton(wwin->frame, WFF_RIGHT_BUTTON);
wwin->frame->on_click_right = destroyInfoPanel;
@@ -1415,9 +1412,6 @@ void wShowLegalPanel(WScreen * scr)
WSETUFLAG(wwin, no_close_button, 0);
wWindowUpdateButtonImages(wwin);
wFrameWindowShowButton(wwin->frame, WFF_RIGHT_BUTTON);
-#ifdef XKB_BUTTON_HINT
- wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON);
-#endif
wwin->frame->on_click_right = destroyLegalPanel;
panel->wwin = wwin;
@@ -1806,9 +1800,6 @@ void wShowGNUstepPanel(WScreen * scr)
WSETUFLAG(wwin, no_close_button, 0);
wWindowUpdateButtonImages(wwin);
wFrameWindowShowButton(wwin->frame, WFF_RIGHT_BUTTON);
-#ifdef XKB_BUTTON_HINT
- wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON);
-#endif
wwin->frame->on_click_right = destroyGNUstepPanel;
panel->wwin = wwin;
diff --git a/src/event.c b/src/event.c
index 633f58e..979ce4c 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1194,11 +1194,6 @@ handleXkbIndicatorStateNotify(XEvent * event)
wwin->frame->last_languagemode =
wwin->frame->languagemode;
wwin->frame->languagemode = staterec.group;
}
-#ifdef XKB_BUTTON_HINT
- if (wwin->frame->titlebar) {
- wFrameWindowPaint(wwin->frame);
- }
-#endif
}
}
}
diff --git a/src/extend_pixmaps.h b/src/extend_pixmaps.h
deleted file mode 100644
index 8b735e5..0000000
--- a/src/extend_pixmaps.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "wconfig.h"
-
-static char *PRED_XKBGROUP1_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "........##",
- ".......###",
- "..########",
- "..########",
- "......####",
- ".....#####",
- "..########",
- "..########",
- "........##",
- "........##"
-};
-
-#ifdef LANGUAGE_TH
-static char *PRED_XKBGROUP2_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "#..###..##",
- ".#..#.#..#",
- ".#...###..",
- "#...####..",
- "##..####..",
- "##..####..",
- "##..####..",
- "##..####..",
- "##..####..",
- "##.#####.#"
-};
-#elif defined LANGUAGE_SK
-static char *PRED_XKBGROUP2_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "####..####",
- "####..####",
- "##......##",
- "##......##",
- "####..####",
- "#........#",
- "#........#",
- "####..####",
- "###....###",
- "##......##"};
-#elif defined LANGUAGE_EL
-static char *PRED_XKBGROUP2_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "##..######",
- "##..##....",
- "......####",
- "##..##....",
- "##..######",
- "..........",
- "##########",
- "..........",
- "##########",
- "##########"};
-#else
-static char *PRED_XKBGROUP2_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "##########",
- "#...##...#",
- "..........",
- "..........",
- "..........",
- "..........",
- "#........#",
- "##......##",
- "###....###",
- "####..####"
-};
-#endif
-
-static char *PRED_XKBGROUP3_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "..........",
- "..........",
- "..##..##..",
- "..##..##..",
- "..........",
- "..........",
- "..######..",
- "...####...",
- "....##....",
- ".........."
-};
-
-static char *PRED_XKBGROUP4_XPM[] = {
- " 10 10 2 1",
- ". c #000000",
- "# c None",
- "..........",
- ".########.",
- ".#..##..#.",
- ".#..##..#.",
- ".########.",
- ".#......#.",
- ".##....##.",
- ".###..###.",
- ".########.",
- ".........."
-};
-
-
-
-
diff --git a/src/framewin.c b/src/framewin.c
index 4a8893c..03d51e5 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -145,15 +145,6 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int
flags)
if (fwin->left_button) {
wCoreConfigure(fwin->left_button, 0, 0,
bsize, bsize);
}
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- if (fwin->flags.hide_left_button ||
!fwin->left_button
- || fwin->flags.lbutton_dont_fit) {
-
wCoreConfigure(fwin->language_button, 0, 0, bsize, bsize);
- } else {
-
wCoreConfigure(fwin->language_button, bsize, 0, bsize, bsize);
- }
-#endif
if (fwin->right_button) {
wCoreConfigure(fwin->right_button,
width - bsize + 1, 0, bsize, bsize);
@@ -162,12 +153,6 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int
flags)
if (fwin->left_button) {
wCoreConfigure(fwin->left_button, 3,
(theight - bsize) / 2, bsize, bsize);
}
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button) {
- wCoreConfigure(fwin->language_button, 6
+ bsize, (theight - bsize) / 2,
- bsize, bsize);
- }
-#endif
if (fwin->right_button) {
wCoreConfigure(fwin->right_button,
width - bsize - 3,
@@ -182,21 +167,12 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int
flags)
if (wPreferences.new_style) {
FREE_PIXMAP(fwin->lbutton_back[i]);
FREE_PIXMAP(fwin->rbutton_back[i]);
-#ifdef XKB_BUTTON_HINT
-
FREE_PIXMAP(fwin->languagebutton_back[i]);
-#endif
}
}
if (fwin->left_button)
wCoreDestroy(fwin->left_button);
fwin->left_button = NULL;
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- wCoreDestroy(fwin->language_button);
- fwin->language_button = NULL;
-#endif
-
if (fwin->right_button)
wCoreDestroy(fwin->right_button);
fwin->right_button = NULL;
@@ -238,33 +214,6 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int
flags)
}
}
}
-#ifdef XKB_BUTTON_HINT
- if (flags & WFF_LANGUAGE_BUTTON) {
- fwin->flags.language_button = 1;
- if (wPreferences.new_style) {
- fwin->language_button =
wCoreCreate(fwin->core, bsize, 0, bsize, bsize);
-
- if (width < theight * 4) {
-
fwin->flags.languagebutton_dont_fit = 1;
- } else {
- XMapRaised(dpy,
fwin->language_button->window);
- }
- } else {
- fwin->language_button =
- wCoreCreate(fwin->titlebar, bsize +
6, (theight - bsize) / 2,
- bsize, bsize);
-
- XSetWindowBackground(dpy,
fwin->language_button->window,
-
scr->widget_texture->normal.pixel);
-
- if (width < theight * 3) {
-
fwin->flags.languagebutton_dont_fit = 1;
- } else {
- XMapRaised(dpy,
fwin->language_button->window);
- }
- }
- }
-#endif
if (flags & WFF_RIGHT_BUTTON) {
fwin->flags.right_button = 1;
@@ -362,14 +311,6 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int
flags)
fwin->left_button->descriptor.parent_type = WCLASS_FRAME;
fwin->left_button->descriptor.handle_mousedown =
buttonMouseDown;
}
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button) {
- fwin->language_button->descriptor.handle_expose =
handleButtonExpose;
- fwin->language_button->descriptor.parent = fwin;
- fwin->language_button->descriptor.parent_type = WCLASS_FRAME;
- fwin->language_button->descriptor.handle_mousedown =
buttonMouseDown;
- }
-#endif
if (fwin->right_button) {
fwin->right_button->descriptor.parent = fwin;
@@ -388,11 +329,6 @@ void wFrameWindowDestroy(WFrameWindow * fwin)
if (fwin->left_button)
wCoreDestroy(fwin->left_button);
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- wCoreDestroy(fwin->language_button);
-#endif
-
if (fwin->right_button)
wCoreDestroy(fwin->right_button);
@@ -413,9 +349,6 @@ void wFrameWindowDestroy(WFrameWindow * fwin)
FREE_PIXMAP(fwin->title_back[i]);
if (wPreferences.new_style) {
FREE_PIXMAP(fwin->lbutton_back[i]);
-#ifdef XKB_BUTTON_HINT
- FREE_PIXMAP(fwin->languagebutton_back[i]);
-#endif
FREE_PIXMAP(fwin->rbutton_back[i]);
}
}
@@ -447,44 +380,11 @@ static void updateTitlebar(WFrameWindow * fwin)
if (wPreferences.new_style) {
if (fwin->flags.hide_left_button || !fwin->left_button ||
fwin->flags.lbutton_dont_fit) {
x = 0;
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- wCoreConfigure(fwin->language_button, 0, 0,
- fwin->language_button->width,
fwin->language_button->width);
-#endif
} else {
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- wCoreConfigure(fwin->language_button,
fwin->left_button->width, 0,
- fwin->language_button->width,
fwin->language_button->width);
-#endif
x = fwin->left_button->width;
w -= fwin->left_button->width;
}
-#ifdef XKB_BUTTON_HINT
- if (fwin->flags.hide_language_button || !fwin->language_button
- || fwin->flags.languagebutton_dont_fit) {
- } else {
- x += fwin->language_button->width;
- w -= fwin->language_button->width;
- }
-#endif
}
-#ifdef XKB_BUTTON_HINT
- else {
- int bsize = theight - 7;
- if (fwin->flags.hide_left_button || !fwin->left_button ||
fwin->flags.lbutton_dont_fit) {
- if (fwin->language_button)
- wCoreConfigure(fwin->language_button, 3,
(theight - bsize) / 2,
- fwin->language_button->width,
fwin->language_button->width);
- } else {
- if (fwin->language_button)
- wCoreConfigure(fwin->language_button,
- 6 + fwin->left_button->width,
(theight - bsize) / 2,
- fwin->language_button->width,
fwin->language_button->width);
- }
- }
-#endif
if (wPreferences.new_style) {
if (!fwin->flags.hide_right_button && fwin->right_button &&
!fwin->flags.rbutton_dont_fit) {
@@ -509,23 +409,13 @@ void wFrameWindowHideButton(WFrameWindow * fwin, int
flags)
XUnmapWindow(dpy, fwin->left_button->window);
fwin->flags.hide_left_button = 1;
}
-#ifdef XKB_BUTTON_HINT
- if ((flags & WFF_LANGUAGE_BUTTON) && fwin->language_button) {
- XUnmapWindow(dpy, fwin->language_button->window);
- fwin->flags.hide_language_button = 1;
- }
-#endif
if (fwin->titlebar) {
if (wPreferences.new_style) {
updateTitlebar(fwin);
} else {
-#ifdef XKB_BUTTON_HINT
- updateTitlebar(fwin);
-#else
XClearWindow(dpy, fwin->titlebar->window);
wFrameWindowPaint(fwin);
-#endif
}
checkTitleSize(fwin);
}
@@ -540,15 +430,6 @@ void wFrameWindowShowButton(WFrameWindow * fwin, int flags)
fwin->flags.hide_right_button = 0;
}
-#ifdef XKB_BUTTON_HINT
- if ((flags & WFF_LANGUAGE_BUTTON) && fwin->language_button &&
fwin->flags.hide_language_button) {
-
- if (!fwin->flags.languagebutton_dont_fit)
- XMapWindow(dpy, fwin->language_button->window);
-
- fwin->flags.hide_language_button = 0;
- }
-#endif
if ((flags & WFF_LEFT_BUTTON) && fwin->left_button &&
fwin->flags.hide_left_button) {
@@ -569,29 +450,17 @@ void wFrameWindowShowButton(WFrameWindow * fwin, int
flags)
}
}
-static void
-#ifdef XKB_BUTTON_HINT
-renderTexture(WScreen * scr, WTexture * texture, int width, int height,
- int bwidth, int bheight, int left, int language, int right,
- Pixmap * title, Pixmap * lbutton, Pixmap * languagebutton, Pixmap
* rbutton)
-#else
-renderTexture(WScreen * scr, WTexture * texture, int width, int height,
- int bwidth, int bheight, int left, int right, Pixmap * title,
Pixmap * lbutton, Pixmap * rbutton)
-#endif
+static void renderTexture(WScreen *scr, WTexture *texture, int width, int
height,
+ int bwidth, int bheight, int left, int right, Pixmap
*title,
+ Pixmap *lbutton, Pixmap *rbutton)
{
RImage *img;
RImage *limg, *rimg, *mimg;
-#ifdef XKB_BUTTON_HINT
- RImage *timg;
-#endif
int x, w;
*title = None;
*lbutton = None;
*rbutton = None;
-#ifdef XKB_BUTTON_HINT
- *languagebutton = None;
-#endif
img = wTextureRenderImage(texture, width, height, WREL_FLAT);
if (!img) {
@@ -608,13 +477,6 @@ renderTexture(WScreen * scr, WTexture * texture, int
width, int height,
x = 0;
w = img->width;
-#ifdef XKB_BUTTON_HINT
- if (language) {
- timg = RGetSubImage(img, bwidth * left, 0, bwidth,
bheight);
- } else
- timg = NULL;
-#endif
-
if (limg) {
RBevelImage(limg, RBEV_RAISED2);
if (!RConvertImage(scr->rcontext, limg, lbutton)) {
@@ -624,17 +486,6 @@ renderTexture(WScreen * scr, WTexture * texture, int
width, int height,
w -= limg->width;
RReleaseImage(limg);
}
-#ifdef XKB_BUTTON_HINT
- if (timg) {
- RBevelImage(timg, RBEV_RAISED2);
- if (!RConvertImage(scr->rcontext, timg,
languagebutton)) {
- wwarning(_("error rendering image:%s"),
RMessageForError(RErrorCode));
- }
- x += timg->width;
- w -= timg->width;
- RReleaseImage(timg);
- }
-#endif
if (right) {
rimg = RGetSubImage(img, width - bwidth, 0, bwidth,
bheight);
@@ -654,30 +505,27 @@ renderTexture(WScreen * scr, WTexture * texture, int
width, int height,
mimg = RGetSubImage(img, x, 0, w, img->height);
RBevelImage(mimg, RBEV_RAISED2);
- if (!RConvertImage(scr->rcontext, mimg, title)) {
+ if (!RConvertImage(scr->rcontext, mimg, title))
wwarning(_("error rendering image:%s"),
RMessageForError(RErrorCode));
- }
RReleaseImage(mimg);
} else {
RBevelImage(img, RBEV_RAISED2);
- if (!RConvertImage(scr->rcontext, img, title)) {
+ if (!RConvertImage(scr->rcontext, img, title))
wwarning(_("error rendering image:%s"),
RMessageForError(RErrorCode));
- }
}
} else {
RBevelImage(img, RBEV_RAISED2);
- if (!RConvertImage(scr->rcontext, img, title)) {
+ if (!RConvertImage(scr->rcontext, img, title))
wwarning(_("error rendering image:%s"),
RMessageForError(RErrorCode));
- }
}
RReleaseImage(img);
}
-static void
-renderResizebarTexture(WScreen * scr, WTexture * texture, int width, int
height, int cwidth, Pixmap * pmap)
+static void renderResizebarTexture(WScreen *scr, WTexture *texture, int width,
+ int height, int cwidth, Pixmap *pmap)
{
RImage *img;
RColor light;
@@ -735,13 +583,6 @@ static void updateTexture(WFrameWindow * fwin)
XSetWindowBackgroundPixmap(dpy,
fwin->left_button->window,
fwin->lbutton_back[i]);
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button &&
fwin->languagebutton_back[i]) {
- XSetWindowBackgroundPixmap(dpy,
fwin->language_button->window,
-
fwin->languagebutton_back[i]);
- }
-#endif
-
if (fwin->right_button && fwin->rbutton_back[i])
XSetWindowBackgroundPixmap(dpy,
fwin->right_button->window,
fwin->rbutton_back[i]);
@@ -752,10 +593,7 @@ static void updateTexture(WFrameWindow * fwin)
if (wPreferences.new_style) {
if (fwin->left_button)
XSetWindowBackground(dpy,
fwin->left_button->window, pixel);
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- XSetWindowBackground(dpy,
fwin->language_button->window, pixel);
-#endif
+
if (fwin->right_button)
XSetWindowBackground(dpy,
fwin->right_button->window, pixel);
}
@@ -766,12 +604,7 @@ static void updateTexture(WFrameWindow * fwin)
XClearWindow(dpy, fwin->left_button->window);
handleButtonExpose(&fwin->left_button->descriptor,
NULL);
}
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button) {
- XClearWindow(dpy, fwin->language_button->window);
- handleButtonExpose(&fwin->language_button->descriptor,
NULL);
- }
-#endif
+
if (fwin->right_button) {
XClearWindow(dpy, fwin->right_button->window);
handleButtonExpose(&fwin->right_button->descriptor,
NULL);
@@ -779,60 +612,37 @@ static void updateTexture(WFrameWindow * fwin)
}
}
-static void remakeTexture(WFrameWindow * fwin, int state)
+static void remakeTexture(WFrameWindow *fwin, int state)
{
Pixmap pmap, lpmap, rpmap;
-#ifdef XKB_BUTTON_HINT
- Pixmap tpmap;
-#endif
if (fwin->title_texture[state] && fwin->titlebar) {
FREE_PIXMAP(fwin->title_back[state]);
if (wPreferences.new_style) {
FREE_PIXMAP(fwin->lbutton_back[state]);
FREE_PIXMAP(fwin->rbutton_back[state]);
-#ifdef XKB_BUTTON_HINT
- FREE_PIXMAP(fwin->languagebutton_back[state]);
-#endif
}
if (fwin->title_texture[state]->any.type != WTEX_SOLID) {
int left, right;
int width;
-#ifdef XKB_BUTTON_HINT
- int language;
-#endif
/* eventually surrounded by if new_style */
left = fwin->left_button &&
!fwin->flags.hide_left_button && !fwin->flags.lbutton_dont_fit;
-#ifdef XKB_BUTTON_HINT
- language = fwin->language_button &&
!fwin->flags.hide_language_button
- && !fwin->flags.languagebutton_dont_fit;
-#endif
right = fwin->right_button &&
!fwin->flags.hide_right_button
&& !fwin->flags.rbutton_dont_fit;
width = fwin->core->width + 1;
-#ifdef XKB_BUTTON_HINT
- renderTexture(fwin->screen_ptr,
fwin->title_texture[state],
- width, fwin->titlebar->height,
- fwin->titlebar->height,
fwin->titlebar->height,
- left, language, right, &pmap, &lpmap,
&tpmap, &rpmap);
-#else
renderTexture(fwin->screen_ptr,
fwin->title_texture[state],
width, fwin->titlebar->height,
fwin->titlebar->height,
fwin->titlebar->height,
left, right, &pmap, &lpmap, &rpmap);
-#endif
fwin->title_back[state] = pmap;
if (wPreferences.new_style) {
fwin->lbutton_back[state] = lpmap;
fwin->rbutton_back[state] = rpmap;
-#ifdef XKB_BUTTON_HINT
- fwin->languagebutton_back[state] = tpmap;
-#endif
}
}
}
@@ -952,22 +762,11 @@ void wFrameWindowPaint(WFrameWindow * fwin)
else
allButtons = 0;
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button &&
!fwin->flags.hide_language_button
- && !fwin->flags.languagebutton_dont_fit)
- lofs += fwin->language_button->width;
- else
- allButtons = 0;
-#endif
-
if (fwin->right_button &&
!fwin->flags.hide_right_button && !fwin->flags.rbutton_dont_fit)
rofs += fwin->right_button->width + 3;
else
allButtons = 0;
}
-#ifdef XKB_BUTTON_HINT
- fwin->languagebutton_image = scr->b_pixmaps[WBUT_XKBGROUP1 +
fwin->languagemode];
-#endif
if (fwin->title) {
Drawable buf;
@@ -1031,10 +830,6 @@ void wFrameWindowPaint(WFrameWindow * fwin)
handleButtonExpose(&fwin->left_button->descriptor,
NULL);
if (fwin->right_button)
handleButtonExpose(&fwin->right_button->descriptor,
NULL);
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
- handleButtonExpose(&fwin->language_button->descriptor,
NULL);
-#endif
}
}
@@ -1080,23 +875,6 @@ static void reconfigure(WFrameWindow * fwin, int x, int
y, int width, int height
fwin->flags.lbutton_dont_fit = 0;
}
}
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button) {
- if (width < fwin->top_width * k &&
!fwin->flags.languagebutton_dont_fit) {
-
- if (!fwin->flags.hide_language_button) {
- XUnmapWindow(dpy,
fwin->language_button->window);
- }
- fwin->flags.languagebutton_dont_fit = 1;
- } else if (width >= fwin->top_width * k &&
fwin->flags.languagebutton_dont_fit) {
-
- if (!fwin->flags.hide_language_button) {
- XMapWindow(dpy,
fwin->language_button->window);
- }
- fwin->flags.languagebutton_dont_fit = 0;
- }
- }
-#endif
if (fwin->right_button) {
if (width < fwin->top_width * 2 &&
!fwin->flags.rbutton_dont_fit) {
@@ -1177,16 +955,6 @@ int wFrameWindowChangeTitle(WFrameWindow * fwin, char
*new_title)
return 1;
}
-#ifdef XKB_BUTTON_HINT
-void wFrameWindowUpdateLanguageButton(WFrameWindow * fwin)
-{
- paintButton(fwin->language_button,
fwin->title_texture[fwin->flags.state],
- WMColorPixel(fwin->title_color[fwin->flags.state]),
fwin->languagebutton_image, True);
-}
-#endif /* XKB_BUTTON_HINT */
-
-/*********************************************************************/
-
static void handleExpose(WObjDescriptor * desc, XEvent * event)
{
WFrameWindow *fwin = (WFrameWindow *) desc->parent;
@@ -1220,12 +988,6 @@ static void checkTitleSize(WFrameWindow * fwin)
if (fwin->left_button && !fwin->flags.hide_left_button &&
!fwin->flags.lbutton_dont_fit)
width -= fwin->left_button->width + 3;
-#ifdef XKB_BUTTON_HINT
- if (fwin->language_button && !fwin->flags.hide_language_button
- && !fwin->flags.languagebutton_dont_fit)
- width -= fwin->language_button->width + 3;
-#endif
-
if (fwin->right_button && !fwin->flags.hide_right_button &&
!fwin->flags.rbutton_dont_fit)
width -= fwin->right_button->width + 3;
}
@@ -1325,15 +1087,6 @@ static void handleButtonExpose(WObjDescriptor * desc,
XEvent * event)
WFrameWindow *fwin = (WFrameWindow *) desc->parent;
WCoreWindow *button = (WCoreWindow *) desc->self;
-#ifdef XKB_BUTTON_HINT
- if (button == fwin->language_button) {
- if (wPreferences.modelock) {
- paintButton(button,
fwin->title_texture[fwin->flags.state],
-
WMColorPixel(fwin->title_color[fwin->flags.state]),
- fwin->languagebutton_image, False);
- }
- } else
-#endif
if (button == fwin->left_button) {
paintButton(button, fwin->title_texture[fwin->flags.state],
WMColorPixel(fwin->title_color[fwin->flags.state]),
fwin->lbutton_image, False);
@@ -1391,13 +1144,6 @@ static void buttonMouseDown(WObjDescriptor * desc,
XEvent * event)
} else {
image = fwin->rbutton_image;
}
-#ifdef XKB_BUTTON_HINT
- if (button == fwin->language_button) {
- if (!wPreferences.modelock)
- return;
- image = fwin->languagebutton_image;
- }
-#endif
pixel = WMColorPixel(fwin->title_color[fwin->flags.state]);
texture = fwin->title_texture[fwin->flags.state];
@@ -1439,12 +1185,5 @@ static void buttonMouseDown(WObjDescriptor * desc,
XEvent * event)
if (fwin->on_click_right)
(*fwin->on_click_right) (button, fwin->child,
&ev);
}
-#ifdef XKB_BUTTON_HINT
- else if (button == fwin->language_button) {
- if (fwin->on_click_language)
- (*fwin->on_click_language) (button,
fwin->child, &ev);
- }
-#endif
-
}
}
diff --git a/src/framewin.h b/src/framewin.h
index a0c586c..3f3ab68 100644
--- a/src/framewin.h
+++ b/src/framewin.h
@@ -38,31 +38,20 @@
#define WFF_RESIZEBAR (1<<3)
#define WFF_BORDER (1<<4)
#define WFF_SINGLE_STATE (1<<5)
-#ifdef XKB_BUTTON_HINT
-#define WFF_LANGUAGE_BUTTON (1<<6)
-#endif
-
#define WFF_IS_SHADED (1<<16)
typedef struct WFrameWindow {
WScreen *screen_ptr; /* pointer to the screen structure */
-
WCoreWindow *core;
-
WCoreWindow *titlebar; /* the titlebar */
WCoreWindow *left_button; /* miniaturize button */
-#ifdef XKB_BUTTON_HINT
- WCoreWindow *language_button;
-#endif
WCoreWindow *right_button; /* close button */
short workspace; /* workspace that the window occupies */
-
short top_width;
int *title_clearance;
short bottom_width;
-
short resizebar_corner_width;
WCoreWindow *resizebar; /* bottom resizebar */
@@ -71,16 +60,9 @@ typedef struct WFrameWindow {
Pixmap resizebar_back[3]; /* any, None, None */
Pixmap lbutton_back[3];
Pixmap rbutton_back[3];
-#ifdef XKB_BUTTON_HINT
- Pixmap languagebutton_back[3];
-#endif
WPixmap *lbutton_image;
WPixmap *rbutton_image;
-#ifdef XKB_BUTTON_HINT
- WPixmap *languagebutton_image;
-#endif
-
union WTexture **title_texture;
union WTexture **resizebar_texture;
WMColor **title_color;
@@ -98,16 +80,10 @@ typedef struct WFrameWindow {
/* callbacks */
void (*on_click_left)(WCoreWindow *sender, void *data, XEvent *event);
-#ifdef XKB_BUTTON_HINT
- void (*on_click_language)(WCoreWindow *sender, void *data, XEvent *event);
-#endif
-
void (*on_click_right)(WCoreWindow *sender, void *data, XEvent *event);
void (*on_dblclick_right)(WCoreWindow *sender, void *data, XEvent *event);
-
void (*on_mousedown_titlebar)(WCoreWindow *sender, void *data, XEvent
*event);
void (*on_dblclick_titlebar)(WCoreWindow *sender, void *data, XEvent
*event);
-
void (*on_mousedown_resizebar)(WCoreWindow *sender, void *data, XEvent
*event);
struct {
@@ -117,65 +93,34 @@ typedef struct WFrameWindow {
unsigned int resizebar:1;
unsigned int left_button:1;
unsigned int right_button:1;
-#ifdef XKB_BUTTON_HINT
- unsigned int language_button:1;
-#endif
-
unsigned int need_texture_remake:1;
-
unsigned int single_texture:1;
-
unsigned int hide_left_button:1;
unsigned int hide_right_button:1;
-#ifdef XKB_BUTTON_HINT
- unsigned int hide_language_button:1;
-#endif
-
unsigned int need_texture_change:1;
-
unsigned int lbutton_dont_fit:1;
unsigned int rbutton_dont_fit:1;
-#ifdef XKB_BUTTON_HINT
- unsigned int languagebutton_dont_fit:1;
-#endif
-
unsigned int repaint_only_titlebar:1;
unsigned int repaint_only_resizebar:1;
-
unsigned int is_client_window_frame:1;
-
unsigned int incomplete_title:1;
} flags;
} WFrameWindow;
-WFrameWindow*
-wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y,
- int width, int height, int *clearance, int flags,
- union WTexture **title_texture,
- union WTexture **resize_texture,
- WMColor **color, WMFont **font);
+WFrameWindow *wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, int
width,
+ int height, int *clearance, int flags,
+ union WTexture **title_texture, union WTexture
**resize_texture,
+ WMColor **color, WMFont **font);
void wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags);
-
void wFrameWindowDestroy(WFrameWindow *fwin);
-
void wFrameWindowChangeState(WFrameWindow *fwin, int state);
-
void wFrameWindowPaint(WFrameWindow *fwin);
-
void wFrameWindowConfigure(WFrameWindow *fwin, int x, int y, int width, int
height);
-
void wFrameWindowResize(WFrameWindow *fwin, int width, int height);
-
void wFrameWindowShowButton(WFrameWindow *fwin, int flags);
-
void wFrameWindowHideButton(WFrameWindow *fwin, int flags);
-
int wFrameWindowChangeTitle(WFrameWindow *fwin, char *new_title);
-#ifdef XKB_BUTTON_HINT
-void wFrameWindowUpdateLanguageButton(WFrameWindow *fwin);
-#endif
-
#endif
diff --git a/src/screen.c b/src/screen.c
index 884e4f2..d721da4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -157,24 +157,6 @@ static void allocButtonPixmaps(WScreen * scr)
if (pix)
pix->shared = 1;
scr->b_pixmaps[WBUT_ICONIFY] = pix;
-#ifdef XKB_BUTTON_HINT
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM);
- if (pix)
- pix->shared = 1;
- scr->b_pixmaps[WBUT_XKBGROUP1] = pix;
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM);
- if (pix)
- pix->shared = 1;
- scr->b_pixmaps[WBUT_XKBGROUP2] = pix;
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM);
- if (pix)
- pix->shared = 1;
- scr->b_pixmaps[WBUT_XKBGROUP3] = pix;
- pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM);
- if (pix)
- pix->shared = 1;
- scr->b_pixmaps[WBUT_XKBGROUP4] = pix;
-#endif
pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM);
if (pix)
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index f638327..bde82e9 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -396,14 +396,6 @@
#ifdef XKB_MODELOCK
#define KEEP_XKB_LOCK_STATUS
-/* This is a hidden feature.
- * Choose just one of LANGUAGE_* hints.
- * Icon can be changed in def_pixmaps.h.
- * More icons are welcome.
- */
-#define XKB_BUTTON_HINT
-#undef LANGUAGE_TH
-#undef LANGUAGE_SK
#endif
#if defined(HAVE_LIBINTL_H) && defined(I18N)
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 5fec333..1be0ef7 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -81,14 +81,8 @@ static WMPropList *AEmulateAppIcon;
static WMPropList *ADontFocusAcrossWorkspace;
static WMPropList *AFullMaximize;
static WMPropList *ASharedAppIcon; /* app */
-#ifdef XKB_BUTTON_HINT
-static WMPropList *ANoLanguageButton;
-#endif
-
static WMPropList *AStartWorkspace;
-
static WMPropList *AIcon;
-
static WMPropList *AnyWindow;
static WMPropList *No;
@@ -120,10 +114,6 @@ static void init_wdefaults(WScreen * scr)
ADontFocusAcrossWorkspace =
WMCreatePLString("DontFocusAcrossWorkspace");
AFullMaximize = WMCreatePLString("FullMaximize");
ASharedAppIcon = WMCreatePLString("SharedAppIcon");
-#ifdef XKB_BUTTON_HINT
- ANoLanguageButton = WMCreatePLString("NoLanguageButton");
-#endif
-
AStartWorkspace = WMCreatePLString("StartWorkspace");
AnyWindow = WMCreatePLString("*");
@@ -312,11 +302,6 @@ wDefaultFillAttributes(WScreen * scr, char *instance, char
*class,
value = get_value(dw, dc, dn, da, AFullMaximize, No, useGlobalDefault);
APPLY_VAL(value, full_maximize, AFullMaximize);
-#ifdef XKB_BUTTON_HINT
- value = get_value(dw, dc, dn, da, ANoLanguageButton, No,
useGlobalDefault);
- APPLY_VAL(value, no_language_button, ANoLanguageButton);
-#endif
-
/* clean up */
WMPLSetCaseSensitive(False);
}
diff --git a/src/window.c b/src/window.c
index 16f3aca..e41ded3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -105,10 +105,6 @@ static void windowCloseDblClick(WCoreWindow *sender, void
*data, XEvent *event);
/* iconify button */
static void windowIconifyClick(WCoreWindow *sender, void *data, XEvent *event);
-#ifdef XKB_BUTTON_HINT
-static void windowLanguageClick(WCoreWindow *sender, void *data, XEvent
*event);
-#endif
-
static void titlebarMouseDown(WCoreWindow *sender, void *data, XEvent *event);
static void titlebarDblClick(WCoreWindow *sender, void *data, XEvent *event);
static void resizebarMouseDown(WCoreWindow *sender, void *data, XEvent *event);
@@ -1134,10 +1130,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
* Create frame, borders and do reparenting
*/
foo = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON;
-#ifdef XKB_BUTTON_HINT
- if (wPreferences.modelock)
- foo |= WFF_LANGUAGE_BUTTON;
-#endif
if (HAS_TITLEBAR(wwin))
foo |= WFF_TITLEBAR;
if (HAS_RESIZEBAR(wwin))
@@ -1163,22 +1155,12 @@ WWindow *wManageWindow(WScreen *scr, Window window)
foo |= WFF_RIGHT_BUTTON;
if (WFLAGP(wwin, no_miniaturize_button))
foo |= WFF_LEFT_BUTTON;
-#ifdef XKB_BUTTON_HINT
- if (WFLAGP(wwin, no_language_button) || WFLAGP(wwin, no_focusable))
- foo |= WFF_LANGUAGE_BUTTON;
-#endif
if (foo != 0)
wFrameWindowHideButton(wwin->frame, foo);
wwin->frame->child = wwin;
wwin->frame->workspace = workspace;
wwin->frame->on_click_left = windowIconifyClick;
-
-#ifdef XKB_BUTTON_HINT
- if (wPreferences.modelock)
- wwin->frame->on_click_language = windowLanguageClick;
-#endif
-
wwin->frame->on_click_right = windowCloseClick;
wwin->frame->on_dblclick_right = windowCloseDblClick;
wwin->frame->on_mousedown_titlebar = titlebarMouseDown;
@@ -1442,9 +1424,6 @@ WWindow *wManageInternalWindow(WScreen *scr, Window
window, Window owner,
foo = WFF_RIGHT_BUTTON | WFF_BORDER;
foo |= WFF_TITLEBAR;
-#ifdef XKB_BUTTON_HINT
- foo |= WFF_LANGUAGE_BUTTON;
-#endif
wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel,
wwin->frame_x, wwin->frame_y,
@@ -1468,12 +1447,6 @@ WWindow *wManageInternalWindow(WScreen *scr, Window
window, Window owner,
wwin->frame->child = wwin;
wwin->frame->workspace = wwin->screen_ptr->current_workspace;
-
-#ifdef XKB_BUTTON_HINT
- if (wPreferences.modelock)
- wwin->frame->on_click_language = windowLanguageClick;
-#endif
-
wwin->frame->on_click_right = windowCloseClick;
wwin->frame->on_mousedown_titlebar = titlebarMouseDown;
wwin->frame->on_dblclick_titlebar = titlebarDblClick;
@@ -2192,15 +2165,6 @@ void wWindowUpdateButtonImages(WWindow *wwin)
fwin->lbutton_image = scr->b_pixmaps[WBUT_ICONIFY];
}
}
-#ifdef XKB_BUTTON_HINT
- if (!WFLAGP(wwin, no_language_button)) {
- if (fwin->languagebutton_image &&
!fwin->languagebutton_image->shared) {
- wPixmapDestroy(fwin->languagebutton_image);
- }
- fwin->languagebutton_image = scr->b_pixmaps[WBUT_XKBGROUP1 +
fwin->languagemode];
- }
-#endif
-
/* close button */
/* redefine WFLAGP to MGFLAGP to allow broken close operation */
@@ -2270,11 +2234,6 @@ void wWindowConfigureBorders(WWindow *wwin)
flags = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON;
-#ifdef XKB_BUTTON_HINT
- if (wPreferences.modelock)
- flags |= WFF_LANGUAGE_BUTTON;
-#endif
-
if (HAS_TITLEBAR(wwin))
flags |= WFF_TITLEBAR;
if (HAS_RESIZEBAR(wwin) && IS_RESIZABLE(wwin))
@@ -2298,13 +2257,6 @@ void wWindowConfigureBorders(WWindow *wwin)
&& wwin->frame->flags.hide_left_button)
flags |= WFF_LEFT_BUTTON;
-#ifdef XKB_BUTTON_HINT
- if (!WFLAGP(wwin, no_language_button)
- && wwin->frame->flags.hide_language_button) {
- flags |= WFF_LANGUAGE_BUTTON;
- }
-#endif
-
if (!WFLAGP(wwin, no_close_button)
&& wwin->frame->flags.hide_right_button)
flags |= WFF_RIGHT_BUTTON;
@@ -2319,12 +2271,6 @@ void wWindowConfigureBorders(WWindow *wwin)
&& !wwin->frame->flags.hide_left_button)
flags |= WFF_LEFT_BUTTON;
-#ifdef XKB_BUTTON_HINT
- if (WFLAGP(wwin, no_language_button)
- && !wwin->frame->flags.hide_language_button)
- flags |= WFF_LANGUAGE_BUTTON;
-#endif
-
if (WFLAGP(wwin, no_close_button)
&& !wwin->frame->flags.hide_right_button)
flags |= WFF_RIGHT_BUTTON;
@@ -3014,30 +2960,6 @@ static void windowCloseDblClick(WCoreWindow *sender,
void *data, XEvent *event)
}
}
-#ifdef XKB_BUTTON_HINT
-static void windowLanguageClick(WCoreWindow *sender, void *data, XEvent *event)
-{
- WWindow *wwin = data;
- WFrameWindow *fwin = wwin->frame;
- WScreen *scr = fwin->screen_ptr;
- XkbStateRec staterec;
- int tl;
-
- if (event->xbutton.button != Button1 && event->xbutton.button !=
Button3)
- return;
- tl = wwin->frame->languagemode;
- wwin->frame->languagemode = wwin->frame->last_languagemode;
- wwin->frame->last_languagemode = tl;
- wSetFocusTo(scr, wwin);
- wwin->frame->languagebutton_image =
- wwin->frame->screen_ptr->b_pixmaps[WBUT_XKBGROUP1 +
wwin->frame->languagemode];
- wFrameWindowUpdateLanguageButton(wwin->frame);
- if (event->xbutton.button == Button3)
- return;
- wRaiseFrame(fwin->core);
-}
-#endif
-
static void windowIconifyClick(WCoreWindow *sender, void *data, XEvent *event)
{
WWindow *wwin = data;
diff --git a/src/window.h b/src/window.h
index 12834c3..c5703f1 100644
--- a/src/window.h
+++ b/src/window.h
@@ -35,14 +35,12 @@
#define UrgencyHint (1L << 8)
#endif
-
#define BORDER_TOP 1
#define BORDER_BOTTOM 2
#define BORDER_LEFT 4
#define BORDER_RIGHT 8
#define BORDER_ALL (1|2|4|8)
-
#define CLIENT_EVENTS (StructureNotifyMask | PropertyChangeMask\
| EnterWindowMask | LeaveWindowMask | ColormapChangeMask \
| FocusChangeMask | VisibilityChangeMask)
@@ -92,21 +90,14 @@ typedef struct {
unsigned int no_closable:1;
unsigned int no_miniaturizable:1;
unsigned int no_border:1; /* 1 pixel border around window */
-#ifdef XKB_BUTTON_HINT
- unsigned int no_language_button:1;
-#endif
unsigned int no_movable:1;
-
/* decorations */
unsigned int no_resizebar:1; /* draw the bottom handle? */
unsigned int no_close_button:1; /* draw a close button? */
unsigned int no_miniaturize_button:1; /* draw an iconify button? */
-
unsigned int broken_close:1; /* is the close button broken? */
-
/* ours */
unsigned int kill_close:1; /* can't send WM_DELETE_WINDOW */
-
unsigned int no_shadeable:1;
unsigned int omnipresent:1;
unsigned int skip_window_list:1;
@@ -119,30 +110,23 @@ typedef struct {
* is focused */
unsigned int no_hide_others:1; /* hide window when doing hideothers */
unsigned int no_appicon:1; /* make app icon */
-
unsigned int shared_appicon:1;
-
unsigned int dont_move_off:1;
-
unsigned int no_focusable:1;
unsigned int dont_focus_across_wksp:1; /* don't let wmaker switch
workspace to follow
* a focus request */
-
unsigned int always_user_icon:1; /* ignore client IconPixmap or
* IconWindow */
-
unsigned int start_miniaturized:1;
unsigned int start_hidden:1;
unsigned int start_maximized:1;
unsigned int dont_save_session:1; /* do not save app's state in session */
-
unsigned int full_maximize:1;
/*
* emulate_app_icon must be automatically disabled for apps that can
* generate their own appicons and for apps that have no_appicon=1
*/
unsigned int emulate_appicon:1;
-
} WWindowAttributes;
diff --git a/src/winspector.c b/src/winspector.c
index 06328cc..ac56b56 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -88,11 +88,7 @@ typedef struct InspectorPanel {
/* 3rd page. more attributes */
WMFrame *moreFrm;
-#ifdef XKB_BUTTON_HINT
- WMButton *moreChk[10];
-#else
WMButton *moreChk[9];
-#endif
/* 4th page. icon and workspace */
WMFrame *iconFrm;
@@ -148,17 +144,10 @@ static WMPropList *ADontSaveSession;
static WMPropList *AEmulateAppIcon;
static WMPropList *AFullMaximize;
static WMPropList *ASharedAppIcon;
-#ifdef XKB_BUTTON_HINT
-static WMPropList *ANoLanguageButton;
-#endif
-
static WMPropList *AStartWorkspace;
-
static WMPropList *AIcon;
-
/* application wide options */
static WMPropList *AStartHidden;
-
static WMPropList *AnyWindow;
static WMPropList *EmptyString;
static WMPropList *Yes, *No;
@@ -204,10 +193,6 @@ static void make_keys()
AEmulateAppIcon = WMCreatePLString("EmulateAppIcon");
AFullMaximize = WMCreatePLString("FullMaximize");
ASharedAppIcon = WMCreatePLString("SharedAppIcon");
-#ifdef XKB_BUTTON_HINT
- ANoLanguageButton = WMCreatePLString("NoLanguageButton");
-#endif
-
AStartWorkspace = WMCreatePLString("StartWorkspace");
AnyWindow = WMCreatePLString("*");
@@ -599,11 +584,6 @@ static void saveSettings(WMButton * button, InspectorPanel
* panel)
value = (WMGetButtonSelected(panel->moreChk[8]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, ADontFocusAcrossWorkspace,
value, flags);
-#ifdef XKB_BUTTON_HINT
- value = (WMGetButtonSelected(panel->moreChk[9]) != 0) ? Yes : No;
- different |= insertAttribute(dict, winDic, ANoLanguageButton, value,
flags);
-#endif
-
if (wwin->main_window != None && wApplicationOf(wwin->main_window) !=
NULL) {
value = (WMGetButtonSelected(panel->appChk[0]) != 0) ? Yes : No;
different2 |= insertAttribute(dict, appDic, AStartHidden,
value, flags);
@@ -775,9 +755,6 @@ static void applySettings(WMButton * button, InspectorPanel
* panel)
WSETUFLAG(wwin, dont_save_session,
WMGetButtonSelected(panel->moreChk[6]));
WSETUFLAG(wwin, emulate_appicon,
WMGetButtonSelected(panel->moreChk[7]));
WSETUFLAG(wwin, dont_focus_across_wksp,
WMGetButtonSelected(panel->moreChk[8]));
-#ifdef XKB_BUTTON_HINT
- WSETUFLAG(wwin, no_language_button,
WMGetButtonSelected(panel->moreChk[9]));
-#endif
WSETUFLAG(wwin, always_user_icon, WMGetButtonSelected(panel->alwChk));
if (WFLAGP(wwin, no_titlebar) && wwin->flags.shaded)
@@ -951,11 +928,6 @@ static void revertSettings(WMButton * button,
InspectorPanel * panel)
case 8:
flag = WFLAGP(wwin, dont_focus_across_wksp);
break;
-#ifdef XKB_BUTTON_HINT
- case 9:
- flag = WFLAGP(wwin, no_language_button);
- break;
-#endif
}
WMSetButtonSelected(panel->moreChk[i], flag);
}
@@ -1325,13 +1297,7 @@ static InspectorPanel *createInspectorForWindow(WWindow
* wwin, int xpos, int yp
WMMoveWidget(panel->moreFrm, 15, 45);
WMResizeWidget(panel->moreFrm, frame_width, 250);
- for (i = 0;
-#ifdef XKB_BUTTON_HINT
- i < 10;
-#else
- i < 9;
-#endif
- i++) {
+ for (i = 0; i < 9; i++) {
char *caption = NULL;
int flag = 0;
char *descr = NULL;
@@ -1393,13 +1359,6 @@ static InspectorPanel *createInspectorForWindow(WWindow
* wwin, int xpos, int yp
"a focus request (useful e.g. in the case of
a multiple-tab\n"
"firefox opening in a different workspace).");
break;
-#ifdef XKB_BUTTON_HINT
- case 9:
- caption = _("Disable language button");
- flag = WFLAGP(wwin, no_language_button);
- descr = _("Remove the `toggle language' button of the
window.");
- break;
-#endif
}
panel->moreChk[i] = WMCreateSwitchButton(panel->moreFrm);
WMMoveWidget(panel->moreChk[i], 10, 20 * (i + 1));
--
1.7.0.2.276.g60daf
--
To unsubscribe, send mail to [email protected].
