okan
ba02c63913
Fix whitespace.
2015-08-21 16:52:37 +00:00
okan
1e8d4a7d04
Add client freeze extension to _NET_WM_STATE Atom, allowing flag to
...
persist. As usual with new Atoms, requires X restart.
2015-08-21 16:30:02 +00:00
okan
d01e312b01
_NET_WM_STATE_STICKY implies only sticky at the group/desktop level, not
...
position and size; based on discussion with a few.
2015-08-21 16:14:39 +00:00
okan
8809c816d0
Instead of special casing the 'term' and 'lock' commands, go back to
...
keeping them hidden; showing them has apparently caused confusion/angst.
2015-08-21 16:05:55 +00:00
okan
d24e89a34a
Leave command list order from .cwmrc alone; remove sort.
2015-08-21 15:55:39 +00:00
okan
5640e2e0a3
Bring group and client cycle closer together.
2015-08-21 15:52:49 +00:00
okan
1a1e8c47e8
Alter big move and resize bindings to match what's in cwm(1);
...
functionally the same, but re-binding should be based on default
bindings. Matches other similiar bindings.
Discovered by a portable user.
2015-08-20 14:45:15 +00:00
okan
8529d9a1c6
introduce 'groupsearch' for group menu search; matches on either group
...
number/shortcut and/or name.
2015-07-12 14:31:47 +00:00
okan
7dc8db6316
simplify menu print text
2015-07-12 14:21:09 +00:00
okan
0cbfba6ca3
revert previous; seems search_match_text() needs mi->text pre-populated.
...
(only used in one place, application menu searching); re-visit later.
broken application menu searching reported by Peter Kane.
2015-07-03 17:11:16 +00:00
okan
56fb99c70c
style
2015-07-01 14:36:42 +00:00
okan
ee0e8d6843
only special case label matches (and still list); get rid of the rest - matchname is complete enough
2015-07-01 14:29:36 +00:00
okan
cfb0bdf8f5
no longer need to pass down format strings after introducing search_print_cmd
2015-06-30 19:02:24 +00:00
okan
6e095b76d0
Introduce a callback for cmd menu printing, special-casing 'lock' and
...
'term'.
2015-06-30 18:54:12 +00:00
okan
ccd054aba7
keep cmdq sorted
2015-06-30 18:44:29 +00:00
okan
5fede6d784
style and spacing nits
2015-06-30 18:42:50 +00:00
okan
eb3dae29d1
Re-implement XClientMessage handling so that we can feed screen_find and
...
client_find valid resources as needed, relieving the need for
screen_find to ungracefully handle invalid root windows. Removes a long
standing XXX. Should theoretically allow XClientMessage handling on
more than one X screen. Alter callers of screen_find to handle
failures.
2015-06-30 14:01:43 +00:00
okan
89eefd254e
Shuffle code in kbfunc_ssh so that a missing known_hosts file still
...
allows a (now blank) menu to appear, as opposed to nothing at all.
Behavior reported by Alex Greif.
2015-06-29 14:24:40 +00:00
okan
b7512d9dd0
move client_find down
2015-06-28 19:54:37 +00:00
okan
a585206d81
replace assert usage
2015-06-28 19:50:46 +00:00
okan
0eb3c16128
region is a _ctx, so name it so
2015-06-26 18:54:25 +00:00
okan
933ce723de
Mechanical change from xinerama to region backed areas.
2015-06-26 17:17:46 +00:00
okan
44693cc984
collect 'gap' applications
2015-06-26 16:11:21 +00:00
okan
9660be8b0b
Replace screen region info gathering with XRandR equivalent of Xinerama
...
queries (currently act on XRandR events anyway). Fall-back mode without
XRandR is still what X provides. This removes -lXinerama.
2015-06-26 15:21:58 +00:00
okan
6aef9ae536
typo in comment; from jsteinha [at] iutbayonne.univ-pau.fr
2015-06-09 13:02:15 +00:00
okan
c049f12cd4
just populating the ctx is enough since the menu uses a callback and ignores anything else
2015-06-08 15:43:13 +00:00
okan
fb854e1538
switch to search_print_client() as the print callback since it will now display labels as well
2015-06-08 15:41:27 +00:00
okan
0a2c4b1939
add client label
2015-06-08 15:34:03 +00:00
okan
5a1ff2b250
stash window dimensions
2015-06-08 15:11:29 +00:00
okan
d7a3230790
clean up
2015-06-08 15:08:44 +00:00
okan
a4ce9f9682
even if the menuq is empty, at least show an empty menu instead of just
...
bailing making it look like the binding isn't working.
2015-06-07 19:10:00 +00:00
okan
ee2e58a8b1
use the same geometry struct in menus as everywhere else
2015-06-05 18:43:36 +00:00
okan
055ed363c8
add a flag to indicate a menu list instead of overloading 'prompt'
2015-06-05 15:01:51 +00:00
okan
3f1203de8a
redundant check for 'list'
2015-06-05 14:54:04 +00:00
okan
ee2e92a9e4
a start to cleaning:
...
- no reason for pointer movement and window movement and resizing
sections that just describe default key bindings
- key bindings are for all search and exec dialogs, not just for windows
- adding missing bindings
- normalize and wordsmith
- re-order sections according to mdoc(7)
feedback and ok from jmc@
2015-05-31 23:07:36 +00:00
okan
d6e84c8298
merge kbd and mouse grouptoggle
2015-05-21 00:37:04 +00:00
okan
2c1757a009
fill in mwm defines
2015-05-20 23:54:39 +00:00
kspillner
7cb74619f1
Fix autogroup so name,class doesn't need to be quoted.
...
ok okan@ on an older version of this diff
2015-05-17 04:39:50 +00:00
kspillner
955b6eef83
Make window name and window class separate parameters to conf_autogroup.
...
No functional change, but will be used shortly.
ok okan@
2015-05-17 04:34:01 +00:00
okan
704330faff
plug a leak
2015-03-29 00:21:05 +00:00
okan
32d16969bc
Introduce a xreallocarray and convert a few xcalloc instances that do
...
not require zero'ing.
2015-03-28 23:12:47 +00:00
okan
d42a248920
Reshuffle and slightly simplify menu_complete_path(), removing an
...
allocation, for tab-completion; checked by Alexander Polakov as well.
2015-03-28 22:09:10 +00:00
okan
f345dc8f9a
plug a leak
2015-03-28 21:55:48 +00:00
okan
da47515de4
Simplify key/mb binding moving argtype into flags and dropping another
...
variable; removes the need to zero out struct binding, leaving a simple
malloc.
2015-03-26 21:41:43 +00:00
okan
99ed76e391
simplify error messages; discussed with doug@
2015-02-14 18:24:12 +00:00
okan
8e6050dcaa
calloc -> malloc
2015-01-24 18:16:59 +00:00
okan
6b49aaeac1
use malloc over calloc here
2015-01-23 20:26:36 +00:00
okan
3d638de617
First restore net_wm_state(ewmh), then wm_state(iccc); prevents clients
...
from re-hiding on restart due to flag toggling (note that this is ripe
for re-vamping). Behavior only observed on restarts.
Problem found by, and initial patch from, Henri Kemppainen (thanks!),
though ever so slightly different one applied.
2015-01-23 19:35:11 +00:00
okan
c199720bcc
Switch to limits.h; replace MAXPATHLEN and MAXHOSTNAMELEN with PATH_MAX
...
and HOST_NAME_MAX+1, respectively.
ok doug@
2015-01-19 14:54:16 +00:00
okan
ef55bfa6b2
Catch up with src parse.y changes by jsg@:
...
Don't allow embedded nul characters in strings.
Fixes a pfctl crash with an anchor name containing
an embedded nul found with the afl fuzzer.
pfctl parse.y patch from and ok deraadt@
2015-01-17 02:05:03 +00:00
okan
7832f8c64d
Add gcc format attributes for yyerror(); fix a few yyerror() calls.
...
Adapted from src parse.y changes by doug@. OK doug@
2015-01-16 18:28:08 +00:00
okan
d796bd3619
no need for calloc(1,.. here, malloc is fine since we initialize
2014-10-08 15:31:01 +00:00
okan
72676125b1
make group_init work like other *_init's
2014-10-08 12:48:51 +00:00
okan
c9178afc38
these have nothing to do with 'sticky', but rather group membership; rename.
2014-09-27 19:04:32 +00:00
okan
7832c14ed0
Pass just the group to group_setactive instead of the screen and an
...
index which then needed to be found in a queue.
2014-09-27 18:57:11 +00:00
okan
9cd0504ba3
Update _NET_CURRENT_DESKTOP with the screen's group_active->num.
2014-09-23 14:25:08 +00:00
okan
b9aa350408
Move stuff that doesn't belong in group_init; while here, explicitly
...
initialize hideall and cycling.
2014-09-23 13:45:48 +00:00
okan
c9ebdf69aa
Move motion time check to the top of each MotionNotify block (and
...
eliminate from ButtonRelease); further limits the amount of work done
outside the threshold, notably mousefunc_sweep_calc,
screen_find_xinerama and client_snapcalc.
2014-09-18 13:56:58 +00:00
okan
1d2cb82cf4
these client actions are just toggles; less confusing with better names
2014-09-17 18:41:44 +00:00
okan
9daa5fe3e6
ewmh states _NET_WM_STATE_STICKY should not alter position
2014-09-17 18:09:30 +00:00
okan
05b4f3491a
Use a similarly named check as sticky for hidden check in a group.
2014-09-17 16:32:53 +00:00
okan
49d0fee8b5
don't toggle _WM_STATE_HIDDEN here yet
2014-09-17 16:30:21 +00:00
okan
8ffcf70d79
Implement EWMH _NET_WM_STATE_HIDDEN.
2014-09-17 16:00:44 +00:00
okan
d4ceb9f4e3
Introduce a check to see if a group holds only 'sticky' clients and use
...
this check to decide if a group is virtually empty. Rationale: if a
group contains *only* 'sticky' clients, it should be skipped while
cycling through groups. Apply similar logic to the group menu.
Based on an idea from phessler@, who also tested another version.
2014-09-17 14:31:37 +00:00
okan
50da66bd50
use similiar style for client flags
2014-09-15 13:00:49 +00:00
okan
264064d617
Remove incorrect cast in kbfunc_exec. In kbfunc_ssh, reverse logic on
...
truncation check so it's obvious.
2014-09-11 16:06:26 +00:00
okan
3d7b8e2b10
fold in 'active' into 'flags'
2014-09-10 20:30:38 +00:00
okan
5b08aa926e
move the check for an empty queue up during cycle
2014-09-08 21:24:27 +00:00
okan
57ff8d4658
name the group client queue appropriately, like other queues
2014-09-08 21:15:14 +00:00
okan
85b6a48da7
more style nits and wrapping
2014-09-08 20:37:02 +00:00
okan
f091741024
since mruq has been folded in, rename mru-named functions
2014-09-08 20:32:40 +00:00
okan
0fefd96f3e
Remove duplicate client queue (mruq); instead, remove and take the
...
global Clientq and place it inside screen_ctx since every client belongs
to a screen, then use the same per screen clientq to track stacking
order (the sole reason for mruq).
2014-09-08 20:11:22 +00:00
okan
898bea2d90
Now that a group knows its screen, only pass down the group_ctx.
2014-09-08 13:51:29 +00:00
okan
b5dd6e391c
Add screen_ctx to group_ctx, and populate on init.
2014-09-07 20:57:26 +00:00
okan
c4e86dacb9
more style nits
2014-09-07 19:27:30 +00:00
okan
ae092d4229
screen_fromroot -> screen_find
2014-09-07 17:38:38 +00:00
okan
63dc9657ad
Get rid of a redundant array of groups per screen; we already have a
...
link to the group queue for each screen.
2014-09-07 17:27:20 +00:00
okan
ea3574d110
Few style nits; extend 'path' to MAXPATHLEN.
2014-09-06 18:50:43 +00:00
okan
28f5392d74
generic sighandler
2014-09-06 16:24:32 +00:00
okan
dc9a1b77d9
style nit
2014-09-06 16:18:08 +00:00
okan
70027868ed
Move termpath and lockpath into cmdq; side effect is that 'lock' and
...
'term' now show up in the application menu.
2014-09-06 16:14:35 +00:00
okan
4abab66820
Rework group names: stash the group name inside the group_ctx as opposed
...
to having to manage an array outside in screen_ctx for group names and
shortcuts. Simplifies (and moves bits for) reading, and constructing
data for, EWMH's _NET_DESKTOP_NAMES.
2014-09-06 16:08:58 +00:00
okan
bef5d30e83
bring menu bits closer together
2014-09-02 14:08:39 +00:00
okan
1150bfd22b
add explicit paran and drop some empty lines bringing like functions closer
2014-09-01 18:17:32 +00:00
okan
de52ddf635
Merge group_menu into mousefunc_menu_group.
2014-09-01 18:04:58 +00:00
okan
ea1518cb5c
Since the flatting out of sc->group_names is only for setting
...
NET_DESKTOP_NAMES, merge the helper into xu_ewmh_net_desktop_names,
where we actually set the property.
2014-08-25 14:31:22 +00:00
okan
749976d1d7
Implement _NET_WM_STATE_STICKY, bound to CM-s by default; allows any
...
client to 'stick' to all desktops (ewmh speak) or groups - this
currently has the same affect as setting a client's group to 'nogroup',
with the exception that the client can also be in a group, so when
un-sticking, the client will go back to its original group/desktop.
2014-08-25 12:49:19 +00:00
okan
4acfe91344
Continue effort to bring keyboard and mouse functions together; merge
...
name_to_kbfunc and name_to_mousefunc.
2014-08-24 15:49:58 +00:00
okan
4485c34f15
gc->hidden has never consistently kept track of a group's state;
...
group_show() and group_hide() are not the only ways a group can change
state - if all clients in a group are either hidden or unhidden, then
that group's state should change, as well as the various EWMH ways.
Instead of trying to keep track in a wide variety of places, simply
query the clients in a group before needing to take action based on the
group's state. Solves long standing confusion of when a group is hidden
or not.
2014-08-24 15:37:45 +00:00
okan
9567454909
Fix nogroup regression, where nogroup became an actual group - the
...
symantics between cwm groups and ewmh got in the way. Ensure a client
that wants to be in nogroup stays in nogroup (thus stays in view), even
when (re)reading NET_WM_DESKTOP. Paritially reverts patchset 644
(2014-02-07 13:09 PST) which deals with a NULL cc->group. All to be
revisited when NET_WM_STATE_STICKY hits cwm.
Reported by many; testing and ok phessler.
2014-08-22 19:04:00 +00:00
okan
b7cd8019f2
Purely mechanical; unify 'num', 'no' and 'shortcut'.
2014-08-20 15:15:29 +00:00
okan
045b994659
Split off group window restacking.
2014-08-20 13:42:27 +00:00
okan
2c1d1423f8
whitespace
2014-08-20 12:35:39 +00:00
okan
cb5bdeabf0
fix a misleading comment and function name
2014-08-20 12:33:12 +00:00
okan
f819bd3e15
Remove unnecessary memset since reload was replaced with restart;
...
from Kent Spillner.
2014-08-19 18:39:41 +00:00
okan
7fd50277e7
Pull highstack from group_ctx (and useless calculations of); in the one
...
place that we use highstack, replace that usage with a local variable
(for now until stacking is done properly).
2014-08-19 12:47:51 +00:00
okan
c4aace036f
Get rid of nhidden in group_ctx; it actually never reported correctly
...
since nhidden wasn't incremented nor decremeted in all the right places,
thus confusing matters. We don't need to carry a count around, so just
use a local variable in the one place we need one to supply
XRestackWindows().
2014-08-18 13:57:57 +00:00
okan
0cb1db2d4c
plug memleak (currently unused func); from Tiago Cunha
2014-04-21 12:52:14 +00:00
okan
877931bf62
Alignment fix; found the hard way on sparc64 by landry@ (and thanks too
...
for fast access to a box!)
ok deraadt@, matthieu@
2014-02-27 00:52:57 +00:00
okan
875128a0cb
Make sure we cycle through existing client's group membership and set
...
the hidden state on the group; important to know group hidden state
after a re-exec or restart of cwm (as easily seen in group menu).
2014-02-08 02:49:30 +00:00
okan
1a7c8d161a
Replace a few hand rolled loops with like tailq loops.
2014-02-08 02:40:43 +00:00
okan
92bf6935f5
all mapped clients now should have a group, so simplify some cases
2014-02-07 21:59:56 +00:00
okan
60a1b7520a
If _NET_WM_DESKTOP is set to -1 during client creation, place the client into
...
group 0 (nogroup); solves problem initially discovered by oga@nicotinebsd with
tint2. A clientmessage *after* client creation already handles this case.
Go further and assign every client to a group; in non-sticky mode, group 0
(nogroup) and sticky mode, the active group. In both cases, autogroup will
override the group assignment. Removing a group from a client always places
the client back into group 0 (nogroup). Autogroup can also assign a client to
group 0 (nogroup) to keep a client always visible (unless of course one opts to
hide all clients).
2014-02-07 18:09:54 +00:00
okan
b23ca72ab1
Some clients set the urgency flag even if they are the active client;
...
prevent annoying behavior by only setting the cwm urgency flag if the client
is not active; diff from Thomas Adam.
2014-02-06 20:58:46 +00:00
okan
16de3733be
Introduce a region queue and replace screen's XineramaScreenInfo; we
...
still use Xinerama to populate the regions per screen, but will switch
at a more appropriate time.
2014-02-03 21:07:47 +00:00
okan
4c3987dcc1
make this XQueryTree like the other
2014-02-03 20:29:05 +00:00
okan
ea2abae9f3
Move redundant bits from screen_init (while dealing with existing
...
clients) directly into client_init, performing the X roundtrip only
once. With the previous change in maprequest, this moves decision making
into one place for creating new clients.
2014-02-03 20:20:39 +00:00
okan
bb4485df6b
Move redundant window attr fetch from maprequest directly into
...
client_init and perform that X roundtrip only once.
2014-02-02 21:34:05 +00:00
okan
03847f1c2e
No need to store screen colormap and visual; rather just use the X
...
macros in the one place they are needed.
2014-02-02 16:29:04 +00:00
okan
49f2f86dbd
Unlike free(3), XFree(3) can't be passed a NULL pointer.
2014-02-02 16:13:50 +00:00
okan
4ce9b05438
The menu already limits entries with MENU_MAXENTRY, so don't bother
...
holding a command name limit as well.
2014-02-02 15:46:05 +00:00
okan
9062093012
Take menu's bwidth into account for position/size; reported by Thomas Adam.
2014-02-01 19:28:46 +00:00
okan
d413fd6b56
Let the config parser continue parsing even after encountering an error;
...
original idea (with now-outdated patch) from Thomas Adam. Since we now
report where errors exist, this now makes more sense. Expand a bit on
config file parsing in the cwm(1).
Discussed with a few, including sthen; ok sthen.
2014-02-01 00:25:04 +00:00
okan
364a7628cb
re-add lost free from previous
2014-01-30 22:41:16 +00:00
okan
4de6836838
Switch ignoreq to winname struct since it's basically the same thing;
...
removes limit on name matching.
2014-01-30 22:17:22 +00:00
okan
ca2497d48b
use the same autogroupwin variable as everywhere else
2014-01-30 15:43:53 +00:00
okan
9f5aa96cc7
Move cwm_status around to avoid header fu, and remove extraneous signal
...
header from xevents.c; noticed by Christian Neukirchen.
2014-01-30 15:41:11 +00:00
okan
06d9319772
Remove duplicate mouse functions and instead use the kbfunc ones. No
...
user visable changes at this point, but they'll merge at an appropriate
time.
2014-01-30 14:40:21 +00:00
okan
d5979e3ab6
Minimize trivial differences between a few kb and mb functions.
2014-01-29 22:30:00 +00:00
okan
e2d5d73e53
keybinding -> key binding
2014-01-29 21:17:33 +00:00
okan
78ff1f748c
Merge keybinding and mousebinding queues into using the same merged
...
struct, binding; they were essentially the same accept for what was
'pressed', keysym or button.
2014-01-29 21:13:52 +00:00
okan
cd007c0d08
Much like we do for keyboard and mouse bindings, remove duplicates for
...
command name - last match.
2014-01-29 18:43:27 +00:00
okan
2ffb124daa
Check command name/path for truncation and provide user feedback during
...
config parse (and use conf_cmd_add to populate defaults); based on a
discussion with Tiago Cunha. While this looks ugly, there are likely
some other changes here to come.
2014-01-29 18:34:22 +00:00
okan
0590f4c1fc
Check ignore windowname for truncation and provide user feedback during
...
config parse; based on a discussion with Tiago Cunha.
2014-01-28 20:22:21 +00:00
okan
2d6c7c78d8
The EWMH spec states that if the cardinal returned is 0xFFFFFFFF (-1)
...
then the window should appear on all desktops, which in our case is
assigned to group 0. Found to fix stalonetray due to the non-ewmh aware
range checking in group_movetogroup(); from Thomas Adam.
2014-01-28 13:40:40 +00:00
okan
e395fd7bea
Move conf_init/clear into main - no behaviour change; from Tiago Cunha.
2014-01-28 00:42:20 +00:00
okan
beb28798ef
move some init up and shed some blank lines
2014-01-27 15:13:09 +00:00
okan
fad126f1a3
simplify parse_config using assignment; inspired by a very old diff from
...
Tiago Cunha.
2014-01-27 14:49:40 +00:00
okan
d0425acdda
more range checking
2014-01-24 22:38:02 +00:00
okan
66e13c1a60
correct arguments and drop the cast.
...
sanity check by oga@nicotinebsd
2014-01-24 15:08:06 +00:00
okan
9ffdedb82e
no need to quote within warning
2014-01-23 17:13:38 +00:00
okan
40c619037f
If no title is supplied, term uses only the basename for its title.
...
This is useless when searching for windows launched via the ssh command
menu; supply a more useful title: '[ssh] <hostname>'.
Idea from todd@, ok todd@
2014-01-23 16:51:28 +00:00
okan
b740a0a91a
zap whitespace
2014-01-22 22:41:09 +00:00
okan
fa2846fe29
cwm_argv doesn't need to be global any longer
2014-01-22 22:26:05 +00:00
okan
3aff0ea880
start properly releasing X resources during teardown
2014-01-22 22:14:02 +00:00
okan
3b8ad25f38
Somewhat streamline event loop/restart/quit handling; most notable
...
change allows a restart to trigger proper teardown first, even though
teardown is not (yet) complete.
After some discussion with oga@nicotinebsd.org regarding a more
complicated version/idea.
2014-01-22 21:48:27 +00:00
okan
b92e846e56
Sprinkle a few more const; from Tiago Cunha.
2014-01-21 15:42:44 +00:00
okan
69bb069674
Save the ptr position before lowering via kbd, so as to be able to cycle
...
back with the pointer in the right place; matches behaviour when
lowering via the mouse function.
2014-01-20 23:18:47 +00:00
okan
57bbf0fd90
merge KBFLAG_NEEDCLIENT and MOUSEBIND_CTX_*; brings kbfunc and mousefunc
...
bits even closer.
2014-01-20 23:03:51 +00:00
okan
42e2d07b2b
Use argument to pass down flags for mousefunc cyclegroup; removes
...
rcyclegroup wrapper need - now similar to kbfunc.
2014-01-20 22:31:53 +00:00
okan
9a540a7adb
constify and rename some confusing variables around cmdq.
2014-01-20 21:34:32 +00:00
okan
7e2aa0c80b
- remove redundant range check for buttons in conf_bind_mouse.
...
- make conf_bind_kbd return error on non-matches to match what
conf_bind_mouse does.
- rename some variables while here for clarity.
- constify bind and cmd.
from Tiago Cunha.
2014-01-20 19:06:04 +00:00
okan
83b0cbf116
Add a function that adds an entry to a menuq, normalizing a common code
...
path; from Tiago Cunha.
2014-01-20 18:58:03 +00:00
okan
72ccee09ff
use consistent types
2014-01-03 15:29:06 +00:00
okan
a2ae5b4d2d
state is long
2014-01-03 14:23:50 +00:00
okan
9fbf947a27
calculate proper menu width/height on the first Expose event; 'jump' (while using gap) noticed by Christian Neukirchen
2014-01-02 22:49:10 +00:00
okan
c0d34338d1
Accept _NET_CURRENT_DESKTOP ClientMessage; from Thomas Adam, though
...
instead of group toggle, group only.
2014-01-02 22:43:55 +00:00
okan
37b3ff69f9
Accept _NET_WM_DESKTOP clientmessage; from Thomas Adam
2014-01-02 22:26:27 +00:00
okan
24e4f6a4b6
bring mousefunc closer to kbfunc
2014-01-02 21:30:20 +00:00
okan
424dc78f8e
gc keycode in keybinding since we only deal with keysym now
2014-01-02 21:17:23 +00:00