[beryl-commits] r1477 - branches/compiz-merge/beryl-core/src

[amaranth at server.beryl-project.org]

Author: amaranth
Date: 2006-12-02 00:22:40 +0100 (Sat, 02 Dec 2006)
New Revision: 1477

Modified:
   branches/compiz-merge/beryl-core/src/action.c
   branches/compiz-merge/beryl-core/src/display.c
Log:
display.c and action.c done, ignoring whitespace differences


Modified: branches/compiz-merge/beryl-core/src/action.c
===================================================================
--- branches/compiz-merge/beryl-core/src/action.c	2006-12-01 05:06:36 UTC (rev 1476)
+++ branches/compiz-merge/beryl-core/src/action.c	2006-12-01 23:22:40 UTC (rev 1477)
@@ -30,15 +30,13 @@
 #include <beryl.h>
 #include <beryl-private.h>
 
-typedef struct _CompAction
-{
-    char *name;
-    char *description;
+typedef struct _CompAction {
+    char	   *name;
+    char	   *description;
     CompOptionType type;
-    union
-    {
-        Bool b;
-        int i;
-        float f;
+    union {
+	Bool  b;
+	int   i;
+	float f;
     } value;
 } CompAction;

Modified: branches/compiz-merge/beryl-core/src/display.c
===================================================================
--- branches/compiz-merge/beryl-core/src/display.c	2006-12-01 05:06:36 UTC (rev 1476)
+++ branches/compiz-merge/beryl-core/src/display.c	2006-12-01 23:22:40 UTC (rev 1477)
@@ -321,24 +321,26 @@
 }
 
 static Bool
-lower (CompDisplay * d,
-       CompAction * action,
-       CompActionState state, CompOption * option, int nOption)
+raise (CompDisplay     *d,
+       CompAction      *action,
+       CompActionState state,
+       CompOption      *option,
+       int	       nOption)
 {
     CompWindow *w;
-    Window xid;
+    Window     xid;
 
     xid = getIntOptionNamed (option, nOption, "window", 0);
 
     w = findTopLevelWindowAtDisplay (d, xid);
     if (w)
-        lowerWindow (w);
+	raiseWindow (w);
 
     return TRUE;
 }
 
 static Bool
-raise (CompDisplay * d,
+lower (CompDisplay * d,
        CompAction * action,
        CompActionState state, CompOption * option, int nOption)
 {
@@ -349,7 +351,7 @@
 
     w = findTopLevelWindowAtDisplay (d, xid);
     if (w)
-        raiseWindow (w);
+        lowerWindow (w);
 
     return TRUE;
 }
@@ -747,6 +749,7 @@
 
     return TRUE;
 }
+
 static void
 setAudibleBell (CompDisplay * display, Bool audible)
 {
@@ -859,6 +862,7 @@
     case COMP_DISPLAY_OPTION_RUN_COMMAND10:
     case COMP_DISPLAY_OPTION_RUN_COMMAND11:
     case COMP_DISPLAY_OPTION_SLOW_ANIMATIONS:
+    case COMP_DISPLAY_OPTION_RAISE_WINDOW:
     case COMP_DISPLAY_OPTION_LOWER_WINDOW:
     case COMP_DISPLAY_OPTION_OPACITY_INCREASE:
     case COMP_DISPLAY_OPTION_OPACITY_DECREASE:
@@ -874,7 +878,6 @@
     case COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT:
     case COMP_DISPLAY_OPTION_TOGGLE_WINDOW_SHADED:
     case COMP_DISPLAY_OPTION_TOGGLE_WINDOW_FULLSCREEN:
-    case COMP_DISPLAY_OPTION_RAISE_WINDOW:
         if (setDisplayAction (display, o, value))
             return TRUE;
         break;
@@ -1556,9 +1559,16 @@
                     }
 
                     EMPTY_REGION (s->damage);
+
                     mask = s->damageMask;
                     s->damageMask = 0;
 
+            if (s->clearBuffers)
+            {
+                if (mask & COMP_SCREEN_DAMAGE_ALL_MASK)
+                    glClear (GL_COLOR_BUFFER_BIT);
+            }
+
                     for (i = 0; i < s->nOutputDev; i++)
                     {
 			targetScreen = s;
@@ -1596,6 +1606,7 @@
 
 				XUnionRegion (tmpRegion, &s->outputDev[i].region,
 					tmpRegion);
+
                             }
                         }
                     }
@@ -3076,21 +3087,7 @@
 
     for (s = display->screens; s; s = s->next)
         addScreenAction (s, &value->action);
-    //        break;
 
-    /*    if (s)
-       {
-       CompScreen *failed = s;
-
-       for (s = display->screens; s && s != failed; s = s->next)
-       removeScreenAction (s, &value->action);
-       for (s = display->screens; s; s = s->next)
-       addScreenAction (s, &o->value.action);
-       printf ("Couldn't set %s\n",o->name);
-
-       return FALSE;
-       } */
-
     if (compSetActionOption (o, value))
         return TRUE;