summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/rotate.c
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-30 02:17:16 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-30 02:17:16 +0000
commitbce2b26a717d668f5e1667eae891f173f27d014c (patch)
tree49e744a33e92a14cec49af743f8f713a5e069ed2 /beryl-plugins/src/rotate.c
parentd4d22dfc8c4fbd2ff320ec136af9e84dcc6485a3 (diff)
downloadmarex-dev-bce2b26a717d668f5e1667eae891f173f27d014c.tar.gz
marex-dev-bce2b26a717d668f5e1667eae891f173f27d014c.tar.bz2
beryl-core, beryl-vidcap, beryl-plugins:
-add new groups system for options -add hints to options -still none of these are filled out -beryl-settings isn't converted to use the new hint checking function yet git-svn-id: file:///beryl/trunk@1462 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/rotate.c')
-rw-r--r--beryl-plugins/src/rotate.c165
1 files changed, 132 insertions, 33 deletions
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index 769ed5c..ee1c2f6 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -345,14 +345,20 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_POINTER_INVERT_Y];
o->name = "invert_y";
- o->shortDesc = N_("Pointer Invert Y");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Pointer Invert Y");
o->longDesc = N_("Invert Y axis for pointer movement");
o->type = CompOptionTypeBool;
o->value.b = ROTATE_POINTER_INVERT_Y_DEFAULT;
o = &rs->opt[ROTATE_SCREEN_OPTION_POINTER_SENSITIVITY];
o->name = "sensitivity";
- o->shortDesc = N_("Pointer Sensitivity");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Pointer Sensitivity");
o->longDesc = N_("Sensitivity of pointer movement");
o->type = CompOptionTypeFloat;
o->value.f = ROTATE_POINTER_SENSITIVITY_DEFAULT;
@@ -362,7 +368,10 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ACCELERATION];
o->name = "acceleration";
- o->shortDesc = N_("Acceleration");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Acceleration");
o->longDesc = N_("Rotation Acceleration");
o->type = CompOptionTypeFloat;
o->value.f = ROTATE_ACCELERATION_DEFAULT;
@@ -372,21 +381,30 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_SNAP_TOP];
o->name = "snap_top";
- o->shortDesc = N_("Snap To Top Face");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Snap To Top Face");
o->longDesc = N_("Snap Cube Rotation to Top Face");
o->type = CompOptionTypeBool;
o->value.b = ROTATE_SNAP_TOP_DEFAULT;
o = &rs->opt[ROTATE_SCREEN_OPTION_SNAP_BOTTOM];
o->name = "snap_bottom";
- o->shortDesc = N_("Snap To Bottom Face");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Snap To Bottom Face");
o->longDesc = N_("Snap Cube Rotation to Bottom Face");
o->type = CompOptionTypeBool;
o->value.b = ROTATE_SNAP_BOTTOM_DEFAULT;
o = &rs->opt[ROTATE_SCREEN_OPTION_SPEED];
o->name = "speed";
- o->shortDesc = N_("Speed");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Speed");
o->longDesc = N_("Rotation Speed");
o->type = CompOptionTypeFloat;
o->value.f = ROTATE_SPEED_DEFAULT;
@@ -396,7 +414,10 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_TIMESTEP];
o->name = "timestep";
- o->shortDesc = N_("Timestep");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Timestep");
o->longDesc = N_("Rotation Timestep on automatic rotation");
o->type = CompOptionTypeFloat;
o->value.f = ROTATE_TIMESTEP_DEFAULT;
@@ -406,7 +427,10 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_MANTIMESTEP];
o->name = "mantimestep";
- o->shortDesc = N_("Manual Timestep");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Manual Timestep");
o->longDesc = N_("Rotation Timestep on manual rotation");
o->type = CompOptionTypeFloat;
o->value.f = ROTATE_MANTIMESTEP_DEFAULT;
@@ -416,7 +440,10 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ZOOM];
o->name = "zoom";
- o->shortDesc = N_("Zoom");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Zoom");
o->longDesc = N_("Distance desktop should be zoomed out while " "rotating");
o->type = CompOptionTypeFloat;
o->value.f = ROTATE_ZOOM_DEFAULT;
@@ -426,28 +453,40 @@ rotateScreenInitOptions (RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ZOOM_BEFORE_ROTATE];
o->name = "zoom_before_rotate";
- o->shortDesc = N_("Zoom before rotate");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Zoom before rotate");
o->longDesc = N_("Zoom out before doing rotation");
o->type = CompOptionTypeBool;
o->value.b = ROTATE_ZOOM_BEFORE_ROTATE_DEFAULT;
o = &rs->opt[ROTATE_SCREEN_OPTION_ZOOM_ONLY_ON_INITIATE];
o->name = "zoom_initiate_only";
- o->shortDesc = N_("Zoom only on initiate.");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Zoom only on initiate.");
o->longDesc = N_("Zoom out only when the 'Initiate' key/mouse combo is pressed.");
o->type = CompOptionTypeBool;
o->value.b = FALSE;
o = &rs->opt[ROTATE_SCREEN_OPTION_WHEEL_ON_EDGES];
o->name = "wheel_on_edges";
- o->shortDesc = N_("Rotate with wheel near edges");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate with wheel near edges");
o->longDesc = N_("Enable rotate through mouse wheel near screen edges");
o->type = CompOptionTypeBool;
o->value.b = ROTATE_WHEEL_ON_EDGES_DEFAULT;
o = &rs->opt[ROTATE_SCREEN_OPTION_WHEELMAXDIST];
o->name = "wheel_max_dist";
- o->shortDesc = N_("Max distance from edge to rotate");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Max distance from edge to rotate");
o->longDesc = N_("Maximum cursor distance from edges to initiate rotate with wheel");
o->type = CompOptionTypeInt;
o->value.i = ROTATE_WHEELMAXDIST_DEFAULT;
@@ -2135,7 +2174,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_INITIATE];
o->name = "initiate";
- o->shortDesc = N_("Initiate");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Initiate");
o->longDesc = N_("Start Rotation");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateInitiate;
@@ -2150,7 +2192,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_WHEELINGS];
o->name = "rotate_wheelings";
- o->shortDesc = N_("Mouse Wheel Scrolls for Rotation");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Mouse Wheel Scrolls for Rotation");
o->longDesc = N_("Number of mouse wheel scrolls required for rotation");
o->type = CompOptionTypeInt;
o->value.i = ROTATE_WHEELINGS_DEFAULT;
@@ -2159,7 +2204,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_LEFT_WHEEL];
o->name = "rotate_left_wheel";
- o->shortDesc = N_("Rotate Left with Mouse Wheel");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Left with Mouse Wheel");
o->longDesc = N_("Rotate left with mouse wheel");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateLeftWheel;
@@ -2173,7 +2221,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_RIGHT_WHEEL];
o->name = "rotate_right_wheel";
- o->shortDesc = N_("Rotate Right with Mouse Wheel");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Right with Mouse Wheel");
o->longDesc = N_("Rotate right with mouse wheel");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateRightWheel;
@@ -2187,7 +2238,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_LEFT];
o->name = "rotate_left";
- o->shortDesc = N_("Rotate Left");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Left");
o->longDesc = N_("Rotate left");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateLeft;
@@ -2205,7 +2259,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_RIGHT];
o->name = "rotate_right";
- o->shortDesc = N_("Rotate Right");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Right");
o->longDesc = N_("Rotate right");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateRight;
@@ -2223,7 +2280,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_UP];
o->name = "rotate_up";
- o->shortDesc = N_("Rotate Up");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Up");
o->longDesc = N_("Rotate up");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateTop;
@@ -2241,7 +2301,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_DOWN];
o->name = "rotate_down";
- o->shortDesc = N_("Rotate Down");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Down");
o->longDesc = N_("Rotate down");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateDown;
@@ -2259,7 +2322,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_LEFT_WINDOW];
o->name = "rotate_left_window";
- o->shortDesc = N_("Rotate Left with Window");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Left with Window");
o->longDesc = N_("Rotate left and bring active window " "along");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateLeftWithWindow;
@@ -2277,7 +2343,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_RIGHT_WINDOW];
o->name = "rotate_right_window";
- o->shortDesc = N_("Rotate Right with Window");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Right with Window");
o->longDesc = N_("Rotate right and bring active window " "along");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateRightWithWindow;
@@ -2303,7 +2372,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_TO_ ## n]; \
o->name = "rotate_to_" #n; \
asprintf (&str, ROTATE_TO_SHORT, n); \
- o->shortDesc = str; \
+ o->group=N_("");\
+o->subGroup=N_("");\
+o->displayHints="";\
+o->shortDesc = str; \
asprintf (&str, ROTATE_TO_LONG, n); \
o->longDesc = str; \
o->type = CompOptionTypeAction; \
@@ -2318,7 +2390,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_TO_ ## n ## _WINDOW]; \
o->name = "rotate_to_" #n "_window"; \
asprintf (&str, ROTATE_TO_WINDOW_SHORT, n); \
- o->shortDesc = str; \
+ o->group=N_("");\
+o->subGroup=N_("");\
+o->displayHints="";\
+o->shortDesc = str; \
asprintf (&str, ROTATE_TO_WINDOW_LONG, n); \
o->longDesc = str; \
o->type = CompOptionTypeAction; \
@@ -2345,7 +2420,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_TO];
o->name = "rotate_to";
- o->shortDesc = N_("Rotate To");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate To");
o->longDesc = N_("Rotate to viewport");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateTo;
@@ -2357,7 +2435,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_WINDOW];
o->name = "rotate_window";
- o->shortDesc = N_("Rotate Window");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Window");
o->longDesc = N_("Rotate with window");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateToWithWindow;
@@ -2369,7 +2450,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_FLIP_LEFT];
o->name = "rotate_flip_left";
- o->shortDesc = N_("Rotate Flip Left");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Flip Left");
o->longDesc = N_("Flip to left viewport and warp " "pointer");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateEdgeFlipLeft;
@@ -2384,7 +2468,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_FLIP_RIGHT];
o->name = "rotate_flip_right";
- o->shortDesc = N_("Rotate Flip Right");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Rotate Flip Right");
o->longDesc = N_("Flip to right viewport and warp " "pointer");
o->type = CompOptionTypeAction;
o->value.action.initiate = rotateEdgeFlipRight;
@@ -2399,7 +2486,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_POINTER];
o->name = "edge_flip_pointer";
- o->shortDesc = N_("Edge Flip Pointer");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Edge Flip Pointer");
o->longDesc = N_("Flip to next viewport when moving pointer to screen "
"edge");
o->type = CompOptionTypeBool;
@@ -2407,7 +2497,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_WINDOW];
o->name = "edge_flip_move";
- o->shortDesc = N_("Edge Flip Move");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Edge Flip Move");
o->longDesc = N_("Flip to next viewport when moving window to screen "
"edge");
o->type = CompOptionTypeBool;
@@ -2415,7 +2508,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_DND];
o->name = "edge_flip_dnd";
- o->shortDesc = N_("Edge Flip DnD");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Edge Flip DnD");
o->longDesc = N_("Flip to next viewport when dragging object to screen "
"edge");
o->type = CompOptionTypeBool;
@@ -2423,7 +2519,10 @@ rotateDisplayInitOptions (RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_FLIPTIME];
o->name = "flip_time";
- o->shortDesc = N_("Flip Time");
+ o->group=N_("");
+o->subGroup=N_("");
+o->displayHints="";
+o->shortDesc = N_("Flip Time");
o->longDesc = N_("Timeout before flipping viewport");
o->type = CompOptionTypeInt;
o->value.i = ROTATE_FLIPTIME_DEFAULT;