gryf/gryf-overlay
1
0
Fork 0
mirror of https://github.com/gryf/gryf-overlay.git synced 2026-01-06 13:54:23 +01:00
Code Issues Projects Releases Wiki Activity

slim: Gave up. Made dirty hack to call defined in cfg file commands inside

Browse Source 
panel.cpp instead of making real solution in app.cpp
This commit is contained in:
root
2010-08-22 20:34:44 +02:00
parent 3a7eab0ea7
commit 3a47b794bd
3 changed files with 10 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
x11-misc/slim/Manifest
View File

@@ -2,7 +2,8 @@ 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 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-kbd_ctrl.patch 3005 RMD160 949bc33e8b459814f196867f66e9cf22b718f451 SHA1 e09c86988547ceddbaecb8be232fc99a760c7ede SHA256 5d716104ac15cf05e98a8e433ab3c1e5b1e9070b828962e535d3ba705fca9634
AUX slim-1.3.2-kbd_ctrl.patch 926 RMD160 c1947cc0ff045e2b826b88f15d1a53a768937182 SHA1 e9cf1d7964594cc7aa05caac6828cdd249d62f43 SHA256 654880c12f5e060d2dbe3d394ec46d7edd1c7d6dbf2266f1774cca0a555e8a58
AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
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 3315 RMD160 2a37e3b3d1ca2d3046d58f4d0c231d7839d892df SHA1 8e1dce879d4fd47155fb58b0fc341925d8e29348 SHA256 be00abd31fdab40aea88b5f212899dbdc93943a3987ae640988d83b0b60e1251
MISC slim-1.3.2-r10.ebuild_ 3008 RMD160 961e63f51c064498eea3a2712142d8591d656191 SHA1 e4f2b00b84d71c3c49ca0711eab47df7d5b1e306 SHA256 683ca186a191af710b928e94658f1f8e206f090a9a520668d7948aa3fe1e1055

79
x11-misc/slim/files/slim-1.3.2-kbd_ctrl.patch
View File

@@ -1,73 +1,21 @@
diff -ru slim-1.3.2_orig/app.cpp slim-1.3.2/app.cpp
--- slim-1.3.2_orig/app.cpp 2010-08-22 16:08:26.000000000 +0200
+++ slim-1.3.2/app.cpp 2010-08-22 16:34:01.000000000 +0200
@@ -385,12 +385,15 @@
case Panel::Console:
Console();
break;
+ case Panel::KReboot:
case Panel::Reboot:
Reboot();
break;
+ case Panel::KHalt:
case Panel::Halt:
Halt();
break;
+ case Panel::KSuspend:
case Panel::Suspend:
Suspend();
break;
@@ -411,6 +414,10 @@
}
catch(PAM::Auth_Exception& e){
switch(LoginPanel->getAction()){
+ case Panel::KSuspend:
+ case Panel::KReboot:
+ case Panel::KHalt:
+ cerr << APPNAME << ": call app::AuthenticateUser usepam" << endl;
case Panel::Exit:
case Panel::Console:
return true; // <--- This is simply fake!
@@ -431,6 +438,11 @@
if (!focuspass){
LoginPanel->EventHandler(Panel::Get_Name);
switch(LoginPanel->getAction()){
+ case Panel::KSuspend:
+ case Panel::KReboot:
+ case Panel::KHalt:
+ cerr << APPNAME << ": call App::AuthenticateUser " << endl;
+
case Panel::Exit:
case Panel::Console:
cerr << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
@@ -445,6 +457,10 @@
struct passwd *pw;
switch(LoginPanel->getAction()){
+ case Panel::KSuspend:
+ case Panel::KHalt:
+ case Panel::KReboot:
+ return true;
case Panel::Suspend:
case Panel::Halt:
case Panel::Reboot:
diff -ru slim-1.3.2_orig/panel.cpp slim-1.3.2/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 16:11:10.000000000 +0200
@@ -351,6 +351,22 @@
+++ slim-1.3.2/panel.cpp 2010-08-22 20:25:01.000000000 +0200
@@ -351,6 +351,23 @@
string formerString = "";
XLookupString(&event.xkey, &ascii, 1, &keysym, &compstatus);
+ if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
+ switch(keysym){
+ case XK_s:
+ action = KSuspend;
+ system(cfg->getOption("suspend_cmd").c_str());
+ action = Suspend;
+ return false;
+ case XK_h:
+ action = KHalt;
+ system(cfg->getOption("halt_cmd").c_str());
+ return false;
+ case XK_r:
+ action = KReboot;
+ system(cfg->getOption("reboot_cmd").c_str());
+ return false;
+ default:
+ break;
@@ -77,18 +25,3 @@ diff -ru slim-1.3.2_orig/panel.cpp slim-1.3.2/panel.cpp
switch(keysym){
case XK_F1:
SwitchSession();
diff -ru slim-1.3.2_orig/panel.h slim-1.3.2/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 16:11:17.000000000 +0200
@@ -40,7 +40,10 @@
Reboot,
Halt,
Exit,
- Suspend
+ Suspend,
+ KHalt,
+ KReboot,
+ KSuspend
};
enum FieldType {
Get_Name,

2
x11-misc/slim/slim-1.3.2-r10.ebuild
View File

@@ -94,7 +94,7 @@ pkg_postinst() {
elog " - Halt (CTRL-H)"
elog " - Reboot (CTRL-R)"
elog " - Suspend (CTRL-S)"
elog "All actions are performed without password prompt."
elog "All above actions are performed without password prompt."
elog
if ! use pam; then
elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to"