gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Changes relate to modelock.

Browse Source
This commit is contained in:
id
1999-05-20 23:30:53 +00:00
parent 3301950805
commit c28f3b2c5b
11 changed files with 461 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/window.c
View File

@@ -123,6 +123,9 @@ 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 windowThaiClick(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);
@@ -888,6 +891,10 @@ wManageWindow(WScreen *scr, Window window)
*--------------------------------------------------
*/
foo = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON;
#ifdef XKB_BUTTON_HINT
if (wPreferences.modelock)
foo |= WFF_THAI_BUTTON;
#endif
if (!WFLAGP(wwin, no_titlebar))
foo |= WFF_TITLEBAR;
if (!WFLAGP(wwin, no_resizebar))
@@ -934,6 +941,11 @@ wManageWindow(WScreen *scr, Window window)
wwin->frame->workspace = workspace;
wwin->frame->on_click_left = windowIconifyClick;
#ifdef XKB_BUTTON_HINT
if (wPreferences.modelock)
wwin->frame->on_click_thai = windowThaiClick;
else wwin->frame->on_click_thai = NULL;
#endif
wwin->frame->on_click_right = windowCloseClick;
wwin->frame->on_dblclick_right = windowCloseDblClick;
@@ -1242,6 +1254,9 @@ wManageInternalWindow(WScreen *scr, Window window, Window owner,
foo = WFF_RIGHT_BUTTON;
foo |= WFF_TITLEBAR;
#ifdef XKB_BUTTON_HINT
foo |= WFF_THAI_BUTTON;
#endif
wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel,
wwin->frame_x, wwin->frame_y,
@@ -1268,6 +1283,12 @@ wManageInternalWindow(WScreen *scr, Window window, Window owner,
wwin->frame->child = wwin;
wwin->frame->workspace = wwin->screen_ptr->current_workspace;
#ifdef THAI
if (wPreferences.modelock)
wwin->frame->on_click_thai = windowThaiClick;
else wwin->frame->on_click_thai = NULL;
#endif
wwin->frame->on_click_right = windowCloseClick;
@@ -1549,9 +1570,7 @@ wWindowFocus(WWindow *wwin, WWindow *owin)
#ifdef KEEP_XKB_LOCK_STATUS
if (wPreferences.modelock) {
if (!wwin->flags.focused) {
XkbLockGroup(dpy, XkbUseCoreKbd, wwin->frame->languagemode);
}
XkbLockGroup(dpy, XkbUseCoreKbd, wwin->frame->languagemode);
}
#endif /* KEEP_XKB_LOCK_STATUS */
@@ -1992,6 +2011,15 @@ wWindowUpdateButtonImages(WWindow *wwin)
}
}
#ifdef XKB_BUTTON_HINT
if (!WFLAGP(wwin, no_thai_button)) {
if (fwin->tbutton_image && !fwin->tbutton_image->shared) {
wPixmapDestroy(fwin->tbutton_image);
}
fwin->tbutton_image = scr->b_pixmaps[WBUT_ENGL];
}
#endif
/* close button */
if (!WFLAGP(wwin, no_close_button)) {
@@ -2807,6 +2835,27 @@ windowCloseDblClick(WCoreWindow *sender, void *data, XEvent *event)
}
#ifdef XKB_BUTTON_HINT
static void
windowThaiClick(WCoreWindow *sender, void *data, XEvent *event)
{
WWindow *wwin = data;
WFrameWindow *fwin = wwin->frame;
WScreen *scr = fwin->screen_ptr;
XkbStateRec staterec;
if (event->xbutton.button != Button1 && event->xbutton.button != Button3)
return;
wwin->frame->languagemode = !wwin->frame->languagemode;
wFrameWindowPaint(fwin);
wSetFocusTo(scr, wwin);
if (event->xbutton.button == Button3)
return;
wRaiseFrame(fwin->core);
}
#endif
static void
windowIconifyClick(WCoreWindow *sender, void *data, XEvent *event)
{