Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
00c1f05e
Commit
00c1f05e
authored
Apr 11, 2018
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxagent: remove mmwidth/mmheight from nxagentChangeScreenConfig
Was 0,0 on every call...
parent
845ae6ea
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
12 deletions
+11
-12
Events.c
nx-X11/programs/Xserver/hw/nxagent/Events.c
+3
-4
Reconnect.c
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+1
-1
Screen.c
nx-X11/programs/Xserver/hw/nxagent/Screen.c
+4
-4
Screen.h
nx-X11/programs/Xserver/hw/nxagent/Screen.h
+1
-1
Window.c
nx-X11/programs/Xserver/hw/nxagent/Window.c
+2
-2
No files found.
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @
00c1f05e
...
...
@@ -602,8 +602,7 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen)
nxagentLaunchDialog
(
DIALOG_ENABLE_DESKTOP_RESIZE_MODE
);
nxagentChangeScreenConfig
(
0
,
nxagentOption
(
Width
),
nxagentOption
(
Height
),
0
,
0
);
nxagentChangeScreenConfig
(
0
,
nxagentOption
(
Width
),
nxagentOption
(
Height
));
if
(
nxagentOption
(
ClientOs
)
==
ClientOsWinnt
)
{
...
...
@@ -3451,7 +3450,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
#endif
nxagentChangeScreenConfig
(
0
,
nxagentOption
(
Width
),
nxagentOption
(
Height
)
,
0
,
0
);
nxagentOption
(
Height
));
}
}
...
...
@@ -3471,7 +3470,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
nxagentChangeOption
(
RootHeight
,
X
->
xconfigure
.
height
);
nxagentChangeScreenConfig
(
0
,
nxagentOption
(
Width
),
nxagentOption
(
Height
)
,
0
,
0
);
nxagentOption
(
Height
));
return
1
;
}
...
...
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
View file @
00c1f05e
...
...
@@ -626,7 +626,7 @@ Bool nxagentReconnectSession(void)
if
(
nxagentResizeDesktopAtStartup
||
nxagentOption
(
Rootless
)
==
True
||
nxagentOption
(
Xinerama
)
==
True
)
{
nxagentChangeScreenConfig
(
0
,
nxagentOption
(
RootWidth
),
nxagentOption
(
RootHeight
)
,
0
,
0
);
nxagentOption
(
RootHeight
));
nxagentResizeDesktopAtStartup
=
False
;
}
...
...
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @
00c1f05e
...
...
@@ -3834,13 +3834,13 @@ void nxagentAdjustCustomMode(ScreenPtr pScreen)
RRScreenSizeNotify
(
pScreen
);
}
int
nxagentChangeScreenConfig
(
int
screen
,
int
width
,
int
height
,
int
mmWidth
,
int
mmHeight
)
int
nxagentChangeScreenConfig
(
int
screen
,
int
width
,
int
height
)
{
ScreenPtr
pScreen
;
int
r
;
#ifdef DEBUG
fprintf
(
stderr
,
"nxagentChangeScreenConfig: called for screen [%d], width [%d] height [%d]
mmWidth [%d] mmHeight [%d]
\n
"
,
screen
,
width
,
height
,
mmWidth
,
mmH
eight
);
fprintf
(
stderr
,
"nxagentChangeScreenConfig: called for screen [%d], width [%d] height [%d]
\n
"
,
screen
,
width
,
h
eight
);
#endif
#ifdef TEST
...
...
@@ -3885,10 +3885,10 @@ int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, in
pScreen
=
screenInfo
.
screens
[
screen
]
->
root
->
drawable
.
pScreen
;
#ifdef TEST
fprintf
(
stderr
,
"nxagentChangeScreenConfig: Changing config to %d x %d
(%dmm x %dmm).
\n
"
,
width
,
height
,
mmWidth
,
mmH
eight
);
fprintf
(
stderr
,
"nxagentChangeScreenConfig: Changing config to %d x %d
\n
"
,
width
,
h
eight
);
#endif
r
=
nxagentResizeScreen
(
pScreen
,
width
,
height
,
mmWidth
,
mmHeight
);
r
=
nxagentResizeScreen
(
pScreen
,
width
,
height
,
0
,
0
);
if
(
r
!=
0
)
{
...
...
nx-X11/programs/Xserver/hw/nxagent/Screen.h
View file @
00c1f05e
...
...
@@ -110,7 +110,7 @@ Bool nxagentMagicPixelZone(int x, int y);
Bool
nxagentResizeScreen
(
ScreenPtr
pScreen
,
int
width
,
int
height
,
int
mmWidth
,
int
mmHeight
);
int
nxagentChangeScreenConfig
(
int
screen
,
int
width
,
int
height
,
int
mmWidth
,
int
mmHeight
);
int
nxagentChangeScreenConfig
(
int
screen
,
int
width
,
int
height
);
int
nxagentAdjustRandRXinerama
(
ScreenPtr
pScreen
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @
00c1f05e
...
...
@@ -952,7 +952,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
if
(
nxagentOption
(
Shadow
)
==
0
)
{
nxagentChangeScreenConfig
(
0
,
WidthOfScreen
(
DefaultScreenOfDisplay
(
nxagentDisplay
)),
HeightOfScreen
(
DefaultScreenOfDisplay
(
nxagentDisplay
))
,
0
,
0
);
HeightOfScreen
(
DefaultScreenOfDisplay
(
nxagentDisplay
)));
}
else
{
...
...
@@ -1006,7 +1006,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
if
(
nxagentOption
(
Shadow
)
==
0
)
{
nxagentChangeScreenConfig
(
0
,
nxagentOption
(
RootWidth
),
nxagentOption
(
RootHeight
)
,
0
,
0
);
nxagentOption
(
RootHeight
));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment