mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-04-24 13:01:25 +02:00
slim: Changed patch for keyboard ctrl (take 1)
This commit is contained in:
root
@@ -2,7 +2,7 @@ AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984
|
|||||||
AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
|
AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
|
||||||
AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
|
AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
|
||||||
AUX slim-1.3.2-config.diff 2102 RMD160 f55b6a0d9acace01c0950ffa55b0d0ea5ca2e54b SHA1 693937055fea62aa3ad037da351e9a2e8636c6ea SHA256 dea2cb302bd8dcc4318c9b1c0296d14db10c5d9f9247d48134ec1b35a9db0943
|
AUX slim-1.3.2-config.diff 2102 RMD160 f55b6a0d9acace01c0950ffa55b0d0ea5ca2e54b SHA1 693937055fea62aa3ad037da351e9a2e8636c6ea SHA256 dea2cb302bd8dcc4318c9b1c0296d14db10c5d9f9247d48134ec1b35a9db0943
|
||||||
AUX slim-1.3.2-kbd_ctrl.patch 3468 RMD160 d0e8e425994d9d17f1945c1e331e598550af13a8 SHA1 5d2e5b2dda1f6481e9ef0ecd7bbba71e7d20dc8f SHA256 0238e0e5b3536f3bed5510c0f7726dff8edbbae63c3e3b67af72760794d0df5e
|
AUX slim-1.3.2-kbd_ctrl.patch 3545 RMD160 98c2f74b38b7784e9538696ea41ec18f1f6cc749 SHA1 88d94cc9b127609a30b61aab0e4cad57931aa97e SHA256 d8bf63c36d5e4d011903c76f75d46c43a1cfc7f82e2b2163c1d7165bd5268c74
|
||||||
AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
|
AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
|
||||||
DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
|
DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
|
||||||
EBUILD slim-1.3.2-r10.ebuild 3309 RMD160 addd51d26160fc32d3e359cfb5ddc0b074595559 SHA1 f89719ba1d81330fb2cb03e1eb2198489809573f SHA256 5e27f3fa7a3c97c77de902d612c670797e801bc5676cadf30b4851940155fcc5
|
EBUILD slim-1.3.2-r10.ebuild 3309 RMD160 addd51d26160fc32d3e359cfb5ddc0b074595559 SHA1 f89719ba1d81330fb2cb03e1eb2198489809573f SHA256 5e27f3fa7a3c97c77de902d612c670797e801bc5676cadf30b4851940155fcc5
|
||||||
|
|||||||
@@ -1,107 +1,109 @@
|
|||||||
diff -ur slim-1.3.2_orig/app.cpp slim-1.3.2/app.cpp
|
diff -ur slim-1.3.2/app.cpp slim-1.3.2_orig/app.cpp
|
||||||
--- slim-1.3.2_orig/app.cpp 2010-07-08 07:04:10.000000000 +0200
|
--- slim-1.3.2/app.cpp 2010-08-22 15:51:50.000000000 +0200
|
||||||
+++ slim-1.3.2/app.cpp 2010-08-18 21:47:42.000000000 +0200
|
+++ slim-1.3.2_orig/app.cpp 2010-07-08 07:04:10.000000000 +0200
|
||||||
@@ -50,6 +50,15 @@
|
@@ -51,13 +51,9 @@
|
||||||
// We assume PAM is asking for the username
|
|
||||||
panel->EventHandler(Panel::Get_Name);
|
panel->EventHandler(Panel::Get_Name);
|
||||||
switch(panel->getAction()){
|
switch(panel->getAction()){
|
||||||
+ case Panel::KSuspend:
|
|
||||||
+ Suspend();
|
|
||||||
+ break;
|
|
||||||
+ case Panel::KHalt:
|
|
||||||
+ Halt();
|
|
||||||
+ break;
|
|
||||||
+ case Panel::KReboot:
|
|
||||||
+ Reboot();
|
|
||||||
+ break;
|
|
||||||
case Panel::Suspend:
|
case Panel::Suspend:
|
||||||
|
- Suspend();
|
||||||
|
- break;
|
||||||
case Panel::Halt:
|
case Panel::Halt:
|
||||||
|
- Halt();
|
||||||
|
- break;
|
||||||
case Panel::Reboot:
|
case Panel::Reboot:
|
||||||
@@ -394,12 +403,15 @@
|
- Reboot();
|
||||||
|
+ resp[i]->resp=strdup("root");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Panel::Console:
|
||||||
|
@@ -398,15 +394,12 @@
|
||||||
case Panel::Console:
|
case Panel::Console:
|
||||||
Console();
|
Console();
|
||||||
break;
|
break;
|
||||||
+ case Panel::KReboot:
|
- case Panel::KReboot:
|
||||||
case Panel::Reboot:
|
case Panel::Reboot:
|
||||||
Reboot();
|
Reboot();
|
||||||
break;
|
break;
|
||||||
+ case Panel::KHalt:
|
- case Panel::KHalt:
|
||||||
case Panel::Halt:
|
case Panel::Halt:
|
||||||
Halt();
|
Halt();
|
||||||
break;
|
break;
|
||||||
+ case Panel::KSuspend:
|
- case Panel::KSuspend:
|
||||||
case Panel::Suspend:
|
case Panel::Suspend:
|
||||||
Suspend();
|
Suspend();
|
||||||
break;
|
break;
|
||||||
@@ -420,6 +432,9 @@
|
@@ -427,10 +420,6 @@
|
||||||
}
|
}
|
||||||
catch(PAM::Auth_Exception& e){
|
catch(PAM::Auth_Exception& e){
|
||||||
switch(LoginPanel->getAction()){
|
switch(LoginPanel->getAction()){
|
||||||
+ case Panel::KSuspend:
|
- case Panel::KSuspend:
|
||||||
+ case Panel::KReboot:
|
- case Panel::KReboot:
|
||||||
+ case Panel::KHalt:
|
- case Panel::KHalt:
|
||||||
|
- cerr << APPNAME << ": call app::AuthenticateUser usepam" << endl;
|
||||||
case Panel::Exit:
|
case Panel::Exit:
|
||||||
case Panel::Console:
|
case Panel::Console:
|
||||||
return true; // <--- This is simply fake!
|
return true; // <--- This is simply fake!
|
||||||
@@ -440,6 +455,9 @@
|
@@ -451,11 +440,6 @@
|
||||||
if (!focuspass){
|
if (!focuspass){
|
||||||
LoginPanel->EventHandler(Panel::Get_Name);
|
LoginPanel->EventHandler(Panel::Get_Name);
|
||||||
switch(LoginPanel->getAction()){
|
switch(LoginPanel->getAction()){
|
||||||
+ case Panel::KSuspend:
|
- case Panel::KSuspend:
|
||||||
+ case Panel::KReboot:
|
- case Panel::KReboot:
|
||||||
+ case Panel::KHalt:
|
- case Panel::KHalt:
|
||||||
|
- cerr << APPNAME << ": call App::AuthenticateUser " << endl;
|
||||||
|
-
|
||||||
case Panel::Exit:
|
case Panel::Exit:
|
||||||
case Panel::Console:
|
case Panel::Console:
|
||||||
cerr << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
|
cerr << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
|
||||||
@@ -454,6 +472,10 @@
|
@@ -470,10 +454,6 @@
|
||||||
struct passwd *pw;
|
struct passwd *pw;
|
||||||
|
|
||||||
switch(LoginPanel->getAction()){
|
switch(LoginPanel->getAction()){
|
||||||
+ case Panel::KSuspend:
|
- case Panel::KSuspend:
|
||||||
+ case Panel::KHalt:
|
- case Panel::KHalt:
|
||||||
+ case Panel::KReboot:
|
- case Panel::KReboot:
|
||||||
+ return true;
|
- return true;
|
||||||
case Panel::Suspend:
|
case Panel::Suspend:
|
||||||
case Panel::Halt:
|
case Panel::Halt:
|
||||||
case Panel::Reboot:
|
case Panel::Reboot:
|
||||||
diff -ur slim-1.3.2_orig/panel.cpp slim-1.3.2/panel.cpp
|
diff -ur slim-1.3.2/panel.cpp slim-1.3.2_orig/panel.cpp
|
||||||
--- slim-1.3.2_orig/panel.cpp 2010-07-08 07:04:10.000000000 +0200
|
--- slim-1.3.2/panel.cpp 2010-08-22 15:49:34.000000000 +0200
|
||||||
+++ slim-1.3.2/panel.cpp 2010-08-17 21:28:19.000000000 +0200
|
+++ slim-1.3.2_orig/panel.cpp 2010-07-08 07:04:10.000000000 +0200
|
||||||
@@ -351,6 +351,22 @@
|
@@ -351,22 +351,6 @@
|
||||||
string formerString = "";
|
string formerString = "";
|
||||||
|
|
||||||
XLookupString(&event.xkey, &ascii, 1, &keysym, &compstatus);
|
XLookupString(&event.xkey, &ascii, 1, &keysym, &compstatus);
|
||||||
+ if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
|
- if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
|
||||||
+ switch(keysym){
|
- switch(keysym){
|
||||||
+ case XK_s:
|
- case XK_s:
|
||||||
+ action = KSuspend;
|
- action = KSuspend;
|
||||||
+ return false;
|
- return false;
|
||||||
+ case XK_h:
|
- case XK_h:
|
||||||
+ action = KHalt;
|
- action = KHalt;
|
||||||
+ return false;
|
- return false;
|
||||||
+ case XK_r:
|
- case XK_r:
|
||||||
+ action = KReboot;
|
- action = KReboot;
|
||||||
+ return false;
|
- return false;
|
||||||
+ default:
|
- default:
|
||||||
+ break;
|
- break;
|
||||||
+ }
|
- }
|
||||||
+ }
|
- }
|
||||||
+
|
-
|
||||||
switch(keysym){
|
switch(keysym){
|
||||||
case XK_F1:
|
case XK_F1:
|
||||||
SwitchSession();
|
SwitchSession();
|
||||||
diff -ur slim-1.3.2_orig/panel.h slim-1.3.2/panel.h
|
diff -ur slim-1.3.2/panel.h slim-1.3.2_orig/panel.h
|
||||||
--- slim-1.3.2_orig/panel.h 2010-07-08 07:04:10.000000000 +0200
|
--- slim-1.3.2/panel.h 2010-08-22 15:49:54.000000000 +0200
|
||||||
+++ slim-1.3.2/panel.h 2010-08-17 21:28:37.000000000 +0200
|
+++ slim-1.3.2_orig/panel.h 2010-07-08 07:04:10.000000000 +0200
|
||||||
@@ -40,7 +40,10 @@
|
@@ -40,10 +40,7 @@
|
||||||
Reboot,
|
Reboot,
|
||||||
Halt,
|
Halt,
|
||||||
Exit,
|
Exit,
|
||||||
- Suspend
|
- Suspend,
|
||||||
+ Suspend,
|
- KHalt,
|
||||||
+ KHalt,
|
- KReboot,
|
||||||
+ KReboot,
|
- KSuspend
|
||||||
+ KSuspend
|
+ Suspend
|
||||||
};
|
};
|
||||||
enum FieldType {
|
enum FieldType {
|
||||||
Get_Name,
|
Get_Name,
|
||||||
|
|||||||
Reference in New Issue
Block a user