rpms/kdebase-workspace/devel kdebase-workspace-4.4.2-kdm_plymouth.patch, NONE, 1.1 kdebase-workspace.spec, 1.386, 1.387 kdebase-workspace-4.3.4-kdm_plymouth.patch, 1.3, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv917

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.4.2-kdm_plymouth.patch 
Removed Files:
	kdebase-workspace-4.3.4-kdm_plymouth.patch 
Log Message:
tweak original kdm_plytmouth patch slightly, a wee-bit safer code.


kdebase-workspace-4.4.2-kdm_plymouth.patch:
 dm.c |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

--- NEW FILE kdebase-workspace-4.4.2-kdm_plymouth.patch ---
diff -up kdebase-workspace-4.4.2/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.4.2/kdm/backend/dm.c
--- kdebase-workspace-4.4.2/kdm/backend/dm.c.kdm_plymouth	2009-10-26 04:14:47.000000000 -0500
+++ kdebase-workspace-4.4.2/kdm/backend/dm.c	2010-04-13 09:04:27.722245637 -0500
@@ -1330,6 +1330,36 @@ getBusyVTs( void )
 	return activeVTs;
 }
 
+static int
+get_active_vt (void)
+{
+        int console_fd;
+        struct vt_stat console_state = { 0 };
+        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
+        if (console_fd < 0) {
+                goto out;
+        }
+        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
+                goto out;
+        }
+out:
+        if (console_fd >= 0) {
+                close (console_fd);
+        }
+        return console_state.v_active;
+}
+
+static int
+triggered_to_force_display_on_active_vt (void)
+{
+	int should_force_display_on_active_vt;
+	should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
+        if ( should_force_display_on_active_vt >= 0 )
+                close(should_force_display_on_active_vt);
+	unlink("/var/spool/gdm/force-display-on-active-vt");
+	return should_force_display_on_active_vt;
+}
+
 static void
 allocateVT( struct display *d )
 {
@@ -1339,6 +1369,14 @@ allocateVT( struct display *d )
 	if ((d->displayType & d_location) == dLocal &&
 	    d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
 	{
+		if ( triggered_to_force_display_on_active_vt() >= 0 ) {
+			int vt;
+			vt = get_active_vt();
+			if (vt > 0) {
+				d->serverVT = vt;
+				return;
+			}
+		}
 		if (d->reqSrvVT && d->reqSrvVT < 16)
 			d->serverVT = d->reqSrvVT;
 		else {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- kdebase-workspace.spec	12 Apr 2010 20:21:16 -0000	1.386
+++ kdebase-workspace.spec	13 Apr 2010 14:31:50 -0000	1.387
@@ -49,7 +49,7 @@ Patch16: kdebase-workspace-4.3.98-batter
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
 Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch
-Patch18: kdebase-workspace-4.3.4-kdm_plymouth.patch
+Patch18: kdebase-workspace-4.4.2-kdm_plymouth.patch
 # kubuntu kudos! bulletproof-X bits ripped out
 Patch19: kdebase-workspace-4.4.2-kdm_plymouth081.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch


--- kdebase-workspace-4.3.4-kdm_plymouth.patch DELETED ---