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

fixed some bugs

Browse Source 
made click on windows that are unfocused windows focus them on sloppy/evil focus mode
This commit is contained in:
kojima
2001-01-05 22:39:01 +00:00
parent 83979b5f4c
commit 068c5a94b1
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -8,9 +8,6 @@ Changes since version 0.62.1:
(Alban Hertroys <dalroi@wit401310.student.utwente.nl>) (Alban Hertroys <dalroi@wit401310.student.utwente.nl>)
- improved and simplified fonts configuration for multibyte languages - improved and simplified fonts configuration for multibyte languages
(Tomohiro KUBOTA <kubota@debian.or.jp>) (Tomohiro KUBOTA <kubota@debian.or.jp>)
- rewrote menu reading code
- added KDE menu support in rootmenu
- added support for forced menu refresh in piped menus
- cleaned ParseCommand() and renamed to TokenizeString() - cleaned ParseCommand() and renamed to TokenizeString()
- rewrote menu editor in WPrefs - rewrote menu editor in WPrefs
- added definable workspace border (0..5 pixels). See NEWS. - added definable workspace border (0..5 pixels). See NEWS.
@@ -28,6 +25,7 @@ Changes since version 0.62.1:
- fixed code that was dependant on the order of evaluation in wrlib. This - fixed code that was dependant on the order of evaluation in wrlib. This
fixed a number of problems, like greyscale jpegs that showed up in red fixed a number of problems, like greyscale jpegs that showed up in red
and possibly the problems with pseudocolor displays. and possibly the problems with pseudocolor displays.
- made clicks on unfocused windows be effective on focus follow mouse/sloppy
Changes since version 0.62.0: Changes since version 0.62.0:

2
NEWS
View File

@@ -2,7 +2,7 @@
NEWS for veteran Window Maker users NEWS for veteran Window Maker users
----------------------------------- -----------------------------------
--- 0.62.1 --- 0.63.0
Interwoven Gradient Interwoven Gradient

5
src/event.c
View File

@@ -599,6 +599,7 @@ handleButtonPress(XEvent *event)
{ {
WObjDescriptor *desc; WObjDescriptor *desc;
WScreen *scr; WScreen *scr;
#ifdef DEBUG #ifdef DEBUG
L("got button press"); L("got button press");
#endif #endif
@@ -668,12 +669,12 @@ handleButtonPress(XEvent *event)
XAllowEvents(dpy, AsyncPointer, CurrentTime); XAllowEvents(dpy, AsyncPointer, CurrentTime);
} }
if (wPreferences.focus_mode == WKF_CLICK) { /* if (wPreferences.focus_mode == WKF_CLICK) {*/
if (wPreferences.ignore_focus_click) { if (wPreferences.ignore_focus_click) {
XAllowEvents(dpy, AsyncPointer, CurrentTime); XAllowEvents(dpy, AsyncPointer, CurrentTime);
} }
XAllowEvents(dpy, ReplayPointer, CurrentTime); XAllowEvents(dpy, ReplayPointer, CurrentTime);
} /* }*/
XSync(dpy, 0); XSync(dpy, 0);
} else if (desc->parent_type == WCLASS_APPICON } else if (desc->parent_type == WCLASS_APPICON
|| desc->parent_type == WCLASS_MINIWINDOW || desc->parent_type == WCLASS_MINIWINDOW

2
src/main.c
View File

@@ -79,7 +79,7 @@ WShortKey wKeyBindings[WKBD_LAST];
/* defaults domains */ /* defaults domains */
WDDomain *WDWindowMaker = NULL; WDDomain *WDWindowMaker = NULL;
WDDomain *WDWindowAttributes = NULL; WDDomain *WDWindowAttributes = NULL;
WDDomain *WDRootMenu = NULL;
/* XContexts */ /* XContexts */
XContext wWinContext; XContext wWinContext;

6
src/wconfig.h.in
View File

@@ -525,11 +525,7 @@
/* number of window shortcuts */ /* number of window shortcuts */
#ifdef EXTEND_WINDOWSHORTCUT #define MAX_WINDOW_SHORTCUTS 10
# define MAX_WINDOW_SHORTCUTS 10
#else
# define MAX_WINDOW_SHORTCUTS 4
#endif
#define WM_PI 3.14159265358979323846 #define WM_PI 3.14159265358979323846

8
src/window.c
View File

@@ -1452,7 +1452,7 @@ wManageInternalWindow(WScreen *scr, Window window, Window owner,
} }
if (wwin->flags.is_gnustep == 0) if (wwin->flags.is_gnustep == 0)
wFrameWindowChangeState(wwin->frame, WS_UNFOCUSED); wFrameWindowChangeState(wwin->frame, WS_UNFOCUSED);
/* if (wPreferences.auto_focus)*/ /* if (wPreferences.auto_focus)*/
wSetFocusTo(scr, wwin); wSetFocusTo(scr, wwin);
@@ -2562,7 +2562,7 @@ wWindowResetMouseGrabs(WWindow *wwin)
if (!wwin->flags.focused && !WFLAGP(wwin, no_focusable) if (!wwin->flags.focused && !WFLAGP(wwin, no_focusable)
&& !wwin->flags.is_gnustep) { && !wwin->flags.is_gnustep) {
/* the passive grabs to focus the window */ /* the passive grabs to focus the window */
if (wPreferences.focus_mode == WKF_CLICK) /* if (wPreferences.focus_mode == WKF_CLICK) */
XGrabButton(dpy, AnyButton, AnyModifier, wwin->client_win, XGrabButton(dpy, AnyButton, AnyModifier, wwin->client_win,
True, ButtonPressMask, GrabModeSync, GrabModeAsync, True, ButtonPressMask, GrabModeSync, GrabModeAsync,
None, None); None, None);
@@ -2856,8 +2856,8 @@ frameMouseDown(WObjDescriptor *desc, XEvent *event)
CloseWindowMenu(wwin->screen_ptr); CloseWindowMenu(wwin->screen_ptr);
if (wPreferences.focus_mode==WKF_CLICK if (/*wPreferences.focus_mode==WKF_CLICK
&& !(event->xbutton.state&ControlMask) &&*/ !(event->xbutton.state&ControlMask)
&& !WFLAGP(wwin, no_focusable)) { && !WFLAGP(wwin, no_focusable)) {
wSetFocusTo(wwin->screen_ptr, wwin); wSetFocusTo(wwin->screen_ptr, wwin);
} }

1
src/winmenu.c
View File

@@ -388,7 +388,6 @@ makeMakeShortcutMenu(WScreen *scr, WMenu *menu)
for (i=0; i<MAX_WINDOW_SHORTCUTS; i++) { for (i=0; i<MAX_WINDOW_SHORTCUTS; i++) {
WMenuEntry *entry; WMenuEntry *entry;
entry = wMenuAddCallback(menu, "", makeShortcutCommand, NULL); entry = wMenuAddCallback(menu, "", makeShortcutCommand, NULL);
entry->flags.indicator = 1; entry->flags.indicator = 1;