]> git.sur5r.net Git - i3/i3/log
i3/i3
10 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 29 Jun 2013 17:28:41 +0000 (19:28 +0200)]
Merge branch 'master' into next

10 years agoMerge branch 'fix-unaligned-memory'
Michael Stapelberg [Sat, 29 Jun 2013 17:28:41 +0000 (19:28 +0200)]
Merge branch 'fix-unaligned-memory'

10 years agoBugfix: fix bus error on OpenBSD/sparc64 (Thanks tobiasu)
Michael Stapelberg [Sat, 29 Jun 2013 17:28:13 +0000 (19:28 +0200)]
Bugfix: fix bus error on OpenBSD/sparc64 (Thanks tobiasu)

fixes #1034

10 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 27 Jun 2013 22:14:30 +0000 (00:14 +0200)]
Merge branch 'master' into next

10 years agoMerge branch 'fix-nagbar'
Michael Stapelberg [Thu, 27 Jun 2013 22:14:30 +0000 (00:14 +0200)]
Merge branch 'fix-nagbar'

10 years agoi3-nagbar: Bugfix: -m requires an argument (crashes if none specified) (Thanks Mayhem)
Michael Stapelberg [Thu, 27 Jun 2013 22:14:09 +0000 (00:14 +0200)]
i3-nagbar: Bugfix: -m requires an argument (crashes if none specified) (Thanks Mayhem)

10 years agoAdd a few things to .gitignore
Alexander Berntsen [Sun, 23 Jun 2013 12:22:04 +0000 (14:22 +0200)]
Add a few things to .gitignore

10 years agoFix incorrect comment
Alexander Berntsen [Wed, 5 Jun 2013 13:08:47 +0000 (15:08 +0200)]
Fix incorrect comment

10 years agoUpdate parent urgency hint if a child is removed.
oblique [Wed, 12 Jun 2013 01:40:37 +0000 (04:40 +0300)]
Update parent urgency hint if a child is removed.

10 years agoadd a testcase for the shmlog command
Michael Stapelberg [Sun, 23 Jun 2013 20:14:59 +0000 (22:14 +0200)]
add a testcase for the shmlog command

10 years agoreset shmlogname when disabling the log
Michael Stapelberg [Sun, 23 Jun 2013 20:14:39 +0000 (22:14 +0200)]
reset shmlogname when disabling the log

This makes the i3-dump-log error message more helpful.

10 years agouserguide: improve the shmlog docs
Michael Stapelberg [Sun, 23 Jun 2013 19:52:13 +0000 (21:52 +0200)]
userguide: improve the shmlog docs

• the section heading needs === instead of ==
• better title
• explain what shared memory logging does and where to find more
  information
• add syntax section
• improve examples
• clarify that shmlog <size> discards the current log

10 years agoImplement shmlog command
Alexander Berntsen [Wed, 5 Jun 2013 13:04:57 +0000 (15:04 +0200)]
Implement shmlog command

Add shmlog command that takes <size>|toggle|on|off. Separate logbuffer
management into open_logbuffer() and close_logbuffer(). Make
t/187-commands-parser.t expect 'shmlog'. Add update_shmlog_atom() to
update the SHMLOG_PATH. Document the shmlog command in userguide.

10 years agoMake default shmlog_size a const int
Alexander Berntsen [Wed, 5 Jun 2013 12:59:05 +0000 (14:59 +0200)]
Make default shmlog_size a const int

10 years agoAdd 'NoDisplay=true' to i3.application.desktop
Simon Wesp [Wed, 12 Jun 2013 16:58:48 +0000 (18:58 +0200)]
Add 'NoDisplay=true' to i3.application.desktop

10 years agoBugfix: s/i3bar/i3-nagbar/ (Thanks badboy)
Michael Stapelberg [Mon, 10 Jun 2013 21:23:22 +0000 (23:23 +0200)]
Bugfix: s/i3bar/i3-nagbar/ (Thanks badboy)

10 years agoremove unused pathlen (Thanks gcc)
Michael Stapelberg [Mon, 10 Jun 2013 21:10:46 +0000 (23:10 +0200)]
remove unused pathlen (Thanks gcc)

10 years agoretab! get_exe_path.c
Michael Stapelberg [Mon, 10 Jun 2013 21:08:42 +0000 (23:08 +0200)]
retab! get_exe_path.c

We seriously need auto-formatting.

10 years agoBugfix: sizeof(destpath)-1 to have space for the trailing NUL (Thanks Merovius)
Michael Stapelberg [Mon, 10 Jun 2013 21:08:17 +0000 (23:08 +0200)]
Bugfix: sizeof(destpath)-1 to have space for the trailing NUL (Thanks Merovius)

10 years agoi3-nagbar: take our terminal execution kludge to the next level
Michael Stapelberg [Mon, 10 Jun 2013 20:55:39 +0000 (22:55 +0200)]
i3-nagbar: take our terminal execution kludge to the next level

Please read commit 2bf80528bdb2814331f9149289a0dd1e3422282b first.
Then read the comment within the code of this commit.
Then run in circles and cry loudly.

fixes #1002
fixes #1026

10 years agore-shuffle struct members to save a bit of memory
Michael Stapelberg [Sat, 8 Jun 2013 13:37:41 +0000 (15:37 +0200)]
re-shuffle struct members to save a bit of memory

Analysis done with pahole(1).

10 years agolib/i3test: clarify how to identify open_window() windows in i3 commands (Thanks...
Michael Stapelberg [Sat, 8 Jun 2013 10:48:32 +0000 (12:48 +0200)]
lib/i3test: clarify how to identify open_window() windows in i3 commands (Thanks vandannen)

10 years agoFix wrong placement of i3bar when connecting/disconnecting outputs
haptix@web.de [Wed, 29 May 2013 16:02:46 +0000 (18:02 +0200)]
Fix wrong placement of i3bar when connecting/disconnecting outputs

When connecting or disconnecting an output, i3bar reconfigures its
windows. This also included an unmapping of the bars, and a remapping of
all docked bars. Thus, the bars were misplaced when a monitor was
disconnected.

This commit assures that the remapping of the bars only takes place,
when the mode has actually changed. This patch also takes care of an
inconsistency when pressing the bar_modifier while switching the mode.
Also, the xkbDisplay is now closed correctly, when deregestering the xkb
keyevents.

10 years agoMerge branch 'fix-unmap'
Michael Stapelberg [Tue, 28 May 2013 17:56:57 +0000 (19:56 +0200)]
Merge branch 'fix-unmap'

10 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 28 May 2013 17:56:57 +0000 (19:56 +0200)]
Merge branch 'master' into next

10 years agoBugfix: Unmap windows before reparenting them to the root window (fixes Mathematica...
Michael Stapelberg [Tue, 28 May 2013 17:52:01 +0000 (19:52 +0200)]
Bugfix: Unmap windows before reparenting them to the root window (fixes Mathematica) (Thanks psychon)

Some apps such as Mathematica send a synthetic UnmapNotify event without
properly unmapping their window first. This change makes sure that
happens and fixes an annoying bug with Mathematica where some unmanaged
windows would stay around, but you couldn’t do anything with them.

Thanks to psychon (current awesome maintainer) for helping with the
diagnosis!

fixes #787

10 years agomanage.c: use xcb_discard_reply() instead of free()ing the reply (Thanks psychon)
Michael Stapelberg [Tue, 28 May 2013 16:57:26 +0000 (18:57 +0200)]
manage.c: use xcb_discard_reply() instead of free()ing the reply (Thanks psychon)

10 years agointroduced i3 command for changing the hidden state and the mode of i3bar
haptix@web.de [Sat, 25 May 2013 12:30:00 +0000 (14:30 +0200)]
introduced i3 command for changing the hidden state and the mode of i3bar

The hidden_state and mode of each i3bar instance can now be controlled from within i3.
Therefore, two new i3 command were introduced:
    _
    bar hidden_state show|hide|toggle [<bar_id>]

    show: always show the bar
    hide: normal hide mode
    toggle: toggle between show and hide (individually for each bar)
    _
    bar mode dock|hide|invisible|toggle [<bar_id>]

    hide,dock: like before
    invisible: always keep the bar hidden
    toggle: toggle between dock and hide (individually for each bar)

This patch introduces a hidden_state ("hidden_state hide|show") in the
barconfig, which indicates the current hidden_state of each i3bar
instance. It only affects the bar when in hide mode. Additionally, a new
invisible mode was introduced. In order to change the hidden_state or
mode of the bar from i3, a barconfig-update event was introduced, for
which a bar can subscribe and the bar then gets notified about the
currently set hidden_state and mode in its barconfig.

For convenience, an id field ("id <bar_id>") was added to the barconfig, where one can
set the desired id for the corresponding bar. If the id is not specified, i3 will
deterministically choose an id; otherwise, with the previous random approach for finding
a new id, which is actually not shared with i3bar, as it would determine its id on
startup, the event-subscription would be destroyed on reload. Still, this issue remains
when manually changing the bar_id in the config and then reloading.

fixes #833, #651

10 years agoFix problem when moving fullscreen window to scratchpad
haptix@web.de [Fri, 24 May 2013 13:02:04 +0000 (15:02 +0200)]
Fix problem when moving fullscreen window to scratchpad

When moving a fullscreen window to scratchpad with 'move scratchpad', the
focused window would stay fullscreen.

Also, when having a container in fullscreen mode and then focusing a child of
this container and moving it to scratchpad, it would enable fullscreen for
the child window.

This patch fixes both problems, so the scratchpad window is always floating.

10 years agoDraw indicator border only for split layouts
Diego Ongaro [Mon, 29 Apr 2013 08:14:11 +0000 (01:14 -0700)]
Draw indicator border only for split layouts

In order to distinguish split layouts from tabbed/stacking layouts when
only one window is shown, do not draw the indicator border for tabbed or
stacking layouts.

10 years agoGive layout enum a name: layout_t
Diego Ongaro [Wed, 22 May 2013 04:28:13 +0000 (21:28 -0700)]
Give layout enum a name: layout_t

10 years agoi3-msg.man: updated man page to include all options
Arun Persaud [Tue, 21 May 2013 15:32:05 +0000 (08:32 -0700)]
i3-msg.man: updated man page to include all options

-s, -v, -q and -h options were not documented.

10 years agoi3bar: Fix pixel offset calculation in dual-head
Thomas Adam [Sun, 12 May 2013 16:49:23 +0000 (17:49 +0100)]
i3bar: Fix pixel offset calculation in dual-head

When running i3bar on a dual-head display with workspaces enabled in i3bar's
config, the second monitor wouldn't use a correct x position offset and
would draw its label too close to the screen's edge.  In comparison to the
first monitor, this is inconsistent because that starts with a pixel offset
of 1.

10 years agocontrib/gtk-tree-watch.pl: Remove bogus default socket path
Diego Ongaro [Wed, 1 May 2013 05:23:03 +0000 (22:23 -0700)]
contrib/gtk-tree-watch.pl: Remove bogus default socket path

The default i3 socket path was set to "/tmp/nestedcons". This isn't
going to work for most people.

10 years agocontrib/dump-asy.pl: Display nicer double-quotes
Diego Ongaro [Wed, 1 May 2013 05:14:14 +0000 (22:14 -0700)]
contrib/dump-asy.pl: Display nicer double-quotes

The right way to do this in LaTeX is ``foo'', not "foo".

10 years agocontrib/dump-asy.pl: Fix $ and & in window titles
Diego Ongaro [Wed, 1 May 2013 05:12:33 +0000 (22:12 -0700)]
contrib/dump-asy.pl: Fix $ and & in window titles

These would produce asy/LaTeX parse errors before.

11 years agoMerge branch 'fix-aspect'
Michael Stapelberg [Tue, 23 Apr 2013 05:18:39 +0000 (07:18 +0200)]
Merge branch 'fix-aspect'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 23 Apr 2013 05:18:39 +0000 (07:18 +0200)]
Merge branch 'master' into next

11 years agorender_con: fix height rounding in aspect ratio computation
Clément Bœsch [Sat, 20 Apr 2013 21:47:37 +0000 (23:47 +0200)]
render_con: fix height rounding in aspect ratio computation

With a 484x292 window and proportion of 488x294, new_height is
291.590164 after the loop, causing a rounding issue leading to a window
of 484x291.

11 years agoMerge branch 'fix-resize'
Michael Stapelberg [Mon, 15 Apr 2013 19:01:27 +0000 (21:01 +0200)]
Merge branch 'fix-resize'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 15 Apr 2013 19:01:27 +0000 (21:01 +0200)]
Merge branch 'master' into next

11 years agoEnsure that resize will take place even if pixel is smaller than size increments.
oblique [Mon, 15 Apr 2013 18:30:22 +0000 (21:30 +0300)]
Ensure that resize will take place even if pixel is smaller than size increments.

fixes #1011

11 years agoMerge branch 'fix-tray-output'
Michael Stapelberg [Sun, 14 Apr 2013 20:54:36 +0000 (22:54 +0200)]
Merge branch 'fix-tray-output'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 14 Apr 2013 20:54:36 +0000 (22:54 +0200)]
Merge branch 'master' into next

11 years agoBugfix: fix crash when not having tray_output configured (Thanks Layus)
Michael Stapelberg [Sun, 14 Apr 2013 20:54:15 +0000 (22:54 +0200)]
Bugfix: fix crash when not having tray_output configured (Thanks Layus)

11 years agoMerge branch 'fix-ipc-fd'
Michael Stapelberg [Sun, 14 Apr 2013 08:14:51 +0000 (10:14 +0200)]
Merge branch 'fix-ipc-fd'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 14 Apr 2013 08:14:51 +0000 (10:14 +0200)]
Merge branch 'master' into next

11 years agoBugfix: mark IPC fd CLOEXEC (Thanks Layus)
Michael Stapelberg [Sun, 14 Apr 2013 08:12:21 +0000 (10:12 +0200)]
Bugfix: mark IPC fd CLOEXEC (Thanks Layus)

Without this fix, children of i3bar would inherit the file descriptor of
the IPC connection to i3. Therefore, even if i3bar exits with SIGSEGV,
the connection to i3 stays open. Because nobody actually reads any
messages by i3, the buffer will fill up and i3 can’t deliver any more
messages, and thus busy-loops at that point.

fixes #995

11 years agofix font display height in i3bar
haptix@web.de [Sat, 13 Apr 2013 10:28:01 +0000 (12:28 +0200)]
fix font display height in i3bar

Increase the drawing area height, in order to prevent the font from being cut off.

fixes #992

11 years agounhide hidden i3bar when mode is active
haptix@web.de [Thu, 11 Apr 2013 22:09:40 +0000 (00:09 +0200)]
unhide hidden i3bar when mode is active

This patch also handles unhiding of i3bar in case the i3bar modifier key is
pressed for activating a new binding mode.

11 years agoDocument fixes and workarounds for test failures.
Eric S. Raymond [Sun, 7 Apr 2013 21:02:28 +0000 (17:02 -0400)]
Document fixes and workarounds for test failures.

11 years agoTypo and usage fixes in documentation and comments.
Eric S. Raymond [Sun, 7 Apr 2013 14:56:20 +0000 (10:56 -0400)]
Typo and usage fixes in documentation and comments.

11 years agounhide hidden i3bar when mode is active
haptix@web.de [Sun, 7 Apr 2013 14:24:21 +0000 (16:24 +0200)]
unhide hidden i3bar when mode is active

fixes #961

11 years agorestore i3bar compatibility with libyajl version 1
haptix@web.de [Sat, 6 Apr 2013 12:50:46 +0000 (14:50 +0200)]
restore i3bar compatibility with libyajl version 1

fixes #1004

11 years agoraise fullscreen windows on top of all other X11 windows
Michael Stapelberg [Sun, 7 Apr 2013 13:38:00 +0000 (15:38 +0200)]
raise fullscreen windows on top of all other X11 windows

Note that this is ineffective for dunst’s notifications because dunst
re-raises them as soon as they get obscured. It does work for dzen2
however, which was the original use-case.

fixes #569

11 years agodocs/wsbar: update (we have i3bar now, i3-wsbar is just an example)
Michael Stapelberg [Sun, 7 Apr 2013 08:23:49 +0000 (10:23 +0200)]
docs/wsbar: update (we have i3bar now, i3-wsbar is just an example)

fixes #735

11 years agoMerge branch 'fix-tab-width'
Michael Stapelberg [Sun, 7 Apr 2013 08:00:42 +0000 (10:00 +0200)]
Merge branch 'fix-tab-width'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 7 Apr 2013 08:00:42 +0000 (10:00 +0200)]
Merge branch 'master' into next

11 years agotabbed: floor(), put extra pixels into the last tab (Thanks xeen)
Michael Stapelberg [Sun, 7 Apr 2013 07:58:34 +0000 (09:58 +0200)]
tabbed: floor(), put extra pixels into the last tab (Thanks xeen)

This is the only sane way I can think of to deal with the problem that
the screen size may not be dividable by the amount of tabbed children
(e.g. 1280 / 41 = 31.219512…).

fixes #645
fixes #791

11 years agodocs/multi-monitor: nVidia ≥ 302.17 works just fine (Thanks HedgeMage)
Michael Stapelberg [Sat, 6 Apr 2013 20:49:14 +0000 (22:49 +0200)]
docs/multi-monitor: nVidia ≥ 302.17 works just fine (Thanks HedgeMage)

11 years agoMerge branch 'fix-floating-size'
Michael Stapelberg [Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)]
Merge branch 'fix-floating-size'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)]
Merge branch 'master' into next

11 years agoBugfix: fix floating window size with hide_edge_borders (+test)
Michael Stapelberg [Tue, 2 Apr 2013 21:59:26 +0000 (23:59 +0200)]
Bugfix: fix floating window size with hide_edge_borders (+test)

fixes #998

11 years agoipc: use correct workspace in workspace change event
haptix@web.de [Sat, 30 Mar 2013 15:00:39 +0000 (16:00 +0100)]
ipc: use correct workspace in workspace change event

fixes #990

11 years agoadd testcase for the workspace-focus ipc event
haptix@web.de [Tue, 2 Apr 2013 13:19:55 +0000 (15:19 +0200)]
add testcase for the workspace-focus ipc event

11 years agot/201-config-parser: add test for quotes in comments
Michael Stapelberg [Tue, 2 Apr 2013 20:24:52 +0000 (22:24 +0200)]
t/201-config-parser: add test for quotes in comments

11 years agoAdd 'line' as a configuration parsing primitive
Eelis van der Weegen [Mon, 1 Apr 2013 12:42:41 +0000 (14:42 +0200)]
Add 'line' as a configuration parsing primitive

…and use it for ignoring comment lines, so that quotes in them
doesn't cause problems anymore.

11 years agouserguide: mention forgotten layout splitv/splith (Thanks Eelis)
Michael Stapelberg [Sat, 30 Mar 2013 12:03:35 +0000 (13:03 +0100)]
userguide: mention forgotten layout splitv/splith (Thanks Eelis)

11 years agoi3bar: fix usage description, make -b happen
Simon Elsbrock [Thu, 28 Mar 2013 19:11:05 +0000 (20:11 +0100)]
i3bar: fix usage description, make -b happen

11 years agoFix scratchpad_show
Philippe Virouleau [Tue, 26 Mar 2013 17:59:32 +0000 (18:59 +0100)]
Fix scratchpad_show

    Test if window is in scratchpad
    Test if function is called without criteria
    Updated testcase

11 years agoDon't dup2() the parent's stdout to child's stdin.
Yuxuan Shui [Sun, 24 Mar 2013 08:30:05 +0000 (16:30 +0800)]
Don't dup2() the parent's stdout to child's stdin.

There're DLOG()s, seriously.

11 years agoAdd click events to i3bar
enkore [Thu, 21 Mar 2013 10:48:27 +0000 (11:48 +0100)]
Add click events to i3bar

If the statusline generator (i.e. i3status) specifies click_events:true
in the protocol header, i3bar will write a JSON array on it's stdin
notifying it if the user clicks on a block.

The exact protocol is documented in docs/i3bar-protocol.

11 years agoUse a saner sanity check for floating_reposition.
Yuxuan Shui [Thu, 21 Mar 2013 17:36:40 +0000 (01:36 +0800)]
Use a saner sanity check for floating_reposition.

The function contained_by_output checks whether any output contains any
parts of a give rect. Rather than relying on the central point of the rect.

11 years agoFix restarting with 32bit depth windows (v5)
Yuxuan Shui [Fri, 15 Mar 2013 14:40:26 +0000 (22:40 +0800)]
Fix restarting with 32bit depth windows (v5)

What I do in this patch is:

1. Split the con_new() function, so I can create a Con without actually
create a window.
2. Store the depth of Cons in the layout file when i3 is restarting.

Fix typos and mis-staged files in previous patch.

11 years agoi3-dmenu-desktop: run commands when they don’t match a .desktop file
Michael Stapelberg [Thu, 21 Mar 2013 22:32:46 +0000 (23:32 +0100)]
i3-dmenu-desktop: run commands when they don’t match a .desktop file

This allows you to enter e.g. "i3 layout stacking" (provided you don’t
have an i3 .desktop file)

11 years agoFreeBSD expect a real path on the filesystem for shm_open
Baptiste Daroussin [Wed, 20 Mar 2013 16:01:12 +0000 (17:01 +0100)]
FreeBSD expect a real path on the filesystem for shm_open

11 years agoshm_unlink the created/open shm
Baptiste Daroussin [Wed, 20 Mar 2013 15:59:55 +0000 (16:59 +0100)]
shm_unlink the created/open shm

11 years agoDo not use ELOG while logwalk is not initialized
Baptiste Daroussin [Wed, 20 Mar 2013 15:58:30 +0000 (16:58 +0100)]
Do not use ELOG while logwalk is not initialized

11 years agoAll supported FreeBSD version has getline now
Baptiste Daroussin [Tue, 19 Mar 2013 23:36:50 +0000 (00:36 +0100)]
All supported FreeBSD version has getline now

11 years agoupdate debian/
Michael Stapelberg [Mon, 18 Mar 2013 22:01:36 +0000 (23:01 +0100)]
update debian/

11 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 18 Mar 2013 21:45:55 +0000 (22:45 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'release-4.5.1'
Michael Stapelberg [Mon, 18 Mar 2013 21:45:50 +0000 (22:45 +0100)]
Merge branch 'release-4.5.1'

11 years agoadd release notes for v4.5.1 4.5.1
Michael Stapelberg [Mon, 18 Mar 2013 21:42:33 +0000 (22:42 +0100)]
add release notes for v4.5.1

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 17 Mar 2013 00:01:11 +0000 (01:01 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'bump-copyrights'
Michael Stapelberg [Sun, 17 Mar 2013 00:01:11 +0000 (01:01 +0100)]
Merge branch 'bump-copyrights'

11 years agobump copyright years to 2013
Michael Stapelberg [Sun, 17 Mar 2013 00:01:04 +0000 (01:01 +0100)]
bump copyright years to 2013

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 16 Mar 2013 23:59:52 +0000 (00:59 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'i3dd-error'
Michael Stapelberg [Sat, 16 Mar 2013 23:59:52 +0000 (00:59 +0100)]
Merge branch 'i3dd-error'

11 years agoi3-dmenu-desktop: improve error message when dmenu cannot be found
Michael Stapelberg [Sat, 16 Mar 2013 23:59:18 +0000 (00:59 +0100)]
i3-dmenu-desktop: improve error message when dmenu cannot be found

fixes #984

11 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 15 Mar 2013 18:27:23 +0000 (19:27 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-floating-move'
Michael Stapelberg [Fri, 15 Mar 2013 18:27:23 +0000 (19:27 +0100)]
Merge branch 'fix-floating-move'

11 years agoBugfix: Don’t warp the pointer when dragging floating windows
Michael Stapelberg [Fri, 15 Mar 2013 18:27:08 +0000 (19:27 +0100)]
Bugfix: Don’t warp the pointer when dragging floating windows

fixes #951

11 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 14 Mar 2013 14:20:34 +0000 (15:20 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-make'
Michael Stapelberg [Thu, 14 Mar 2013 14:20:34 +0000 (15:20 +0100)]
Merge branch 'fix-make'

11 years agoAdd YAJL_CFLAGS to i3-msg.mk.
Marcus Crestani [Thu, 14 Mar 2013 09:10:38 +0000 (10:10 +0100)]
Add YAJL_CFLAGS to i3-msg.mk.

11 years agodocs/hacking-howto: explain our different branches
Michael Stapelberg [Thu, 14 Mar 2013 13:44:01 +0000 (14:44 +0100)]
docs/hacking-howto: explain our different branches

11 years agodocs/hacking-howto: fix the link to the git introduction
Michael Stapelberg [Thu, 14 Mar 2013 13:43:51 +0000 (14:43 +0100)]
docs/hacking-howto: fix the link to the git introduction

11 years agoadd dummy entry to debian/changelog
Michael Stapelberg [Tue, 12 Mar 2013 14:12:03 +0000 (15:12 +0100)]
add dummy entry to debian/changelog

11 years agoupdate debian/
Michael Stapelberg [Tue, 12 Mar 2013 14:11:35 +0000 (15:11 +0100)]
update debian/

11 years agoMerge branch 'next'
Michael Stapelberg [Tue, 12 Mar 2013 13:05:47 +0000 (14:05 +0100)]
Merge branch 'next'