Commit Graph

1511 Commits

Author SHA1 Message Date
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
matthieu
0f866aaf0f OpenBSD needs the same treatment as FreeBSD to avoid xterm -hold
chewing CPU cycles. Reported by Kevin Chadwick.
2014-01-18 14:06:23 +00:00
matthieu
e78ce57d7f Missing files for xauth 1.0.8 2014-01-05 07:08:53 +00:00
matthieu
97017a136a Update to xauth 1.0.8 2014-01-04 15:53:46 +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
okan
6dd84359f1 rename for clarity 2014-01-02 21:15:39 +00:00
okan
164bcbb443 When a client doesn't specify size hints, nothing prevents a resize to
0x0 - don't allow this situation during mouse resize (check already in
place for kbd resize).

Reported by brynet@
2014-01-02 20:58:20 +00:00
matthieu
0304b98245 Don't play with libxcursor if XCURSOR_THEM is defined. 2014-01-02 15:15:51 +00:00
matthieu
9c13ac6812 Update to xterm-300. Tested by ajacoutot@ and shadchin@. 2014-01-02 15:14:50 +00:00
okan
434826524f missing stdarg.h include 2013-12-17 16:12:18 +00:00
okan
d504b54a27 replace with memset 2013-12-17 16:10:43 +00:00
okan
468c12c5da Implement support for EWMH's _NET_WM_STATE_FULLSCREEN hint.
Since we already have a form of 'maximize', we need to differentiate
between 'maximize' and the new 'fullscreen' mode.  The 'maximize' mode
will continue to honor gap but now *retains* the border, matching the
'vert/horz maximize' behaviour.  The new 'fullscreen' mode supports and
follows the _NET_WM_STATE_FULLSCREEN hint, allowing the client perform
additional window modifications; in this mode, cwm(1) will *ignore* gap,
remove borders and freeze(move/resize) the client.  Additionally,
'fullscreen' mode will remember various combinations of previous states.

* default keybinding changes: CM-f 'fullscreen', CM-m 'maximize' (re-map
  as desired).

Positive feedback from a few, testing and ok sthen@
2013-12-16 19:02:17 +00:00
okan
4104232e02 Teach screen_find_xinerama() to apply gap only when told to do so;
adjust callers.  Needed for an upcoming feature.
2013-12-13 22:39:13 +00:00
okan
5671dd5497 Instead of using work area, use the Xinerama area for snap calculations;
based on a patch from Thomas Adam with appropriate adjustments for gap.
2013-12-13 21:51:56 +00:00
okan
8730d44943 we need the save-set when re-exec'ing so as to not lose State on our hidden clients 2013-12-13 15:56:44 +00:00
okan
c11a490e80 stray space and sort while here 2013-12-13 14:45:47 +00:00
okan
1d68a42ec0 Add support for XUrgency and matching _NET_WM_STATE_DEMANDS_ATTENTION
ewmh hint; urgencyborder is configurable.  The urgency flag will stick,
even while on a client in a non-viewable group, until the client
receives focus (where the border is reset).  Initial diff from Thomas
Adam with some changes/enhancements from me.
2013-12-13 14:40:52 +00:00
okan
baac27374e Make sure we really take work area gap into account with snap calculations;
from Dominik Honnef via Christian Neukirchen.
2013-12-12 21:50:50 +00:00
okan
e5da774880 ICCCM explicitly states that server time (CurrentTime) should *not* be
used for focus events, but rather the timestamp of the generated event.
Track the last event timestamp and send it down for a WM_TAKE_FOCUS
ClientMessage.  I suspect we should do this for clients that don't
announce this Atom as well, though the raciness gets us into a bind.

Solves focus order issue since WM_TAKE_FOCUS; fix verified by sthen@

ok sthen@
2013-12-12 20:15:07 +00:00
okan
c16e20981c we don't need to manage the save-set since we're not reparenting; left-over from pwin 2013-12-11 22:14:23 +00:00
okan
f1494daf70 since we are drawing in unhide, no need to during client setup 2013-12-11 17:23:31 +00:00
okan
b5f3d28152 apply mwm hints later 2013-12-11 15:46:47 +00:00
okan
3d5c10942f Add client wrapper for XWMHints to support XA_WM_HINTS in PropertyNotify
events; based off a diff from Thomas Adam.
2013-12-11 15:41:11 +00:00
okan
5da88fd68f Remove extra work and simplify client state handling. 2013-12-11 14:16:09 +00:00
okan
33eb08de92 Stash Class and WM Hints in client_ctx 2013-12-11 14:09:21 +00:00
okan
3c7dcdc9f9 Redraw client border when unhiding; during a hide, we just unset
the active flag but never redraw since it'll be in IconicState.

Behaviour reported by sthen@
2013-12-10 21:27:37 +00:00
okan
a6e6db763a If not using sticky mode (the default), clients aren't automagically
assigned a group, thus cc->group will be NULL - fix the client group
shortcut in menu lists; crash reported by Christian Neukirchen.
2013-12-08 13:51:38 +00:00
naddy
3adb0abb24 don't include obsolete <sys/timeb.h>, which will go away shortly; ok matthieu@ 2013-12-03 22:27:26 +00:00
okan
7459d3af28 When we receive a NotionNotify event, there's no need to (incorrectly
might I add) redraw the top menu selection.
2013-12-02 20:01:19 +00:00
okan
e5072fc220 Always highlight the first menu item (helpful to see selected items when
not using a mouse and therefore not generating Expose/MotionNotify
events); from Thomas Adam.
2013-12-02 19:49:26 +00:00
okan
d7f3078e8e Prepend the group shortcut in the client search menu; from Thomas Adam.
Likewise, prepend shortcut in unhide menu.
2013-12-02 19:30:27 +00:00
okan
3207d6dcc9 Since we use IconicState as our hidden state, check for the hidden flag
and unmanage the client if we're not hidden (basically if NormalState)
during an UnmapNotify event.

Resolves an issue with mplayer going fullscreen while not using NetWM
hints; behaviour regression reported by Ido Admon.
2013-12-02 14:30:12 +00:00
okan
a287dfc793 like gap, make snapdist per screen 2013-11-27 18:34:34 +00:00
okan
efe2ba92f9 alter -r1.145 getsizehints to deal with clients that don't have
WM_NORMAL_HINTS.
2013-11-27 17:04:35 +00:00
okan
9b29ffac8c Remove the option to bind a key by keycode with brackets; it never
worked (and no one complained!).  While it's fairly easy to fix, users
should be using keysym names and not keycodes.

Discussed at length months ago with todd@, matthieu@ and Owain.
2013-11-27 16:24:17 +00:00
okan
a09ca80c45 simplify/unfold 2013-11-27 14:20:32 +00:00
okan
57ba45de2c Rewrite active/inactive client handling in client_setactive();
client_leave() served no real purpose, likewise no reason to handle
LeaveNotify events since an EnterNotify will process the next active
client (and we don't have anything important to process anyway), so
xev_handle_leavenotify() goes as well.  Allows a simplification of
client_mtf() and client_cycle_leave() for clarity.  While here, unify a
few client_current() checks.

No intended behaviour change.
2013-11-27 00:01:23 +00:00
benno
3ab274cd32 Log message:
use u_char for buffers in yylex, for ctype calls, as done in all other
parse.y in the tree
found by millert@, ok okan@
2013-11-25 18:21:55 +00:00
matthieu
783f743e28 Give /dev/drm0 to the user logging into xdm to be able
to run OpenGL applications. ok kettenis@, naddy@
2013-11-18 20:39:48 +00:00
okan
632f11c555 Alter the r1.35 of event.c race fix. Remove the forward looking event
queue check (removing the need for a server grab/ungrab) - if the client
is going away, let it fall all the way through to a DestroyNotify event.
There's no longer a need for us to manually destroy a client ourselves
(removing yet another server grab/ungrab).  Instead, when the
UnmapNotify event is synthetic, simply set the state to Withdrawn (as
per ICCCM), else Iconic (in our case 'hidden').

Verified with test case from the 2009 race which was the original reason
for r1.35 of event.c.
2013-11-12 21:25:00 +00:00
okan
ce53b02ca7 Put back the border draw call in client_resize; since we are adding and
removing the border on maximized clients we need to redraw.

Also noticed by Tim van der Molen
2013-11-11 12:51:15 +00:00
okan
e8fcfc29d4 stash WMProtocols in flags 2013-11-08 17:35:12 +00:00
okan
b543fee100 quick keyboard focus fix for clients that neither populate wmhints nor wmprotocols, like rdesktop; focus needs to be re-visited 2013-11-05 00:55:42 +00:00
okan
d21ac16a79 The only reason we need to keep XSizeHints in our client_ctx is for
flags, so just add one to hints; consolidates sizehints and shrinks.
Additionally don't abuse PSize for XGetWMNormalHints() failures.
2013-11-02 19:13:56 +00:00
okan
47ae5c2eb9 x/y from XSizeHints are obsolete (and have been for a long time), so
instead use x/y from XWindowAttributes when USPosition|PPosition are
set.
2013-11-01 21:54:20 +00:00
matthieu
0500791125 remove unused file. 2013-11-01 19:04:50 +00:00
okan
95e47782f7 re-add support for WM_TAKE_FOCUS, and additionally this time only call
XSetInputFocus() for clients that have the InputHint; latter fix
discovered by Valery Masiutsin with a PoC patch - solves keyboard input
focus loss for java apps.
2013-11-01 14:07:19 +00:00
okan
a8efa775ea A client_delete should behave differently depending on whether the
triggering event was unmap (with pending destroy) log destroy; we only
need to grab/ungrab the server lock, set WithdrawnState and
XRemoveFromSaveSet clients coming from an unmap event - doing so for
clients coming from destroy are already gone, hence we generate errors.
2013-10-25 19:46:16 +00:00
matthieu
eb93ff8a6d Use arc4random 2013-10-20 12:41:07 +00:00
okan
816ad65098 shuffle 2013-10-20 02:00:02 +00:00
okan
f22f30d08a wrap key ungrab like btn ungrab, for it'll be used again 2013-10-20 01:55:32 +00:00
okan
25ca41475e revert 1.138 (WM_TAKE_FOCUS) for now 2013-10-20 01:35:47 +00:00
okan
d5f92c3e42 Using xu_btn_ungrab() buttons during client_leave doesn't work (error
BadValue) when the modifier is already AnyModifier .  Instead alter
xu_btn_ungrab() to ungrab AnyButton/AnyModifier and call it only when a
client is coming into focus in client_setactive(), instead of iterating
over ignore mods - matches how we handle key grabs.
2013-10-19 19:39:34 +00:00
okan
70cf49457d I believe we redraw the border in too many cases; likely a leftover from
the cc->pwin days - don't redraw on every unhide, resize, and mouse
move/resize Expose event (note, all Expose events trigger a redraw
anyway).

Tested with some finicky X apps I could think of, though I'm sure others
will find more - if so, and they 'lose' the border, please report!
2013-10-19 18:59:22 +00:00
okan
f2ed8ceb47 For clients that support WM_TAKE_FOCUS in their WM_PROTOCOLS property, send
a ClientMessage event.
2013-10-19 00:24:54 +00:00
okan
0710bf7edc a few err->errx since we don't have error messages here; from Tiago Cunha 2013-10-17 13:59:10 +00:00
okan
c42f6cebe3 trying parsing a XLFD string first, then by pattern 2013-10-07 13:40:26 +00:00
okan
78f4db5140 unify type; no change 2013-10-03 13:51:57 +00:00
matthieu
7bdeca034f Update to xman 1.1.3 2013-09-28 16:22:59 +00:00
matthieu
d3b60aa104 Update to xrdb 1.1.0 2013-09-14 09:21:39 +00:00
matthieu
4c8f7b3fcc Update to xmodmap 1.0.8 2013-09-14 09:20:18 +00:00
matthieu
d33701f223 Update to xlsclients 1.1.3 2013-09-14 09:19:02 +00:00
matthieu
bd8b3f9087 Update to xkill 1.0.4 2013-09-14 09:18:09 +00:00
matthieu
c38ca59e7b Update to xinit 1.3.3 2013-09-14 09:16:23 +00:00
matthieu
6a7a1261dc Update to xclock 1.0.7 2013-09-14 09:15:39 +00:00
matthieu
a15520613c Update to xclipboard 1.1.3 2013-09-14 09:14:46 +00:00
matthieu
62ffe4cad9 Update to twm 1.0.8 2013-09-14 09:14:02 +00:00
matthieu
3b638f84b8 Update to xterm 296. Sixel graphics disabled for now. 2013-08-26 20:06:09 +00:00
espie
6d7d129731 revisit old program of mine, make it look a bit more like sysctl after
simplifications.

okay matthieu@
2013-08-26 19:25:10 +00:00
matthieu
72b8e2e27d Fix format for 64 bits time_t 2013-08-18 08:24:08 +00:00
matthieu
61e2983c70 Fix a number of merge issues accumulated over the years
- INSTALL often got doubled by patch
- empty AUTHORS files didn't get removed.
2013-08-18 06:20:12 +00:00
matthieu
8dffde9860 Update to xwd 1.0.6 2013-08-17 16:38:10 +00:00
matthieu
98e67508cd Fix one last warning about usage() format string. 2013-08-17 16:28:49 +00:00
matthieu
507f26335e Update to xset 1.2.3 2013-08-17 16:20:09 +00:00
matthieu
121a1fb811 Update to xprop 1.2.2 2013-08-17 16:11:17 +00:00
matthieu
fb0b733b48 Update to xload 1.1.2 2013-08-17 16:00:54 +00:00
matthieu
744779bfe2 Update to xload 1.1.2 2013-08-17 15:55:33 +00:00
matthieu
1c4d8239c5 Update to xfwp 1.0.3 2013-08-13 19:39:34 +00:00
matthieu
a5858de44d Update to iceauth 1.0.6 2013-08-13 19:37:43 +00:00
matthieu
162fbbfa44 Remove a debug #error directive that shouldn't have leaked here. 2013-08-04 13:24:22 +00:00
todd
d9ff2050fb puffy 5.4 2013-07-22 13:12:34 +00:00
matthieu
128cecd166 Remove Modules that are not linked to the build for license issues. 2013-07-21 15:44:14 +00:00
matthieu
9cb9bf0644 Update to xfontsel 1.0.5 2013-07-21 15:34:57 +00:00
matthieu
efbf2bafb2 Update to mkfontscale 1.1.1 2013-07-21 14:00:06 +00:00
matthieu
8ebf1ecc9c Update to xfd 1.1.2x 2013-07-21 13:59:24 +00:00
matthieu
9f72ecd1a0 Update to xhost 1.0.6 2013-07-21 13:58:23 +00:00
matthieu
df07124fa5 Update to xrandr 1.4.1 2013-07-21 13:57:40 +00:00
matthieu
d493922f59 Update to xconsole 1.0.6 2013-07-21 13:56:59 +00:00
okan
0f156a8c2a we no longer need to construct an array for _NET_SUPPORTED. 2013-07-16 14:30:48 +00:00
okan
6cceb06057 don't need the size here 2013-07-16 14:22:25 +00:00
okan
cb56ed0c01 max -> nitems 2013-07-16 14:04:44 +00:00
okan
db709659c2 shuffle down protoypes 2013-07-15 23:53:19 +00:00
okan
76b17dcb11 collapse lines 2013-07-15 23:51:59 +00:00
okan
1ca1aa39ab simplify atom handling; allows us to limit to one round-trip to server
for gathering Atoms.
2013-07-15 14:50:44 +00:00
matthieu
a5cf6f6f3e Don't try to use grantpt() on OpenBSD. It causes crashes.
Problem reported by Jan Stary and Marcus Merighi, analysed by guenther@,
configure.ac patch by me.
2013-07-14 09:21:37 +00:00
okan
407cedcacc bring buttonpress and keypress event handlers slightly closer together 2013-07-10 14:15:58 +00:00
okan
2d39ce5e52 type fixes 2013-07-10 14:11:42 +00:00
okan
0cd6dbc0fc since the root and event window are the same in the case of a button
event on the screen's root window, there's no need to pass down the
entire XButtonEvent event, at least to group_menu(), the only callback
which takes an argument at this point; instead use the already populated
screen.
2013-07-09 01:24:49 +00:00
okan
c2e750f350 add support for mouse based group {,r}cycle; from Rodrigo Mosconi. not
bound by default.
2013-07-08 18:39:20 +00:00
okan
ad88124f83 move kbfunc and mousefunc closer together 2013-07-08 18:19:22 +00:00
okan
473473704c clarify kbd vs mouse functions 2013-07-08 16:32:51 +00:00
okan
53d2c330b7 move duplicate kbd and mouse modifier parsing to a generic function;
from Tiago Cunha
2013-07-08 16:10:55 +00:00
okan
f3dbf2e427 replace a few (x)malloc with (x)calloc to prevent potential integer
overflows; from Tiago Cunha
2013-07-08 15:48:16 +00:00
okan
2993105e89 whitespace and style fixes; from Tiago Cunha and one from me. 2013-07-08 15:46:16 +00:00
mpi
1db608c0a5 Match what's done on i386/amd64 and use vt05 as default for xdm(1)
on macppc now that virtual consoles are supported.

Adding "xdm_flags=" to /etc/rc.conf.local should now be enough to
get xdm working out of the box, no need to edit /etc/ttys anymore.

ok matthieu@
2013-06-26 07:25:19 +00:00
okan
b72940ef73 properly fix (and re-organize) selfont selection. 2013-06-23 17:57:50 +00:00
okan
989f306272 when selfont is configured, make sure we continue and configure the rest
of the screen (quick fix); discovered the hard way by Rodrigo Mosconi.
2013-06-20 02:33:57 +00:00
okan
537fe7febb move Cursors into conf. 2013-06-17 17:11:10 +00:00
okan
8b4f5be847 now that we have conf_screen, which configures individual screens
*after* config parsing, we no longer need to split up display/screen
initialization, so collapse.
2013-06-17 14:08:51 +00:00
okan
a931e155f8 allow mouse button4 and button5; from Rodrigo Mosconi 2013-06-17 00:57:47 +00:00
okan
356be89e9f move synthetic responses and have client_msg only work with WM_PROTOCOLS,
since that's all ClientMessageEvent is for anyway.
2013-06-10 21:37:30 +00:00
okan
5daab9b270 Check for, and honour, CWStackMode and CWSibling change requests during a
ConfigureRequest event.  Additionally, honour a border width change;
detailed report and patch from Mike Small.
2013-06-10 20:11:43 +00:00
sthen
ca4996114f Unlike other parse.y variants, cwm's allowed 'command xx /path/to/xx' without
quotes. Reinstate this support lost in recent sync diff and add a comment to
show that it's intentional. ok okan@
2013-06-03 20:33:17 +00:00
matthieu
89efb1ae8d Update to xterm 293. Tested by naddy@ ajacoutot@ 2013-06-02 19:55:50 +00:00