Skip to content

Commit e959110

Browse files
committed
Login: do not apply display layout at application start. Should fix issue #451.
1 parent c02c447 commit e959110

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Applications/Login/Login_main.m

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,18 @@ int startWindowServer()
138138
void setupDisplays()
139139
{
140140
NSLog(@"setupDisplays() - START");
141-
OSEScreen *screen = [OSEScreen new];
141+
OSEScreen *screen;
142142
OSEDisplay *mainDisplay = nil;
143-
NSArray *layout;
143+
// NSArray *layout;
144144
Display *xDisplay;
145145
Window xRootWindow;
146146
NSArray *displays;
147147

148+
screen = [OSEScreen new];
149+
148150
// Get layout with monitors aligned horizontally
149-
layout = [screen defaultLayout:YES];
151+
// layout = [screen defaultLayout:YES];
152+
// [screen applyDisplayLayout:layout];
150153

151154
displays = [screen activeDisplays];
152155
for (OSEDisplay *display in displays) {
@@ -159,14 +162,14 @@ void setupDisplays()
159162
mainDisplay = display;
160163
}
161164
}
162-
[screen applyDisplayLayout:layout];
163165
[screen setMainDisplay:mainDisplay];
164166

165167
xDisplay = XOpenDisplay(NULL);
166168
xRootWindow = RootWindow(xDisplay, DefaultScreen(xDisplay));
167169
XWarpPointer(xDisplay, None, xRootWindow, 0, 0, 0, 0, (int)mainDisplay.frame.origin.x + 50,
168170
(int)mainDisplay.frame.origin.y + 50);
169171
XCloseDisplay(xDisplay);
172+
170173
[screen release];
171174
NSLog(@"setupDisplays() - END");
172175
}

Applications/Login/Resources/loginwindow.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service
2424
OnFailure=plymouth-quit.service
2525

2626
[Service]
27-
ExecStart=/usr/NextSpace/Apps/Login.app/Login --GNU-Debug=dealloc
27+
ExecStart=/usr/NextSpace/Apps/Login.app/Login
2828
ExecStartPost=-/bin/bash -c "TERM=linux /usr/bin/clear > /dev/tty1"
2929
KillMode=process
3030
KillSignal=SIGQUIT

0 commit comments

Comments
 (0)