Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c config.c ipc.c settings.c setup.c
Log Message:
Trivial renaming of placement options.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -3 -r1.300 -r1.301
--- E.h 2 Jul 2004 17:36:57 -0000 1.300
+++ E.h 3 Jul 2004 00:30:48 -0000 1.301
@@ -1228,6 +1228,11 @@
} pagers;
struct
{
+ char manual;
+ char manual_mouse_pointer;
+ } place;
+ struct
+ {
char enable;
int edge_snap_dist;
int screen_snap_dist;
@@ -1285,8 +1290,6 @@
char save_under;
char menuslide;
char menusonscreen;
- char manual_placement;
- char manual_placement_mouse_pointer;
char warpmenus;
int edge_flip_resistance;
GroupConfig group_config;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -3 -r1.208 -r1.209
--- borders.c 2 Jul 2004 20:59:32 -0000 1.208
+++ borders.c 3 Jul 2004 00:30:48 -0000 1.209
@@ -489,7 +489,7 @@
ewin->desktop = DESKTOPS_WRAP_NUM(ewin->desktop);
}
- if ((!ewin->client.transient) && (Conf.manual_placement)
+ if ((!ewin->client.transient) && (Conf.place.manual)
&& (!ewin->client.already_placed) && (!Mode.wm.startup) && (!Mode.place))
{
cangrab = GrabThePointer(VRoot.win);
@@ -511,9 +511,8 @@
y = ewin->y;
if ((!ewin->client.already_placed) && (!manplace))
{
-
/* Place the window below the mouse pointer */
- if (Conf.manual_placement_mouse_pointer)
+ if (Conf.place.manual_mouse_pointer)
{
int rx, ry, wx, wy;
unsigned int mask;
@@ -556,8 +555,8 @@
{
ewin->client.already_placed = 1;
ArrangeEwinXY(ewin, &x, &y);
- } /* (Conf.manual_placement_mouse_pointer) */
- } /* ((!ewin->client.already_placed) && (!manplace)) */
+ }
+ }
/* if the window asked to be iconified at the start */
if (ewin->client.start_iconified)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- config.c 19 Jun 2004 21:31:39 -0000 1.105
+++ config.c 3 Jul 2004 00:30:49 -0000 1.106
@@ -750,10 +750,10 @@
Conf.focus.new_transients_get_focus_if_group_focused = i2;
break;
case CONTROL_MANUAL_PLACEMENT:
- Conf.manual_placement = i2;
+ Conf.place.manual = i2;
break;
case CONTROL_MANUAL_PLACEMENT_MOUSE_POINTER:
- Conf.manual_placement_mouse_pointer = i2;
+ Conf.place.manual_mouse_pointer = i2;
break;
case CONTROL_RAISE_ON_NEXT_FOCUS:
Conf.focus.raise_on_next_focus = i2;
@@ -3893,9 +3893,9 @@
(int)Conf.focus.new_transients_get_focus);
fprintf(autosavefile, "342 %i\n",
(int)Conf.focus.new_transients_get_focus_if_group_focused);
- fprintf(autosavefile, "343 %i\n", (int)Conf.manual_placement);
+ fprintf(autosavefile, "343 %i\n", (int)Conf.place.manual);
fprintf(autosavefile, "3360 %i\n",
- (int)Conf.manual_placement_mouse_pointer);
+ (int)Conf.place.manual_mouse_pointer);
fprintf(autosavefile, "344 %i\n", (int)Conf.focus.raise_on_next_focus);
fprintf(autosavefile, "345 %i\n", (int)Conf.focus.warp_on_next_focus);
fprintf(autosavefile, "346 %i\n", (int)Conf.edge_flip_resistance);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- ipc.c 30 Jun 2004 13:04:01 -0000 1.165
+++ ipc.c 3 Jul 2004 00:30:49 -0000 1.166
@@ -2038,15 +2038,15 @@
{
if (!strcmp(param2, "on"))
{
- Conf.manual_placement = 1;
+ Conf.place.manual = 1;
}
else if (!strcmp(param2, "off"))
{
- Conf.manual_placement = 0;
+ Conf.place.manual = 0;
}
else if (!strcmp(param2, "?"))
{
- if (Conf.manual_placement)
+ if (Conf.place.manual)
{
Esnprintf(buf, sizeof(buf), "manual_placement: on");
}
@@ -2064,15 +2064,15 @@
{
if (!strcmp(param2, "on"))
{
- Conf.manual_placement_mouse_pointer = 1;
+ Conf.place.manual_mouse_pointer = 1;
}
else if (!strcmp(param2, "off"))
{
- Conf.manual_placement_mouse_pointer = 0;
+ Conf.place.manual_mouse_pointer = 0;
}
else if (!strcmp(param2, "?"))
{
- if (Conf.manual_placement_mouse_pointer)
+ if (Conf.place.manual_mouse_pointer)
{
Esnprintf(buf, sizeof(buf),
"manual_placement_mouse_pointer: on");
@@ -5484,12 +5484,12 @@
else if (!strcmp(w, "MANUAL_PLACEMENT:"))
{
word(s, wd, w);
- Conf.manual_placement = atoi(w);
+ Conf.place.manual = atoi(w);
}
else if (!strcmp(w, "MANUAL_PLACEMENT_MOUSE_POINTER:"))
{
word(s, wd, w);
- Conf.manual_placement_mouse_pointer = atoi(w);
+ Conf.place.manual_mouse_pointer = atoi(w);
}
else if (!strcmp(w, "RAISE_ON_NEXT_FOCUS:"))
{
@@ -5613,7 +5613,7 @@
Conf.focus.all_new_windows_get_focus,
Conf.focus.new_transients_get_focus,
Conf.focus.new_transients_get_focus_if_group_focused,
- Conf.manual_placement, Conf.manual_placement_mouse_pointer,
+ Conf.place.manual, Conf.place.manual_mouse_pointer,
Conf.focus.raise_on_next_focus,
Conf.focus.raise_after_next_focus, Conf.warplist.enable,
Conf.focus.warp_on_next_focus,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- settings.c 29 Jun 2004 13:19:23 -0000 1.114
+++ settings.c 3 Jul 2004 00:30:50 -0000 1.115
@@ -1462,9 +1462,8 @@
{
Conf.focus.transientsfollowleader = tmp_with_leader;
Conf.focus.switchfortransientmap = tmp_switch_popup;
- Conf.manual_placement = tmp_manual_placement;
- Conf.manual_placement_mouse_pointer =
- tmp_manual_placement_mouse_pointer;
+ Conf.place.manual = tmp_manual_placement;
+ Conf.place.manual_mouse_pointer = tmp_manual_placement_mouse_pointer;
#ifdef HAS_XINERAMA
if (xinerama_active)
Conf.extra_head = tmp_extra_head;
@@ -1491,8 +1490,8 @@
tmp_with_leader = Conf.focus.transientsfollowleader;
tmp_switch_popup = Conf.focus.switchfortransientmap;
- tmp_manual_placement = Conf.manual_placement;
- tmp_manual_placement_mouse_pointer = Conf.manual_placement_mouse_pointer;
+ tmp_manual_placement = Conf.place.manual;
+ tmp_manual_placement_mouse_pointer = Conf.place.manual_mouse_pointer;
#ifdef HAS_XINERAMA
tmp_extra_head = Conf.extra_head;
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -3 -r1.133 -r1.134
--- setup.c 30 Jun 2004 13:04:18 -0000 1.133
+++ setup.c 3 Jul 2004 00:30:50 -0000 1.134
@@ -486,7 +486,7 @@
Conf.menuslide = 0;
Conf.menusonscreen = 1;
Conf.warpmenus = 1;
- Conf.manual_placement = 0;
+ Conf.place.manual = 0;
Conf.edge_flip_resistance = 15;
#ifdef USE_IMLIB2
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
