CVS Update: app (branch: trunk)

[Dan Winship]

CVSROOT:	/cvs/xorg
Module name:	app
Changes by:	danw at kemper.freedesktop.org	06/04/28 13:39:01

Log message:
  	* src/event.c (eventMatches): new method that replaces EV_KEY and
  	EV_BUTTON. Tests if an event matches a binding, being more precise
  	about modifier state than EV_KEY and EV_BUTTON were.
  	(eventTerminates): Tests if an event is "the opposite" of a
  	binding. (Eg, button or modifier key release.) Replaces
  	CompReleaseMask and "terminate" bindings.
  	(handleEvent): Use eventMatches
  
  	* src/screen.c (addPassiveKeyGrab, removePassiveKeyGrab,
  	updatePassiveKeyGrabs): When passed a keybinding containing just
  	modifiers, grab/ungrab every keypress event that would result in
  	that modifier state (eg, both left and right modifier keys, and
  	allow them to be pressed in any order).
  
  	* src/display.c: Remove CompPressMask from default bindings.
  	(eventLoop): don't add virtual modifiers to event state.
  	(updateModifierMappings): store the XModifierKeymap for later
  	use.
  
  	* plugins/*.c: Use eventMatches and eventTerminates. Remove
  	CompPressMask and "terminate" bindings (except from scale, which
  	is different from the others).
  
  	* plugins/switcher.c: Make initiate_all be just the modifier key
  	used in addition to the initiate binding ("<Control>"). Remove
  	next_window since it doesn't make a lot of sense to have it be
  	different from initiate_all, and make prev_window be just a
  	modifier key as well. ("<Shift>").
  	(SwitchScreen): add extra options to store the fully-composed
  	initiate_all, prev, and prev_all bindings.
  	(switchScreenInitOptions, switchSetScreenOption): Generate and
  	regenerate initiate_all, prev, and prev_all bindings as needed.
  	(switchHandleEvent): update
  
  	* plugins/gconf-compiz-utils.c: Remove "<Release>" handling.
  
  	* plugins/compiz.schemas: regen, dropping the terminate bindings
  	and updating a few others.
  
  	* include/compiz.h: remove CompPressMask, CompReleaseMask,
  	EV_BUTTON, and EV_KEY. Add eventMatches, eventTerminates, and
  	keycodeToModifiers. Add modMap field to CompDisplay.

Modified files:
      app/compiz/:
        ChangeLog 
      app/compiz/include/:
        compiz.h 
      app/compiz/plugins/:
        compiz.schemas cube.c gconf-compiz-utils.c move.c 
        resize.c rotate.c scale.c switcher.c water.c wobbly.c 
        zoom.c 
      app/compiz/src/:
        display.c event.c screen.c 
  
  Revision      Changes    Path
  1.148         +45 -0     app/compiz/ChangeLog
  http://webcvs.freedesktop.org/xorg/app/compiz/ChangeLog
  1.40          +16 -17    app/compiz/include/compiz.h
  http://webcvs.freedesktop.org/xorg/app/compiz/include/compiz.h
  1.13          +6 -104    app/compiz/plugins/compiz.schemas
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/compiz.schemas
  1.13          +6 -6      app/compiz/plugins/cube.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/cube.c
  1.4           +35 -51    app/compiz/plugins/gconf-compiz-utils.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/gconf-compiz-utils.c
  1.8           +12 -31    app/compiz/plugins/move.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/move.c
  1.9           +11 -26    app/compiz/plugins/resize.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/resize.c
  1.14          +72 -81    app/compiz/plugins/rotate.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/rotate.c
  1.13          +13 -9     app/compiz/plugins/scale.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/scale.c
  1.19          +84 -85    app/compiz/plugins/switcher.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/switcher.c
  1.16          +21 -34    app/compiz/plugins/water.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/water.c
  1.9           +8 -13     app/compiz/plugins/wobbly.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/wobbly.c
  1.7           +21 -33    app/compiz/plugins/zoom.c
  http://webcvs.freedesktop.org/xorg/app/compiz/plugins/zoom.c
  1.21          +46 -68    app/compiz/src/display.c
  http://webcvs.freedesktop.org/xorg/app/compiz/src/display.c
  1.31          +145 -38   app/compiz/src/event.c
  http://webcvs.freedesktop.org/xorg/app/compiz/src/event.c
  1.31          +91 -94    app/compiz/src/screen.c
  http://webcvs.freedesktop.org/xorg/app/compiz/src/screen.c