mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 20:38:08 +01:00
Modelock relate stuffs.
This commit is contained in:
@@ -98,71 +98,7 @@ static char *PRED_ICONIFY_XPM[] = {
|
||||
};
|
||||
|
||||
#ifdef XKB_BUTTON_HINT
|
||||
|
||||
static char *PRED_XKBGROUP1_XPM[] = {
|
||||
" 10 10 2 1",
|
||||
". c #000000",
|
||||
"# c None",
|
||||
"........##",
|
||||
".......###",
|
||||
"..########",
|
||||
"..########",
|
||||
"......####",
|
||||
".....#####",
|
||||
"..########",
|
||||
"..########",
|
||||
"........##",
|
||||
"........##"
|
||||
};
|
||||
|
||||
static char *PRED_XKBGROUP2_XPM[] = {
|
||||
" 10 10 2 1",
|
||||
". c #000000",
|
||||
"# c None",
|
||||
"#..###..##",
|
||||
".#..#.#..#",
|
||||
".#...###..",
|
||||
"#...####..",
|
||||
"##..####..",
|
||||
"##..####..",
|
||||
"##..####..",
|
||||
"##..####..",
|
||||
"##..####..",
|
||||
"##.#####.#"
|
||||
};
|
||||
|
||||
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",
|
||||
"..........",
|
||||
".########.",
|
||||
".#..##..#.",
|
||||
".#..##..#.",
|
||||
".########.",
|
||||
".#......#.",
|
||||
".##....##.",
|
||||
".###..###.",
|
||||
".########.",
|
||||
".........."
|
||||
};
|
||||
|
||||
#include "extend_pixmaps.h"
|
||||
#endif /* XKB_BUTTON_HINT */
|
||||
|
||||
|
||||
|
||||
@@ -1260,6 +1260,16 @@ wFrameWindowUpdatePushButton(WFrameWindow *fwin, Bool pushed)
|
||||
#endif /* OLWM_HINTS */
|
||||
|
||||
|
||||
#ifdef XKB_BUTTON_HINT
|
||||
void
|
||||
wFrameWindowUpdateLanguageButton(WFrameWindow *fwin)
|
||||
{
|
||||
paintButton(fwin->language_button, fwin->title_texture[fwin->flags.state],
|
||||
fwin->title_pixel[fwin->flags.state],
|
||||
fwin->languagebutton_image, True);
|
||||
}
|
||||
#endif /* XKB_BUTTON_HINT */
|
||||
|
||||
|
||||
/*********************************************************************/
|
||||
|
||||
@@ -1421,7 +1431,6 @@ handleButtonExpose(WObjDescriptor *desc, XEvent *event)
|
||||
|
||||
#ifdef XKB_BUTTON_HINT
|
||||
if (button == fwin->language_button) {
|
||||
|
||||
if (wPreferences.modelock){
|
||||
paintButton(button, fwin->title_texture[fwin->flags.state],
|
||||
fwin->title_pixel[fwin->flags.state],
|
||||
@@ -1429,7 +1438,6 @@ handleButtonExpose(WObjDescriptor *desc, XEvent *event)
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
|
||||
if (button == fwin->left_button) {
|
||||
paintButton(button, fwin->title_texture[fwin->flags.state],
|
||||
fwin->title_pixel[fwin->flags.state],
|
||||
|
||||
@@ -180,4 +180,8 @@ int wFrameWindowChangeTitle(WFrameWindow *fwin, char *new_title);
|
||||
void wFrameWindowUpdatePushButton(WFrameWindow *fwin, Bool pushed);
|
||||
#endif
|
||||
|
||||
#ifdef XKB_BUTTON_HINT
|
||||
void wFrameWindowUpdateLanguageButton(WFrameWindow *fwin);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -244,6 +244,10 @@
|
||||
*--------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#if defined(GNOME_STUFF) && !defined(XDND)
|
||||
#define XDND
|
||||
#endif
|
||||
|
||||
/* list of paths to look for the config files, searched in order
|
||||
* of appearance */
|
||||
#define DEF_CONFIG_PATHS \
|
||||
@@ -596,7 +600,8 @@
|
||||
* in def_pixmaps.h and default icon is now for Thai language only.
|
||||
* More icons are welcome.
|
||||
*/
|
||||
#undef XKB_BUTTON_HINT
|
||||
#define XKB_BUTTON_HINT
|
||||
#undef LANGUAGE_TH
|
||||
#endif
|
||||
|
||||
#ifndef DEMATERIALIZE_ICON
|
||||
|
||||
@@ -2852,8 +2852,11 @@ windowLanguageClick(WCoreWindow *sender, void *data, XEvent *event)
|
||||
tl = wwin->frame->languagemode;
|
||||
wwin->frame->languagemode = wwin->frame->last_languagemode;
|
||||
wwin->frame->last_languagemode = tl;
|
||||
wFrameWindowPaint(fwin);
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user