]> git.sur5r.net Git - i3/i3/log
i3/i3
13 years agoextend t/17-workspace.t to check if the numbers are assigned correctly
Michael Stapelberg [Mon, 5 Sep 2011 20:24:28 +0000 (22:24 +0200)]
extend t/17-workspace.t to check if the numbers are assigned correctly

13 years agoBugfix: Correctly handle workspace names which do not start with a zero
Michael Stapelberg [Mon, 5 Sep 2011 20:21:10 +0000 (22:21 +0200)]
Bugfix: Correctly handle workspace names which do not start with a zero

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-leaks'
Michael Stapelberg [Wed, 31 Aug 2011 12:45:11 +0000 (14:45 +0200)]
Merge branch 'fix-leaks'

13 years agoproperly free memory/close fd upon errors (Thanks xeen)
Michael Stapelberg [Wed, 31 Aug 2011 12:44:48 +0000 (14:44 +0200)]
properly free memory/close fd upon errors (Thanks xeen)

Found with the static analyzer cppcheck

13 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 29 Aug 2011 14:05:11 +0000 (16:05 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-userguide'
Michael Stapelberg [Mon, 29 Aug 2011 14:05:08 +0000 (16:05 +0200)]
Merge branch 'fix-userguide'

13 years agodocs/userguide: state that mod+shift+space toggles, add link to criteria in for_windo...
Michael Stapelberg [Mon, 29 Aug 2011 14:04:42 +0000 (16:04 +0200)]
docs/userguide: state that mod+shift+space toggles, add link to criteria in for_window (Thanks Don)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 29 Aug 2011 13:17:53 +0000 (15:17 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-borderless'
Michael Stapelberg [Mon, 29 Aug 2011 13:17:50 +0000 (15:17 +0200)]
Merge branch 'fix-borderless'

13 years agodocs/userguide: new_window: s/borderless/none/ (Thanks bjonnh)
Michael Stapelberg [Mon, 29 Aug 2011 13:17:31 +0000 (15:17 +0200)]
docs/userguide: new_window: s/borderless/none/ (Thanks bjonnh)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 18:18:03 +0000 (20:18 +0200)]
Merge branch 'master' into next

13 years agodebian: bump version so that apt prefers source builds over debian repository versions
Michael Stapelberg [Sun, 28 Aug 2011 18:17:38 +0000 (20:17 +0200)]
debian: bump version so that apt prefers source builds over debian repository versions

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 18:07:29 +0000 (20:07 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'release-4.0.2'
Michael Stapelberg [Sun, 28 Aug 2011 18:07:26 +0000 (20:07 +0200)]
Merge branch 'release-4.0.2'

13 years agodebian: wrap debian/control correctly
Michael Stapelberg [Sun, 28 Aug 2011 17:56:46 +0000 (19:56 +0200)]
debian: wrap debian/control correctly

13 years agobump version number in man/asciidoc.conf 4.0.2
Michael Stapelberg [Sun, 28 Aug 2011 17:47:03 +0000 (19:47 +0200)]
bump version number in man/asciidoc.conf

13 years agoadd release notes for v4.0.2
Michael Stapelberg [Sun, 28 Aug 2011 17:17:43 +0000 (19:17 +0200)]
add release notes for v4.0.2

13 years agodebian: update changelog for the 4.0.2 release
Michael Stapelberg [Sun, 28 Aug 2011 17:09:57 +0000 (19:09 +0200)]
debian: update changelog for the 4.0.2 release

13 years agoMerge branch 'fix-wsnum' into next
Michael Stapelberg [Sun, 28 Aug 2011 16:17:25 +0000 (18:17 +0200)]
Merge branch 'fix-wsnum' into next

13 years agoBugfix: Correctly assign a number to workspaces starting with '0: ' (Thanks SardemFF7)
Michael Stapelberg [Sun, 28 Aug 2011 16:17:02 +0000 (18:17 +0200)]
Bugfix: Correctly assign a number to workspaces starting with '0: ' (Thanks SardemFF7)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 16:03:06 +0000 (18:03 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'userguide'
Michael Stapelberg [Sun, 28 Aug 2011 16:03:03 +0000 (18:03 +0200)]
Merge branch 'userguide'

13 years agodocs/userguide: properly document command chaining and criteria
Michael Stapelberg [Sun, 28 Aug 2011 16:02:49 +0000 (18:02 +0200)]
docs/userguide: properly document command chaining and criteria

13 years agodocs/userguide: properly document the resize command
Michael Stapelberg [Sun, 28 Aug 2011 15:51:37 +0000 (17:51 +0200)]
docs/userguide: properly document the resize command

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 15:44:59 +0000 (17:44 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-urls'
Michael Stapelberg [Sun, 28 Aug 2011 15:44:57 +0000 (17:44 +0200)]
Merge branch 'fix-urls'

13 years agos/i3.zekjur.net/i3wm.org/g
Mark Kusch [Sun, 28 Aug 2011 07:59:03 +0000 (09:59 +0200)]
s/i3.zekjur.net/i3wm.org/g

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 15:41:23 +0000 (17:41 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-ipc-name'
Michael Stapelberg [Sun, 28 Aug 2011 15:40:15 +0000 (17:40 +0200)]
Merge branch 'fix-ipc-name'

13 years agoUse name_json if available, rather than non-descriptive name.
Peter Bui [Sun, 21 Aug 2011 20:19:53 +0000 (16:19 -0400)]
Use name_json if available, rather than non-descriptive name.

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 15:02:19 +0000 (17:02 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'migrate-indention'
Michael Stapelberg [Sun, 28 Aug 2011 15:02:17 +0000 (17:02 +0200)]
Merge branch 'migrate-indention'

13 years agomigrate-config: use \s, be a bit more whitespace tolerant (+test) (Thanks sbedivere)
Michael Stapelberg [Sun, 28 Aug 2011 15:01:37 +0000 (17:01 +0200)]
migrate-config: use \s, be a bit more whitespace tolerant (+test) (Thanks sbedivere)

Fixes: #457
13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 14:18:24 +0000 (16:18 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'wizard-fix-mods'
Michael Stapelberg [Sun, 28 Aug 2011 14:18:21 +0000 (16:18 +0200)]
Merge branch 'wizard-fix-mods'

13 years agoi3-config-wizard: Bugfix: Check the modifier mapping to decide whether to use Mod1...
Michael Stapelberg [Sun, 28 Aug 2011 14:16:53 +0000 (16:16 +0200)]
i3-config-wizard: Bugfix: Check the modifier mapping to decide whether to use Mod1 or Mod4

Fixes #491

Before, we assumed XK_Alt_L was in Mod1 and XK_Super_L was in Mod4 (which is
true on most systems). Now we just check if the keycode is in Mod1 or Mod4 and
write the config accordingly.

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 13:47:35 +0000 (15:47 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-floatdock'
Michael Stapelberg [Sun, 28 Aug 2011 13:47:31 +0000 (15:47 +0200)]
Merge branch 'fix-floatdock'

13 years agoBugfix: Make 'floating enable' check for dock windows (Thanks edelkind)
Michael Stapelberg [Sun, 28 Aug 2011 13:46:50 +0000 (15:46 +0200)]
Bugfix: Make 'floating enable' check for dock windows (Thanks edelkind)

Fixes #501

13 years agot/66-assign: check if i3 crashes when assigning a dock window to floating
Michael Stapelberg [Sun, 28 Aug 2011 13:43:51 +0000 (15:43 +0200)]
t/66-assign: check if i3 crashes when assigning a dock window to floating

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 28 Aug 2011 12:55:17 +0000 (14:55 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'userguide-wrapping'
Michael Stapelberg [Sun, 28 Aug 2011 12:55:14 +0000 (14:55 +0200)]
Merge branch 'userguide-wrapping'

13 years agodocs/userguide: document force_focus_wrapping config directive
Michael Stapelberg [Sun, 28 Aug 2011 12:54:58 +0000 (14:54 +0200)]
docs/userguide: document force_focus_wrapping config directive

13 years agoMerge branch 'colors-userguide' into next
Michael Stapelberg [Sat, 27 Aug 2011 14:47:53 +0000 (16:47 +0200)]
Merge branch 'colors-userguide' into next

13 years agoMerge branch 'colors-userguide'
Michael Stapelberg [Sat, 27 Aug 2011 14:47:49 +0000 (16:47 +0200)]
Merge branch 'colors-userguide'

13 years agodocs/userguide: use the default colors in the colors example
Michael Stapelberg [Sat, 27 Aug 2011 14:47:36 +0000 (16:47 +0200)]
docs/userguide: use the default colors in the colors example

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 27 Aug 2011 13:28:34 +0000 (15:28 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-userguide'
Michael Stapelberg [Sat, 27 Aug 2011 13:28:31 +0000 (15:28 +0200)]
Merge branch 'fix-userguide'

13 years agodocs/userguide: s/mod+h/mod+s for stacking (Thanks Tim)
Michael Stapelberg [Sat, 27 Aug 2011 13:28:11 +0000 (15:28 +0200)]
docs/userguide: s/mod+h/mod+s for stacking (Thanks Tim)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 27 Aug 2011 11:47:57 +0000 (13:47 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-dock-reconfigure'
Michael Stapelberg [Sat, 27 Aug 2011 11:47:51 +0000 (13:47 +0200)]
Merge branch 'fix-dock-reconfigure'

13 years agoBugfix: Re-implement reconfiguring height of dock windows (+test) (Thanks thomasba)
Michael Stapelberg [Sat, 27 Aug 2011 11:47:10 +0000 (13:47 +0200)]
Bugfix: Re-implement reconfiguring height of dock windows (+test) (Thanks thomasba)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 27 Aug 2011 11:03:20 +0000 (13:03 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-focus-assign'
Michael Stapelberg [Sat, 27 Aug 2011 11:03:17 +0000 (13:03 +0200)]
Merge branch 'fix-focus-assign'

13 years agoBugfix: Don’t always focus floating windows (fixes focus stealing with assignments...
Michael Stapelberg [Sat, 27 Aug 2011 11:02:44 +0000 (13:02 +0200)]
Bugfix: Don’t always focus floating windows (fixes focus stealing with assignments) (+test) (Thanks aksr)

13 years agoMerge branch 'fix-yajl-warning' into next
Michael Stapelberg [Fri, 26 Aug 2011 21:33:40 +0000 (23:33 +0200)]
Merge branch 'fix-yajl-warning' into next

13 years agoipc.c: Fix warning
stfn [Fri, 26 Aug 2011 01:44:42 +0000 (03:44 +0200)]
ipc.c: Fix warning

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 26 Aug 2011 17:18:16 +0000 (19:18 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-move-focus'
Michael Stapelberg [Fri, 26 Aug 2011 17:18:13 +0000 (19:18 +0200)]
Merge branch 'fix-move-focus'

13 years agoBugfix: Re-enable X11 Eventmask *after* pushing all the X11 changes
Michael Stapelberg [Fri, 26 Aug 2011 17:11:46 +0000 (19:11 +0200)]
Bugfix: Re-enable X11 Eventmask *after* pushing all the X11 changes

This should fix focus problems where EnterNotify events were generated while
moving windows. Hopefully it does not trigger any regressions :).

Fixes #500

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 26 Aug 2011 10:37:04 +0000 (12:37 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-duplicate-ws-assign'
Michael Stapelberg [Fri, 26 Aug 2011 10:37:00 +0000 (12:37 +0200)]
Merge branch 'fix-duplicate-ws-assign'

13 years agoBugfix: Correctly recognize duplicate workspace assignments (Thanks Moredread)
Michael Stapelberg [Fri, 26 Aug 2011 10:35:42 +0000 (12:35 +0200)]
Bugfix: Correctly recognize duplicate workspace assignments (Thanks Moredread)

Example of a faulty config:

    workspace 5 VGA1
    workspace 5 LVDS1

Fixes #498, #499

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 26 Aug 2011 01:33:36 +0000 (03:33 +0200)]
Merge branch 'master' into next

13 years agoupdate changelog (not releasing yet)
Michael Stapelberg [Fri, 26 Aug 2011 01:33:26 +0000 (03:33 +0200)]
update changelog (not releasing yet)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 26 Aug 2011 01:24:14 +0000 (03:24 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-warning'
Michael Stapelberg [Fri, 26 Aug 2011 01:24:10 +0000 (03:24 +0200)]
Merge branch 'fix-warning'

13 years agoFix prototype of con_inside_focused
Michael Stapelberg [Fri, 26 Aug 2011 01:23:57 +0000 (03:23 +0200)]
Fix prototype of con_inside_focused

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 26 Aug 2011 01:18:16 +0000 (03:18 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-focus-parent'
Michael Stapelberg [Fri, 26 Aug 2011 01:18:12 +0000 (03:18 +0200)]
Merge branch 'fix-focus-parent'

13 years agoCorrectly render containers when a split container is focused
Michael Stapelberg [Fri, 26 Aug 2011 01:17:41 +0000 (03:17 +0200)]
Correctly render containers when a split container is focused

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 26 Aug 2011 00:02:50 +0000 (02:02 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-assign'
Michael Stapelberg [Fri, 26 Aug 2011 00:02:47 +0000 (02:02 +0200)]
Merge branch 'fix-assign'

13 years agoBugfix: Only consider tiling windows when attaching tiling windows to workspaces...
Michael Stapelberg [Fri, 26 Aug 2011 00:01:06 +0000 (02:01 +0200)]
Bugfix: Only consider tiling windows when attaching tiling windows to workspaces (Thanks Tucos)

Fixes #436

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 25 Aug 2011 23:20:18 +0000 (01:20 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'wizard-click'
Michael Stapelberg [Thu, 25 Aug 2011 23:20:14 +0000 (01:20 +0200)]
Merge branch 'wizard-click'

13 years agoi3-config-wizard: handle mouse button clicks on <win> and <alt>
Michael Stapelberg [Thu, 25 Aug 2011 23:19:46 +0000 (01:19 +0200)]
i3-config-wizard: handle mouse button clicks on <win> and <alt>

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 25 Aug 2011 19:59:19 +0000 (21:59 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-set-tabs'
Michael Stapelberg [Thu, 25 Aug 2011 19:59:15 +0000 (21:59 +0200)]
Merge branch 'fix-set-tabs'

13 years agoBugfix: Accept '\t' in the 'set' command, don’t die but ELOG in case of errors (Thank...
Michael Stapelberg [Thu, 25 Aug 2011 19:58:03 +0000 (21:58 +0200)]
Bugfix: Accept '\t' in the 'set' command, don’t die but ELOG in case of errors (Thanks atsutane)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 25 Aug 2011 16:51:02 +0000 (18:51 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-i3bar-input'
Michael Stapelberg [Thu, 25 Aug 2011 16:50:58 +0000 (18:50 +0200)]
Merge branch 'fix-i3bar-input'

13 years agoi3bar: Bugfix: When receiving EOF, immediately redraw and discard input
Michael Stapelberg [Thu, 25 Aug 2011 16:46:08 +0000 (18:46 +0200)]
i3bar: Bugfix: When receiving EOF, immediately redraw and discard input

13 years agoBugfix: set statusline = NULL, print error messages about EOF/SIGCHLD to stderr ...
Michael Stapelberg [Thu, 25 Aug 2011 15:10:45 +0000 (17:10 +0200)]
Bugfix: set statusline = NULL, print error messages about EOF/SIGCHLD to stderr (Thanks cls)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 25 Aug 2011 12:11:51 +0000 (14:11 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-userguide-namedws'
Michael Stapelberg [Thu, 25 Aug 2011 12:11:48 +0000 (14:11 +0200)]
Merge branch 'fix-userguide-namedws'

13 years agodocs/userguide: add paragraph about named workspaces, discourage use of 'ipc-socket'
Michael Stapelberg [Thu, 25 Aug 2011 12:11:31 +0000 (14:11 +0200)]
docs/userguide: add paragraph about named workspaces, discourage use of 'ipc-socket'

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 24 Aug 2011 22:24:12 +0000 (00:24 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-deco-1pixel'
Michael Stapelberg [Wed, 24 Aug 2011 22:24:09 +0000 (00:24 +0200)]
Merge branch 'fix-deco-1pixel'

13 years agoBugfix: Correctly render non-leaf containers (Thanks eeemsi, mseed)
Michael Stapelberg [Wed, 24 Aug 2011 22:23:33 +0000 (00:23 +0200)]
Bugfix: Correctly render non-leaf containers (Thanks eeemsi, mseed)

Fixes #465

13 years agoCompilation fix: Add dont_warp=false
Michael Stapelberg [Wed, 24 Aug 2011 21:06:49 +0000 (23:06 +0200)]
Compilation fix: Add dont_warp=false

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 24 Aug 2011 21:00:12 +0000 (23:00 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-move-float-output'
Michael Stapelberg [Wed, 24 Aug 2011 21:00:03 +0000 (23:00 +0200)]
Merge branch 'fix-move-float-output'

13 years agoBugfix: Correctly warp floating windows when using the 'move' command
Michael Stapelberg [Wed, 24 Aug 2011 20:59:46 +0000 (22:59 +0200)]
Bugfix: Correctly warp floating windows when using the 'move' command

13 years agoBugfix: Correctly keep focus when moving non-leaf windows
Michael Stapelberg [Wed, 24 Aug 2011 20:54:48 +0000 (22:54 +0200)]
Bugfix: Correctly keep focus when moving non-leaf windows

13 years agoBugfix: Fix coordinates when moving a floating window to a different output
Michael Stapelberg [Wed, 24 Aug 2011 20:54:10 +0000 (22:54 +0200)]
Bugfix: Fix coordinates when moving a floating window to a different output

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 24 Aug 2011 20:43:31 +0000 (22:43 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-floating-negative'
Michael Stapelberg [Wed, 24 Aug 2011 20:43:25 +0000 (22:43 +0200)]
Merge branch 'fix-floating-negative'

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 24 Aug 2011 20:43:15 +0000 (22:43 +0200)]
Merge branch 'master' into next

Conflicts:
src/floating.c