56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
|
--- a/nxagent/programs/Xserver/hw/nxagent/Screen.c
|
||
|
|
+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.c
|
||
|
|
@@ -1539,7 +1539,20 @@
|
||
|
|
#ifdef TEST
|
||
|
|
fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n",
|
||
|
|
nxagentDefaultWindows[pScreen->myNum]);
|
||
|
|
+
|
||
|
|
+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n",
|
||
|
|
+ nxagentDefaultWindows[pScreen->myNum]);
|
||
|
|
#endif
|
||
|
|
+
|
||
|
|
+ XClassHint hint;
|
||
|
|
+ hint.res_name=malloc(strlen(HINT)+1);
|
||
|
|
+ hint.res_class=malloc(strlen(HINT)+1);
|
||
|
|
+ strcpy(hint.res_name,HINT);
|
||
|
|
+ strcpy(hint.res_class,HINT);
|
||
|
|
+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint);
|
||
|
|
+ free(hint.res_name);
|
||
|
|
+ free(hint.res_class);
|
||
|
|
+
|
||
|
|
|
||
|
|
if (nxagentOption(Fullscreen))
|
||
|
|
{
|
||
|
|
--- a/nxagent/programs/Xserver/hw/nxagent/Screen.h
|
||
|
|
+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.h
|
||
|
|
@@ -36,6 +36,8 @@
|
||
|
|
#define MIN_NXAGENT_HEIGHT 60
|
||
|
|
#define NXAGENT_FRAME_WIDTH 2000
|
||
|
|
|
||
|
|
+#define HINT "NXAgent"
|
||
|
|
+
|
||
|
|
#define nxagentSetPrintGeometry(screen) \
|
||
|
|
nxagentPrintGeometryFlags = (1 << (screen));
|
||
|
|
|
||
|
|
--- a/nxagent/programs/Xserver/hw/nxagent/Display.c
|
||
|
|
+++ b/nxagent/programs/Xserver/hw/nxagent/Display.c
|
||
|
|
@@ -1861,7 +1861,7 @@
|
||
|
|
strncpy(default_path, "", 255);
|
||
|
|
|
||
|
|
strcat(icon_filename, NXAGENT_ICON_NAME);
|
||
|
|
- strcat(default_path,"/usr/NX/share/images/");
|
||
|
|
+ strcat(default_path,"/usr/share/pixmaps/");
|
||
|
|
strcat(default_path,icon_filename);
|
||
|
|
|
||
|
|
if ((icon_fp = fopen(default_path, "r")) == NULL)
|
||
|
|
--- a/nxagent/programs/Xserver/hw/nxagent/Splash.c
|
||
|
|
+++ b/nxagent/programs/Xserver/hw/nxagent/Splash.c
|
||
|
|
@@ -204,6 +204,7 @@
|
||
|
|
|
||
|
|
nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth);
|
||
|
|
|
||
|
|
+ return;
|
||
|
|
if (!nxagentPixmapLogo)
|
||
|
|
{
|
||
|
|
return;
|