Merge lp:~vanvugt/compiz/fix-1005569.1 into lp:compiz/0.9.8

[Daniel van Vugt]

Avoid constructing and destructing lots of strings on every single event,
which was wasting lots of CPU (LP: #1005569)

[Sam Spilsbury (smspillaz)]

I'm fine with this going in as is, but the code needs to be redesigned tbh, the abstraction is terrible.

review: Approve

[Daniel van Vugt (vanvugt)]

I did recommend:
https://code.launchpad.net/~vanvugt/compiz/fix-1005569.2/+merge/107941
over this proposal.

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-05-27 04:32:55 +0000
+++ src/event.cpp	2012-05-30 09:31:21 +0000
@@ -649,15 +649,19 @@
 bool
 PrivateScreen::handleActionEvent (XEvent *event)
 {
-    static CompOption::Vector o (8);
+    static CompOption::Vector o;
     Window xid;
 
-    o[0].setName ("event_window", CompOption::TypeInt);
-    o[1].setName ("window", CompOption::TypeInt);
-    o[2].setName ("modifiers", CompOption::TypeInt);
-    o[3].setName ("x", CompOption::TypeInt);
-    o[4].setName ("y", CompOption::TypeInt);
-    o[5].setName ("root", CompOption::TypeInt);
+    if (o.empty ())
+    {
+	o.resize (8);
+	o[0].setName ("event_window", CompOption::TypeInt);
+	o[1].setName ("window", CompOption::TypeInt);
+	o[2].setName ("modifiers", CompOption::TypeInt);
+	o[3].setName ("x", CompOption::TypeInt);
+	o[4].setName ("y", CompOption::TypeInt);
+	o[5].setName ("root", CompOption::TypeInt);
+    }
     o[6].reset ();
     o[7].reset ();
 
@@ -937,6 +941,14 @@
 	if (event->type == xkbEvent.get())
 	{
 	    XkbAnyEvent *xkbEvent = (XkbAnyEvent *) event;
+	    static CompOption::Vector o;
+
+	    if (o.empty ())
+	    {
+		o.resize (8);
+		o[0].setName ("event_window", CompOption::TypeInt);
+		o[1].setName ("window", CompOption::TypeInt);
+	    }
 
 	    if (xkbEvent->xkb_type == XkbStateNotify)
 	    {
@@ -944,13 +956,10 @@
 
 		o[0].value ().set ((int) orphanData.activeWindow);
 		o[1].value ().set ((int) orphanData.activeWindow);
+		o[2].setName ("modifiers", CompOption::TypeInt);
 		o[2].value ().set ((int) stateEvent->mods);
-
 		o[3].setName ("time", CompOption::TypeInt);
 		o[3].value ().set ((int) xkbEvent->time);
-		o[4].reset ();
-		o[5].reset ();
-		o[6].reset ();
 		o[7].value ().set ((int) xkbEvent->time);
 
 		if (stateEvent->event_type == KeyPress)
@@ -967,13 +976,9 @@
 	    {
 		o[0].value ().set ((int) orphanData.activeWindow);
 		o[1].value ().set ((int) orphanData.activeWindow);
-
 		o[2].setName ("time", CompOption::TypeInt);
 		o[2].value ().set ((int) xkbEvent->time);
 		o[3].reset ();
-		o[4].reset ();
-		o[5].reset ();
-
 
 		foreach (CompPlugin *p, CompPlugin::getPlugins ())
 		{