about summary refs log tree commit diff
path: root/menu.c
Commit message (Collapse)AuthorAgeFilesLines
* cvsimportokan2022-10-151-13/+12
|\ | | | | | | | | * refs/heads/master: Fix overlapping menu items as reported by kn@ and probably others at some point; with op@ and Walter Alejandro Iglesias helping along the way. Consistently use font ascent+descent instead of an arbitrary font height+1 for individual menu item rectangles and placement.
| * Fix overlapping menu items as reported by kn@ and probably others atokan2022-10-151-13/+12
| | | | | | | | | | | | | | | | some point; with op@ and Walter Alejandro Iglesias helping along the way. Consistently use font ascent+descent instead of an arbitrary font height+1 for individual menu item rectangles and placement. ok kn@ op@
* | cvsimportLeah Neukirchen2020-05-141-18/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/master: Fixed memory leak in xu_get_strprop. Prevent out of boundary write with configuration files in which too many quoted arguments are stored for other window managers. Allow configuring a percentage window size of the master window during htile/vtile actions. From Uwe Werler, with a few manpage tweaks. zap stray tabs Instead of using _NET_ACTIVE_WINDOW on restart, use the pointer location to determine what client to set active. Reduces a round trip for every window. Add support for SIGINT/SIGTERM. Simplify conditional construct. Trim event_mask to those that the root window actually needs. No need to lookup current client early; move to right before it is needed. Recommit 1.259, but now with TAILQ_FOREACH_SAFE. Revert previous. Causes a crash as reported by Tom Murphy. Simplify list markup. Plug two memory leaks. Also get rid of a variable that is no longer necessary. Remove ColormaskChange from event-mask since there's no event handler. Unrelated style fixes, consistency changes and sorting, appropriate dosage/removal of wrappers, simplification of name queue, client cycle joins other kb/mb bound functions.
| * Unrelated style fixes, consistency changes and sorting, appropriateokan2020-02-271-18/+18
| | | | | | | | | | dosage/removal of wrappers, simplification of name queue, client cycle joins other kb/mb bound functions.
* | cvsimportokan2019-08-131-0/+1
|\| | | | | | | | | | | | | | | | | | | * refs/heads/master: Because cwm warps the pointer during a client move (to stay within the client), there's a window of time where an expose or enternotify event will get generated for a lower client; use a hammer and drain events after keyboard move/resize, until such a time that cwm doesn't warp the pointer. Behavior noticed by kn. Fix regression from r1.107 (lost a return); kettenis@ pointed out the high potential for a use-after-free (true!) where kn@ ran into the regression using an app that actually exercised the XGrabPointer() failure path. Add application section command uses execvp(3) not execve(2) Plug a memory leak in log_debug(); OK okan@ Handle _NET_WM_NAME changes.
| * Fix regression from r1.107 (lost a return); kettenis@ pointed out the highokan2019-08-121-0/+1
| | | | | | | | | | potential for a use-after-free (true!) where kn@ ran into the regression using an app that actually exercised the XGrabPointer() failure path.
* | cvsimportokan2019-03-111-50/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/master: (23 commits) Check the atom type on propertynotify before iterating. use screen_find() for xrandr crtc changes Find the managed screen from the parent window for client_current(). Print window id in hex; while here, remove unnecessary newline. Similar to keypress event, fetch the screen from the event root window in the buttonpress handler; bail if we don't manage the screen. Allows us to find the current client based on the screen/event root. extend verbose logging for key/button events [keypress event] turns out we've been checking the wrong window for a matching client thus always falling back to client_current(); while the current client is problaby right in most cases, use event's subwindow (not window) to find the client. Bail early if this event came to us from a screen we don't manage. This is result of us grabing all keybindings off the root window instead of selectively. add parans for readibility Teach client_current() to use a screen to find the current client instead of iterating over all (fallback if no screen provided for now). Initially convert trivial uses of client_current(). check cc->gc directly zip extra lines gc clientq inside groups, instead use the better maintained one per-screen shuffle deck chairs: rename group actions to match intent for clarity same thing as screen_find() Separate out the menu window from the client resize/move geom window; in each case, create and destroy on-demand. Isolate more menu specific code. fix a few misplaced (and misnamed) ewmh root window functions _NET_WORKAREA needs ngroups, so screen_update_geometry() needs to come after conf_group(). simplify xftcolor config Tie group number and name together during config. Move the group index (desktop number) check to the only 2 callers that require checking due to ewmh. ...
| * Separate out the menu window from the client resize/move geom window; in eachokan2019-03-041-50/+32
| | | | | | | | case, create and destroy on-demand. Isolate more menu specific code.
* | cvsimportokan2018-11-141-0/+1
|\| | | | | | | | | | | | | | | * refs/heads/master: Stop asking for events (NoEventMask) from menu window once done with the menu (we don't destroy it, only unmap). Allow 'transientfor' clients to inherit group and bwidth either during init or via property notify events. Previously only the flags were set but nothing was in the path to apply said flags and/or bwidth. Required slight of re-orgnaization of client_init. merge from base, from sashan@: Use the original client border width to adjust initial placement of clients containing {P,US}Position requests where they are explicitly set to 'ignore' in cwmrc(5); clients are unaware that their border will be altered (removed in this case) when calcuating position and thus end up a factor of their original border width off once mapped by cwm(1). cwm(1) will essentially shift the client to the edge if the original request's position and border match.
| * Stop asking for events (NoEventMask) from menu window once done withokan2018-11-141-0/+1
| | | | | | | | the menu (we don't destroy it, only unmap).
* | cvsimportokan2018-02-061-50/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/master: (28 commits) Use screen's saved view instead of re-querying the server. Slightly expand and expose verbose debugging. add debugging for x events Add a simple debug logging mechanism. Simplification; use asprintf where appropriate now. Use func attributes where appropriate. Fix wins comparison declaration since it's unsigned from XQueryTree(). Generate name_to_func[] in a clean and readable fashion. Shrink tier[] by one after removing matchname in r1.55. If the requested group number is invalid, bail but don't kill cwm. Quick fix: exit after a failed execvp in u_spawn instead; previously we did in u_exec, but the introduction of re-exec'ing the previous invocation of cwm if 'exec_wm' failed missed the 'exec' failing path. Will likely split out as a proper fix. Only exec the fallback when in CWM_EXEC_WM state. Typo, from Julien Steinhauser. Convert menu-exec-wm from an abritrary exec menu, into a config-based menu from which one may configure (wm <name> <path_and_args>) (and choose) specific window managers to replace the running one. 'wm cwm cwm' is included by default. As done for buttonrelease, work specific un-cycling and un-highlighting actions into the keyrelease event, only performing what's actually needed for each; should result in much fewer events against keyreleases. No intended behaviour change. Merge group_toggle_membership_leave into the buttonrelease event and only do border work for a group/ungroup action. add helper function client_show to bring together like actions for unhide/raise Add support for re-exec'ing with SIGHUP; equivalent to the already built-in 'restart' function. Use poll and XNextEvent to replace XNextEvent blocking inside the x11 event handler. zap stray that snuck in ...
| * Use a variable to keep track of flags for menu_filter().okan2017-12-191-2/+3
| |
| * clean up after previous (noprompt removal)okan2017-12-121-6/+1
| |
| * Unconditionally show prompt on menus, regardless of invocation.okan2017-12-111-42/+20
| |
* | cvsimportokan2017-04-251-10/+4
|\| | | | | | | | | | | | | | | | | | | | | * refs/heads/master: The r1.36 menuq_add() conversion did this one wrong; fix by reverting to the original code which adds to resultentry list, as opposed to the wrong one in menuq_add(). Fixes crash noticed by at least Rickard Gustafsson. Remove 'noresult' (and simplify) as it does nothing and makes the logic around it needless. History doesn't show what this might have been used for in future iterations. search_match_path() isn't supposed to return anything. Move queue init to caller so it's only called once in a few cases. sort Raise the previously focused window, instead of the previous window in the cycle list; seems to match behaviour of other wm's; from Walter Alejandro Iglesias. For {h,v}tile, instead of keeping the master client's {h,v} geometry, expand it to %50 of the area, then fill in the remaining space with the other clients in the same group; from Gerrit Meyerheim.
| * Remove 'noresult' (and simplify) as it does nothing and makes the logic aroundokan2017-04-251-10/+4
| | | | | | | | | | it needless. History doesn't show what this might have been used for in future iterations.
* | cvsimportChristian Neukirchen2016-12-161-8/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/master: stray newlines Add search_print_text(), a default callback for mi->print in menu_filter(). While here, normalize the remaining search_print_* argument paramters. Consistent use of menuq_add for ssh menu. Now that dim.{x,y} are available early, use them before requiring a MotionNotify event. Set dim.{x,y} during client_init and update on resize, instead of (re)calculating only when applying hints. 'window-search' is spelled 'menu-window'; the former snuck in during the conversion('menu-window' already existed and was properlly documented); found the hard way by sthen@ while trying to convert. Fold unbinding functions into one for each, key and mouse; plugs a leak when unbinding a mouse button bound to a command. use the correct type Tame the number of 'exec' and 'path' search_match wrappers. No functional change now, though more can likely go later, losing the (paritally complete or incomplete/broken) argument completion bits. Switch ssh menu to search_match_text; like group/window/cmd menus, use only a substring match. The previous matching is only intended for the exec menus. Change 'menu-window' to display all windows; then add 'menu-window-hidden' for the previous behaviour of 'menu-window'. 'menu-window' becomes the default binding; use 'bind-mouse "1" menu-window-hidden' to restore old behaviour for those who prefer. Normalize bind function names, based on a few categories: window, group, menu and pointer. Use an additional check with lstat(2) when d_type is unknown. revert previous; upcoming changes will hopefully deal with these more naturally. Add a wrapper based upon xevent handlers around client move/resize for key and mouse bindings. Define callbacks, then default bindings. Reorganize for upcoming changes. Remove the (8) default bindings for pointer move since they conflict with default bindings for emacs, which wins; the feature remains and can be bound to whatever users wish with cwmrc(5).
| * stray newlinesokan2016-12-061-2/+0
| |
| * Add search_print_text(), a default callback for mi->print in menu_filter(). ↵okan2016-12-061-6/+2
| | | | | | | | | | | | While here, normalize the remaining search_print_* argument paramters.
| * Tame the number of 'exec' and 'path' search_match wrappers. No functionalokan2016-12-011-1/+1
| | | | | | | | | | change now, though more can likely go later, losing the (paritally complete or incomplete/broken) argument completion bits.
* | cvsimportokan2016-10-241-45/+96
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/master: (34 commits) Make it clear these are flags. Remove duplicate check that strsubmatch() already does; while here, fix a comment. Sprinkle __func__ in appropriate error messages. Get rid of 'matchname'; it's too surprising to have the menu change during client search as different potential str matches are cycled through. If there's interest, the only string that doesn't exist in the listing is the window's class - that can be added of course, but it makes the line too long imho. clean up search_match_client(); no behaviour change Refactor callbacks to take a void * so as to not try and generalize into client_ctx in keypress and buttonpress event handlers; pass appropriate *ctx's based on context. remove another unused proto Rename 2 kbfunc to match closer to what they do Add an argument to the callbacks to pass the xevent context, button or key press. This allows to remove a few hacks to duplicate functions only for behaviour changes; now differing behaviours are pushed down to the callback. Also will allow for previously unavailable actions to be bind-able down the road. Check the ptr bounds in the new client during cycling, since not all actions do ptrsave, such as restoring client geometry; adapted from a diff by Vadim Vygonets. More accurate to say 'toggle', rather than 'select', for group[n]/nogroup. Add CM-a for 'nogroup' (CM-0 stays for now); update manpage to reflect. Stash wmname into conf. When removing xrandr regions, ensure clients are within the bounds of the screen; adapted from an ancient diff from Sviatoslav Chagaev. Things in this area will likely change, but put this in so it works now and serves as a reminder. Calculate client nameqlen in client_setname(), the only place it's needed/used. Turn CALMWM_NGROUPS define into variable, ngroups. Start simplifying menu code; and in turn, remove a cursor no longer needed. Defaults are split between defines and conf_init(); normalize these, as well as give 'sticky' groups its own variable. For both kb and mouse move, it is possible to grab a client and move it completely off the screen/region; instead, if the pointer is outside of the client bounds, warp the pointer to the closest edge before moving. client_ptrwarp should not deal with unhiding or raising clients (non ptr requests); most callers do this already - deal with the few that do not. client_ptrwarp becomes a simple wrapper (setpos) but it will be expanded. ...
| * Make it clear these are flags.okan2016-10-241-1/+1
| |
| * Start simplifying menu code; and in turn, remove a cursor no longerokan2016-10-031-21/+18
| | | | | | | | needed.
| * Use instinsic X11 functions for key/btn/ptr grab/ungrab/regrab requests;okan2016-09-301-6/+11
| | | | | | | | | | the one line wrappers provided no value and limited altering calls where needed; additionally, most of them had but one caller.
| * Replace mousefunc_sweep_draw() with a generic menu_windraw() using vaokan2016-09-301-0/+32
| | | | | | | | | | | | | | lists; use it appropriately for both window dimension and position in the respective mousefunc calls. ok bryent@
| * Mechanical change: move screen menu bits to their own struct.okan2016-09-291-15/+15
| |
| * Inline Xft draw and extents wrappers; too much abstraction.okan2016-09-281-9/+23
| |
| * Allow ctrl-[ for abort (esc); from Benjamin Scher Purcellokan2016-09-201-0/+3
| |
* | cvsimportokan2016-08-281-0/+1
|\| | | | | | | | | * refs/heads/master: Enable the use of numpad Enter key on menus; from Henrique N. Lengler.
| * Enable the use of numpad Enter key on menus; from Henrique N. Lengler.okan2016-08-281-0/+1
| | | | | | | | ok beck phessler
* | cvsimportChristian Neukirchen2016-06-081-1/+4
|\| | | | | | | | | * refs/heads/master: If supplied format to menuq_add() is NULL, fill text with an empty string; found by Christian Neukirchen.
| * If supplied format to menuq_add() is NULL, fill text with an emptyokan2016-04-281-1/+4
| | | | | | | | string; found by Christian Neukirchen.
| * Partial revert of replacing screen_area() with region_find(); until aokan2015-11-111-3/+1
| | | | | | | | | | | | fix for a regression is found; this bug has been around for a long time it seems, but this change exposed it. Likely need to track clients in to and out of regions.
| * Extend region to include both view and work areas; switch tookan2015-11-091-1/+3
| | | | | | | | | | | | | | region_find() which no longer needs to recalculate gap each time a client (or menu) is created or altered. If no RandR, fall back to display dimensions while building regions instead of during execution.
* | menu: menuq_add: avoid passing null pointers to vsnprintf.Christian Neukirchen2016-04-021-1/+1
| |
* | cvsimportokan2015-07-121-18/+10
|\|
| * simplify menu print textokan2015-07-121-15/+8
| |
| * styleokan2015-07-011-5/+4
| |
* | cvsimportChristian Neukirchen2015-07-011-17/+18
|\|
| * style and spacing nitsokan2015-06-301-2/+3
| |
| * Mechanical change from xinerama to region backed areas.okan2015-06-261-15/+15
| |
* | cvsimportokan2015-06-091-48/+44
|\|
| * clean upokan2015-06-081-16/+13
| |
| * use the same geometry struct in menus as everywhere elseokan2015-06-051-34/+31
| |
| * add a flag to indicate a menu list instead of overloading 'prompt'okan2015-06-051-1/+3
| |
| * redundant check for 'list'okan2015-06-051-1/+1
| |
* | cvsimportokan2015-03-291-9/+5
|\|
| * Reshuffle and slightly simplify menu_complete_path(), removing anokan2015-03-281-9/+5
| | | | | | | | allocation, for tab-completion; checked by Alexander Polakov as well.
* | cvsimportChristian Neukirchen2015-01-221-1/+2
|\|
| * Switch to limits.h; replace MAXPATHLEN and MAXHOSTNAMELEN with PATH_MAXokan2015-01-191-1/+2
| | | | | | | | | | | | and HOST_NAME_MAX+1, respectively. ok doug@