From: Grazvydas Ignotas <notasas@gmail.com>
Date: Tue, 5 Feb 2013 01:17:05 +0000 (+0200)
Subject: slim: add a hack to load pandora's xmodmap
X-Git-Tag: sz_154~70
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1463038f4cda327841615d02b5df303d75854e;p=openpandora.oe.git

slim: add a hack to load pandora's xmodmap
---

diff --git a/recipes/slim/slim/pandora_xmodmap_hack.patch b/recipes/slim/slim/pandora_xmodmap_hack.patch
new file mode 100644
index 0000000..dfab693
--- /dev/null
+++ b/recipes/slim/slim/pandora_xmodmap_hack.patch
@@ -0,0 +1,18 @@
+diff -urp slim-1.3.1/app.cpp slim-1.3.1_/app.cpp
+--- slim-1.3.1/app.cpp	2013-02-05 01:32:52.583612049 +0200
++++ slim-1.3.1_/app.cpp	2013-02-05 03:11:55.799833237 +0200
+@@ -336,6 +336,14 @@ void App::Run() {
+             Login();
+         }
+     }
++    if (firstlogin || !autologin) {
++        // load keymap for pandora, our hackjob leader!
++        char buf[256];
++        const char *authfile = cfg->getOption("authfile").c_str();
++        snprintf(buf, sizeof(buf), "DISPLAY=:0 XAUTHORITY="
++            "%s /usr/bin/xmodmap /etc/skel/.pndXmodmap", authfile);
++        system(buf);
++    }
+     // Start looping
+     int panelclosed = 1;
+     Panel::ActionType Action;
diff --git a/recipes/slim/slim_1.3.1.bb b/recipes/slim/slim_1.3.1.bb
index 918bdc9..d028744 100644
--- a/recipes/slim/slim_1.3.1.bb
+++ b/recipes/slim/slim_1.3.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
 LICENSE = "GPL"
 
-PR = "r5"
+PR = "r6"
 
 inherit update-rc.d
 
@@ -20,6 +20,7 @@ SRC_URI=" \
   file://xauth_secret_support.patch;patch=1 \
   file://delay.patch;patch=1 \  
   file://pam-unix2.patch;patch=1 \    
+  file://pandora_xmodmap_hack.patch;patch=1 \
   file://rc.slim \
   file://slim-dynwm \
   file://update_slim_wmlist \