807d2288b6
Merge branch 'use-xkb-kc2ks'
2012-05-30 17:27:18 +02:00
7a67938f3c
Replace deprecated XKeycodeToKeysym() with XkbKeycodeToKeysym()
2012-05-30 17:24:43 +02:00
24b1fcfd1a
Merge branch 'tests-focus-parent-child'
2012-05-28 23:37:22 +02:00
485871ffdd
Get rid of references to level up/down.
...
In v4 syntax, that's focus parent/child.
2012-05-28 23:37:15 +02:00
04b5ec8165
Merge branch 'fix-keycodes'
2012-05-18 09:14:34 +02:00
7d657a6a65
Fix errors in i3.config.keycodes (bindsym -> bindcode)
2012-05-18 09:14:22 +02:00
0cce707451
Merge branch 'fix-stray-ws-number'
2012-05-16 06:24:50 +02:00
ec4e6d1cdf
Fix stray workspaces "number 1" being created when having workspace number 1 in your config
2012-05-16 06:24:16 +02:00
d1443f9c71
Merge branch 'i3bar-fix-null'
2012-05-12 08:24:09 +02:00
156a06e495
i3bar: Don’t crash when full_text is missing or null in the JSON input (Thanks fernandotcl)
2012-05-12 08:23:51 +02:00
56f6d01ba3
Merge branch 'focus-in-fullscreen'
2012-05-09 21:08:25 +02:00
4eab046e8f
Allow focus w/ target when in fs in some cases.
...
If the target is in a different workspace, there's no reason why
we wouldn't allow the user to focus it. We already allow this when
focusing a workspace, for example.
2012-05-09 21:08:19 +02:00
687ad3b44e
Merge branch 'fix-workspace-number'
2012-05-09 20:39:23 +02:00
edae08a4d9
maybe_back_and_forth now sets render_tree
2012-05-09 20:38:41 +02:00
42dcb4e8c4
make maybe_back_and_forth static
2012-05-09 20:34:40 +02:00
b88ab981fd
bugfix: less differentiation between named and numbered workspaces
...
calling workspace by number now also checks for switching back and forth
and creates a new workspace if no workspace starting with that number is
found
also removed the obsolete tree_render() in favor of setting
cmd_output->needs_tree_render to true
2012-05-09 20:33:59 +02:00
ec4dddb608
tests: add test to verify workspace_auto_back_and_forth works with 'workspace number'
2012-05-09 20:33:41 +02:00
82e0eaa315
tests: Check that 'workspace number <number>' opens a new workspace
2012-05-09 20:33:11 +02:00
4f93e0587a
don’t wrap when changing workspaces by mouse wheel scrolling
2012-05-09 20:16:02 +02:00
78721065e0
Merge branch 'fix-static-analysis'
2012-05-09 20:06:42 +02:00
62d3329906
remove dead code
...
This was a left-over of commit 9d68d780e2
2012-05-09 20:00:46 +02:00
f229570bbc
remove unused variable
2012-05-09 19:58:50 +02:00
a9b57a44a9
Remove set but never read variable
...
This was due to the changes in commit d25e77ce75
2012-05-09 19:56:21 +02:00
8b55b2c24c
Merge branch 'fix-dump-log-errmsg'
2012-05-09 19:47:10 +02:00
1b536d70cc
Improve the main error message of i3-dump-log
2012-05-09 19:46:44 +02:00
eeb6ff9237
Move is_debug_build() to libi3/
2012-05-09 19:12:20 +02:00
6bbcddab29
Merge branch 'fix-invalid-cmd-reply'
2012-05-02 22:02:37 +02:00
bbe607899c
Send proper error messages upon parser failures, use yajl for generating command replies
...
Fixes : #693
2012-05-02 22:01:50 +02:00
87cb664236
Merge branch 'fix-spelling'
2012-05-02 20:21:03 +02:00
5a29eb20e0
Fix spelling of success
...
Fixes : #695
2012-05-02 20:20:45 +02:00
1066676185
Merge branch 'build-mac-os-x'
2012-05-02 20:08:34 +02:00
280a35717b
log.c: len is always positive, remove useless check (Thanks Marcus)
2012-05-02 20:07:59 +02:00
07a385bb7a
don’t link against librt on Mac OS X (Thanks Marcus)
2012-05-02 20:06:57 +02:00
eedd1a64d7
Make log.c figure out the physical amount of memory on Mac OS X (Thanks Marcus)
2012-05-02 20:05:07 +02:00
4e734bf331
makefile: use LDFLAGS when linking test.commands_parser (Thanks Marcus)
2012-05-02 20:00:50 +02:00
fda8b3d44d
Merge branch 'release-4.2'
2012-04-25 23:30:18 +02:00
e69c54df07
debian: install the RELEASE-NOTES as upstream changelog for now
2012-04-25 23:21:10 +02:00
327267cc33
debian: bump changelog
2012-04-25 23:19:52 +02:00
d5ed466e0f
/usr/share/applications/i3.desktop: drop the encoding key, UTF-8 is now required
2012-04-25 23:18:22 +02:00
2b290c0bcc
debian: add i3-dump-log.1 to manpages
2012-04-25 23:18:04 +02:00
5fbbf3c09e
add release notes for v4.2
2012-04-25 23:06:39 +02:00
3a378f7cb1
i3bar: don’t immediately redraw bars after kicking tray clients
2012-04-24 12:04:35 +02:00
abd6f24bf2
a few little corrections for the previous commit
2012-04-23 23:21:51 +02:00
27b7f6a6e5
man/i3-input.man: Add description of options and improve examples.
2012-04-23 23:16:51 +02:00
17b477d25d
i3bar: when kicking tray clients, remove them immediately
...
This should fix empty spaces showing up instead of tray icons sometimes.
2012-04-22 20:53:01 +02:00
78891c1c62
i3bar: when tray_output == primary and there is no primary output, fall back to the first available output
2012-04-22 20:51:15 +02:00
17e4d7ede1
i3bar: kick tray clients after output configuration changed
...
This makes i3bar reflect xrandr --output foo --primary changes immediately.
2012-04-22 20:43:52 +02:00
189b27b01e
i3bar: Bugfix: Properly update the primary flag
2012-04-22 20:43:43 +02:00
54222d5617
Merge branch 'master' into next
2012-04-22 20:11:25 +02:00
75720fa88e
Merge branch 'fix-i3bar-dying-tray'
2012-04-22 20:11:07 +02:00
Michael Stapelberg