From 40997f84c915415b24655698c21f480e7ff56a4b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 29 Jan 2020 23:12:33 +0100 Subject: Makefiles: drop support for NXwin We have never built nxwin within this tree. And we never shipped it. So drop the according logic. We have also removed CYGWIN stuff in the past so nxwin probably would not compile/work anyway... --- nx-X11/config/cf/host.def | 10 --- nx-X11/programs/Xserver/Imakefile | 148 +------------------------------------- 2 files changed, 1 insertion(+), 157 deletions(-) diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index f9a990ede..3638e0528 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -95,16 +95,6 @@ #define BuildRenderLibrary YES #endif -/* - * Define this symbol to build the NX enhanced MS Windows - * X server for Cygnus environment. - * -#define NXWinServer YES - */ -#if defined(cygwinArchitecture) -#define NXWinServer NO -#endif - /* * Set the default server (ie the one that gets the sym-link to "X") * diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index bce802ec4..390ad538b 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -184,13 +184,6 @@ XCOMM #if defined(NXAgentServer) && NXAgentServer NXAGENT = nxagent #endif -#if defined(NXWinServer) && NXWinServer -NXWIN = NXWin -#endif -#if (defined(NXAgentServer) && NXAgentServer) || \ - (defined(NXWinServer) && NXWinServer) -MakeMutex($(NXAGENT) $(NXWIN)) -#endif MakeMutex($(STDDIRS) fb) #endif @@ -413,151 +406,12 @@ nxagent_static_nolibs: nxagent $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_INSTALL_LOAD_FLAGS) #endif /* NXAgentServer */ -#if defined(NXWinServer) && NXWinServer -XCOMM -XCOMM X Server for MS Windows -XCOMM -FBSUBDIR = fb -MIDAMAGEDIR = miext/damage -SHADOWDIR = miext/shadow -#if BuildXWinLayer -LAYERDIR = miext/layer -XWINLAYERLIB = $(LAYER) -#else -LAYERDIR = -XWINLAYERLIB = -#endif -#if BuildXWinMultiWindowExtWM -ROOTLESSDIR = miext/rootless -ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \ - $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \ - $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel) -#else -ROOTLESSDIR = -ROOTLESSLIB = -#endif -NXWINDDXDIR = hw/nxwin -#if BuildXWinXF86Config -XWINPARSERDIR = hw/xfree86/parser -XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) -#else -XWINPARSERDIR = -XWINPARSERLIB = -#endif -XWINOPENGLLIB = - -NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin) -NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ - $(DEPDIRS) $(XWINPARSERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) -NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NXWin.res -NXWINLIBS = PreFbLibs $(NXWINLIB) FbPostFbLibs $(NXWINLIB) $(XWINLAYERLIB) \ - $(SHADOW) $(XWINPARSERLIB) $(ROOTLESSLIB) $(OS) -#if BuildXWinMultiWindow || BuildXWinClipboard -XWINX11 = $(XONLYLIB) -# if defined(Win32Architecture) -PTHREADLIB = -lpthreadGC -# endif -#endif -#if defined(Win32Architecture) -XWINW32 = -lgdi32 -lwsock32 $(PTHREADLIB) -#else -XWINW32 = -lgdi32 -#endif -NXWINSYSLIBS = $(LDPRELIBS) $(XWINX11) $(SYSLIBS) $(XWINW32) - -NXWINNXLIBS = -L../../../nxcomp -lXcomp - -/* - * These flags cause NXWin.exe to be a Windows executable, which - * prevents NXWin.exe from opening a Command Prompt window when it is - * started. However, the flags also prevent NXWin.exe from outputting - * its status and error message to a Command Prompt; thus, one most - * implement a method to redirect status and error messages to a file - * before enabling these flags. - */ -EXTRA_LDOPTIONS = -e _mainCRTStartup - -#if HasParallelMake -MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS)) -#endif - -#if ForceServerRemake -$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif - -#ifdef mingwArchitecture -NXWINSERVERNAME=NXming -#else -NXWINSERVERNAME=NXWin -#endif -ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ - $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)) - -#ifndef ServerToInstall -# define ServerToInstall $(NXWINSERVERNAME) -#endif - -#endif /* NXWinServer */ - -#if 0 -#if defined(NXWinServer) && NXWinServer -XCOMM -XCOMM X Server for MS Windows -XCOMM -FBDIR = fb -SHADOWDIR = miext/shadow -LAYERDIR = miext/layer -NXWINDDXDIR = hw/nxwin -XWINPARSERDIR = hw/xfree86/parser -XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) -NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(nxwin) -NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ - $(DEPDIRS) $(XWINPARSERDIR) -#NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NX.res \ - $(NXWINDDXDIR)/NXwindow.o \ - $(NXWINDDXDIR)/NXdispatch.o $(NXWINDDXDIR)/NXproperty.o \ - $(NXWINDDXDIR)/NXevents.o -NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NX.res -NXWINLIBS = PreFbLibs $(NXWINLIB) FbPostFbLibs $(LAYER) $(SHADOW) \ - $(XWINPARSERLIB) -NXWINSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32 -lddraw -NXWINNXLIBS = -L../../../nxcomp -lXcomp - -/* - * These flags cause NXWin.exe to be a Windows executable, which - * prevents NXWin.exe from opening a Command Prompt window when it is - * started. However, the flags also prevent NXWin.exe from outputting - * its status and error message to a Command Prompt; thus, one most - * implement a method to redirect status and error messages to a file - * before enabling these flags. - */ -EXTRA_LDOPTIONS = -mwindows -e _mainCRTStartup - -#if HasParallelMake -MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS)) -#endif - -#if ForceServerRemake -$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif - -ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \ - $(NXWINLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(NXWINSYSLIBS) $(NXWINNXLIBS)) - -#ifndef ServerToInstall -#define ServerToInstall NXWin -#endif - -#endif /* NXWinServer */ -#endif MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \ $(HPDDXDIR) $(XFREE86DDXDIR) \ - $(NXAGENTDDXDIR) $(NXWINDDXDIR) + $(NXAGENTDDXDIR) SUBDIRS = $(STDDIRS) \ $(IPLANDIRS) $(ILBMDIR) \ $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) -- cgit v1.2.3 From acab90be7326c23acdfde0b2549ee8afc66ea8c8 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 30 Jan 2020 01:34:53 +0100 Subject: Drop patch that is for nxwin only --- .../fix-icon-and-clipboard.patch | 566 --------------------- 1 file changed, 566 deletions(-) delete mode 100644 debian/patches-pending-evaluation/fix-icon-and-clipboard.patch diff --git a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch deleted file mode 100644 index d6ecf8f19..000000000 --- a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch +++ /dev/null @@ -1,566 +0,0 @@ -From: Boris Savelev -Date: Fri, 11 Jul 2008 13:50:46 +0000 (+0400) -Subject: fix icons and clipboard (thanks to dimbor) -X-Git-Tag: 3.3.0-alt2~24 -X-Git-Url: http://git.etersoft.ru?p=rx%2Fnx.git;a=commitdiff_plain;h=c51ec5f4afcbf6199da5343f52241f6ef8edbbfb - -fix icons and clipboard (thanks to dimbor) ---- - -diff --git a/nxwin/programs/Xserver/hw/nxwin/wincutpaste.c b/nxwin/programs/Xserver/hw/nxwin/wincutpaste.c -index 862f75a..5405568 100644 ---- a/nxwin/programs/Xserver/hw/nxwin/wincutpaste.c -+++ b/nxwin/programs/Xserver/hw/nxwin/wincutpaste.c -@@ -78,6 +78,8 @@ - - #define MIN(a,b) ((a) < (b) ? (a) : (b)) - -+/*#define NXWIN_CLIPBOARD_DEBUG*/ -+ - extern WindowPtr *WindowTable; - extern Selection *CurrentSelections; - extern int NumCurrentSelections; -@@ -96,6 +98,8 @@ Atom clientTARGETS; - Atom clientTEXT; - Atom clientCutProperty; - Atom clientCLIPBOARD; -+Atom UTF8_STRING; -+Atom COMPOUND_TEXT; - - Bool windowsOwner = FALSE; - Bool clientOwner = FALSE; -@@ -119,7 +123,7 @@ void nxwinClearSelection(void) - return; - - #ifdef NXWIN_CLIPBOARD_DEBUG -- ErrorF("ClearSelection\n"); -+ ErrorF("%d nxwinClearSelection: ClearSelection\n",GetTickCount()); - #endif - - for (i = 0; i < MIN(MaxSelections, NumCurrentSelections); i++) -@@ -155,8 +159,16 @@ void nxwinInitSelection(HWND hwnd) - clientTEXT = MakeAtom("TEXT", strlen("TEXT"), TRUE); - clientCutProperty = MakeAtom("NX_CUT_BUFFER_CLIENT", strlen("NX_CUT_BUFFER_CLIENT"), TRUE); - clientCLIPBOARD = MakeAtom("CLIPBOARD", strlen("CLIPBOARD"), TRUE); -+/* */ -+ UTF8_STRING = MakeAtom("UTF8_STRING", strlen("UTF8_STRING"), TRUE); -+ COMPOUND_TEXT = MakeAtom("COMPOUND_TEXT", strlen("COMPOUND_TEXT"), TRUE); -+/* */ - nxwinClipboardStatus = TRUE; - windowsOwner = TRUE; -+#ifdef NXWIN_CLIPBOARD_DEBUG -+/* ErrorF("%d nxwinInitSelection\n",GetTickCount()); -+*/ -+#endif - /* nxwinSetWindowClipboard(" ");*/ - } - -@@ -165,15 +177,17 @@ void nxwinSetSelectionOwner(Selection *pSelection) - if (!nxwinClipboardStatus) - return; - --#ifdef NXWIN_CLIPBOARD_DEBUG -- ErrorF("SetSelectionOwner\n"); --#endif - - lastOwnerWindowPtr = pSelection->pWin; - lastOwnerWindow = pSelection->window; - lastOwnerClientPtr = pSelection->client; - - nxwinSelection = TRUE; -+ -+#ifdef NXWIN_CLIPBOARD_DEBUG -+/* ErrorF("%d nxwinSetSelectionOwner: window [%p], pWin [%p]\n",GetTickCount(),pSelection->window,pSelection->pWin); -+*/ -+#endif - /* - if (pSelection->selection == XA_PRIMARY) - { -@@ -194,21 +208,67 @@ void nxwinSetSelectionOwner(Selection *pSelection) - NoEventMask, NoEventMask , - NullGrab); - #ifdef NXWIN_CLIPBOARD_DEBUG -- ErrorF("SetSelectionOwner XA_PRIMARY \n"); -+ ErrorF(" nxwinSetSelectionOwner: SetSelectionOwner XA_PRIMARY \n"); - #endif - - windowsOwner = FALSE; - } - */ -+ -+} -+ -+/* ------------------ My ------------------------------------------- */ -+char * unicode_to_some_cp(wchar_t *unicode_string, int CP) -+{ -+ int err; -+ char * res; -+ int res_len = WideCharToMultiByte( -+ CP, // Code page -+ 0, // Default replacement of illegal chars -+ unicode_string, // Multibyte characters string -+ -1, // Number of unicode chars is not known -+ NULL, // No buffer yet, allocate it later -+ 0, // No buffer -+ NULL, // Use system default -+ NULL // We are not interested whether the default char was used -+ ); -+ if (res_len == 0) -+ { -+ return NULL; -+ } -+ res = malloc(res_len); -+ if (res == NULL) -+ { -+ return NULL; -+ } -+ err = WideCharToMultiByte( -+ CP, // Code page -+ 0, // Default replacement of illegal chars -+ unicode_string, // Multibyte characters string -+ -1, // Number of unicode chars is not known -+ res, // Output buffer -+ res_len, // buffer size -+ NULL, // Use system default -+ NULL // We are not interested whether the default char was used -+ ); -+ if (err == 0) -+ { -+ free(res); -+ return NULL; -+ } -+ return res; - } - -+ -+/* ------------------ My ------------------------------------------- */ -+ - Bool nxwinConvertSelection(ClientPtr client ,WindowPtr pWin, Atom selection, Window requestor, Atom property, Atom target, Time time) - { - if (!nxwinClipboardStatus) - return 0; - - #ifdef NXWIN_CLIPBOARD_DEBUG -- ErrorF("ConvertSelection\n"); -+ ErrorF("%d nxwinConvertSelection: pWin [%p], selection [%s], target [%s]\n",GetTickCount(),pWin,NameForAtom(selection),NameForAtom(target)); - #endif - - if (!windowsOwner) /* there is a X client owner, let normal stuff happens */ -@@ -236,20 +296,25 @@ Bool nxwinConvertSelection(ClientPtr client ,WindowPtr pWin, Atom selection, Win - return 1; - } - --#ifdef NXWIN_CLIPBOARD_DEBUG -- ErrorF("ConvertSelection converting...\n"); --#endif - -- if ((target == clientTEXT) || (target == XA_STRING)) -+ if ((target == clientTEXT) || (target == XA_STRING) || (target == UTF8_STRING)) - { - HGLOBAL hGlobal; - char *pszGlobalData; - xEvent x; - -+ char *pszData=NULL; -+ - /* Access the clipboard */ - if (!OpenClipboard (lastHwnd)) return 0; -- -- hGlobal = GetClipboardData (CF_TEXT); -+ if (target == UTF8_STRING) -+ { -+ hGlobal = GetClipboardData (CF_UNICODETEXT); -+ } -+ else -+ { -+ hGlobal = GetClipboardData (CF_TEXT); -+ } - if (!hGlobal) - { - CloseClipboard(); -@@ -264,10 +329,29 @@ Bool nxwinConvertSelection(ClientPtr client ,WindowPtr pWin, Atom selection, Win - return 1; - } - pszGlobalData = (char *) GlobalLock (hGlobal); -- -- /* Convert DOS string to UNIX string */ -- DOStoUNIX (pszGlobalData, strlen (pszGlobalData)); -- -+ -+ if (target == UTF8_STRING) -+ { -+ /* Convert DOS string to UNIX string */ -+ DOStoUNIX (pszGlobalData, strlen (pszGlobalData)); -+ pszData = unicode_to_some_cp((wchar_t *) pszGlobalData,CP_UTF8); -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF(" Set sel [%s], target [%s], prop [%s] to UTF-8 string [%s]\n",NameForAtom(selection),NameForAtom(target),NameForAtom(property),pszData); -+#endif -+ /* Copy the clipboard text to the requesting window */ -+ ChangeWindowProperty(pWin, -+ property, -+ target, -+ 8, -+ PropModeReplace, -+ strlen(pszData), -+ pszData, 1); -+ } -+ else -+ { -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF(" Set sel [%s], target [%s], prop [%s] to CP-1251 string [%s]\n",NameForAtom(selection),NameForAtom(target),NameForAtom(property),pszGlobalData); -+#endif - /* Copy the clipboard text to the requesting window */ - ChangeWindowProperty(pWin, - property, -@@ -276,12 +360,16 @@ Bool nxwinConvertSelection(ClientPtr client ,WindowPtr pWin, Atom selection, Win - PropModeReplace, - strlen(pszGlobalData), - pszGlobalData, 1); -+ } - - /* Release the clipboard data */ - GlobalUnlock (hGlobal); - pszGlobalData = NULL; - CloseClipboard (); - -+ if (pszData != NULL) -+ free (pszData); -+ - x.u.u.type = SelectionNotify; - x.u.selectionNotify.time = time; - x.u.selectionNotify.requestor = requestor; -@@ -370,6 +458,7 @@ UNIXtoDOS (char **ppszData, int iLength) - } - - -+ - void - DOStoUNIX (char *pszSrc, int iLength) - { -@@ -401,8 +490,11 @@ void nxwinSetWindowClipboard(char *text, int iLength) - char *pszGlobalData; - char *pszTemp; - -+ - if (!nxwinClipboardStatus) -+ { - return; -+ } - - if (OpenClipboard(lastHwnd)) - { -@@ -440,6 +532,9 @@ void nxwinSetWindowClipboard(char *text, int iLength) - /* free the allocated memory */ - xfree(pszTemp); - -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF("%d nxwinSetWindowClipboard: [%s].\n",GetTickCount(),pszGlobalData); -+#endif - /* Release the pointer to the global memory */ - GlobalUnlock (hGlobal); - pszGlobalData = NULL; -@@ -466,10 +561,14 @@ Bool nxwinSendNotify(xEvent* x) - int iReturn; - - #ifdef NXWIN_CLIPBOARD_DEBUG -- ErrorF("SendNotify\n"); -+ ErrorF("%d nxwinSendNotify: pwin [%p];",GetTickCount(),lastOwnerWindowPtr); -+ ErrorF(" x->u.u.type [%s]; x->u.selectionNotify: property [%s]; target [%s]; selection [%s]",NameForAtom(x->u.u.type),NameForAtom(x->u.selectionNotify.property),NameForAtom(x->u.selectionNotify.target),NameForAtom(x->u.selectionNotify.selection)); - #endif - if (x->u.selectionNotify.property == clientCutProperty) - { -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF("\n"); -+#endif - Atom atomReturnType; - int iReturnFormat; - unsigned long ulReturnItems; -@@ -479,13 +578,26 @@ Bool nxwinSendNotify(xEvent* x) - AnyPropertyType, &atomReturnType, &iReturnFormat, - &ulReturnItems, &ulReturnBytesLeft, &pszReturnData); - -+/* -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF("nxwinSendNotify: called 1-st GetWindowProperty - status = %d, ulReturnBytesLeft = %d\n",Success,ulReturnBytesLeft); -+#endif -+*/ - if ((iReturn == Success) && (ulReturnBytesLeft > 0)) - { - iReturn = GetWindowProperty(lastOwnerWindowPtr,clientCutProperty,0,ulReturnBytesLeft, FALSE, - AnyPropertyType, &atomReturnType, &iReturnFormat, - &ulReturnItems, &ulReturnBytesLeft, &pszReturnData); -+/* -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF("nxwinSendNotify: called 2-nd GetWindowProperty - status=%d, ulReturnItems=%d\n",Success,ulReturnItems); -+#endif -+*/ - if ((iReturn == Success) && (ulReturnItems > 0)) - { -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF(" AtomReturnType [%s]\n",NameForAtom(atomReturnType)); -+#endif - nxwinSetWindowClipboard(pszReturnData, ulReturnItems); - - clientOwner = TRUE; -@@ -495,6 +607,9 @@ Bool nxwinSendNotify(xEvent* x) - } - } - } -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ else ErrorF(" !! MISSED !!\n"); -+#endif - return FALSE; - } - -@@ -512,19 +627,27 @@ void nxwinLostFocus(void) - if (lastOwnerWindowPtr) - { - xEvent x; -+#ifdef NXWIN_CLIPBOARD_DEBUG -+ ErrorF("%d nxwinLostFocus: lastOwnerWindow [%p]; pWin [%p]; target [%s]; prop [%s]\n",GetTickCount(),lastOwnerWindow,lastOwnerWindowPtr,NameForAtom(XA_STRING),NameForAtom(clientCutProperty)); -+#endif - - x.u.u.type = SelectionRequest; - x.u.selectionRequest.time = GetTimeInMillis(); - x.u.selectionRequest.owner = lastOwnerWindow; - x.u.selectionRequest.requestor = screenInfo.screens[0]->root->drawable.id; -- x.u.selectionRequest.selection = XA_PRIMARY; -+/* My changes */ -+/* -+ x.u.selectionRequest.selection = XA_PRIMARY; -+*/ -+ x.u.selectionRequest.selection = clientCLIPBOARD; -+/* My changes */ - x.u.selectionRequest.target = XA_STRING; - x.u.selectionRequest.property = clientCutProperty; -- - (void) TryClientEvents (lastOwnerClientPtr, &x, 1, - NoEventMask, NoEventMask /* CantBeFiltered */, - NullGrab); - SetCriticalOutputPending(); -+ - } - } - -diff --git a/nxwin/programs/Xserver/hw/nxwin/winmultiwindowwm.c b/nxwin/programs/Xserver/hw/nxwin/winmultiwindowwm.c -index e8149c7..a09d227 100644 ---- a/nxwin/programs/Xserver/hw/nxwin/winmultiwindowwm.c -+++ b/nxwin/programs/Xserver/hw/nxwin/winmultiwindowwm.c -@@ -408,7 +408,9 @@ privateGetWindowName(void *pWin, char **ppName, Atom atom) - if( (retValue = GetWindowProperty(pWin, atom, 0L, 0L, False, - AnyPropertyType, &retType, &retFormat, - &nItems, &bytesLeft, (unsigned char**)NULL)) != Success){ -- ErrorF("GetWindowName: GetWindowProperty failed\n"); -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ ErrorF("GetWindowName: GetWindowProperty /length/ failed\n"); -+#endif - return retValue; - } - origLen = bytesLeft; -@@ -417,7 +419,9 @@ privateGetWindowName(void *pWin, char **ppName, Atom atom) - if( (retValue = GetWindowProperty(pWin, atom, 0L, bytesLeft, False, - AnyPropertyType, &retType, &retFormat, - &nItems, &bytesLeft, (unsigned char**)ppName)) != Success){ -- ErrorF("GetWindowName: GetWindowProperty failed\n"); -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ ErrorF("GetWindowName: GetWindowProperty /value/ failed\n"); -+#endif - free(strName); - return retValue; - } -@@ -448,8 +452,16 @@ GetWindowName (void *pWin, char **ppName) - - /* TRY with ATOM WM_NAME */ - reqAtom = XA_WM_NAME; -- if( privateGetWindowName(pWin, ppName, reqAtom) == Success ) -+ if( privateGetWindowName(pWin, ppName, reqAtom) == Success ) -+/* ------------------ My crooked additions ------------------------------------------- */ -+/* sometimes *ppName is present and zero length - anyway need to try second atom */ -+ { if (strlen(*ppName) > 0) -+ { - return; -+ } -+ else free(*ppName); -+ } -+/* ------------------ My crooked additions ------------------------------------------- */ - reqAtom = MakeAtom(atom_NET_WM_NAME, sizeof(atom_NET_WM_NAME) - 1, True); - privateGetWindowName(pWin, ppName, reqAtom); - } -@@ -537,6 +549,98 @@ winMultStackWindow(pWin, val) - return 1; - } - -+/* ------------------ My crooked additions ------------------------------------------- */ -+wchar_t * utf8_to_unicode(char *utf8_string) -+{ -+ int err; -+ wchar_t * res; -+ int res_len = 1000; -+ res = malloc(res_len); -+ err = MultiByteToWideChar( -+ CP_UTF8, // Code page -+ 0, // No flags -+ utf8_string, // Multibyte characters string -+ -1, // The string is NULL terminated -+ res, // Output buffer -+ res_len // buffer size -+ ); -+ if (err == 0) -+ { -+// printf("Failed to convert to unicode\n"); -+ free(res); -+ return NULL; -+ } -+ return res; -+} -+ -+void -+winSetWinName (WMMsgNodePtr pNode) -+{ -+ { -+ /*XWindowAttributes attr;*/ -+ char *pszName; -+ wchar_t *pszWName; -+#if 0 -+ XWMHints *pHints; -+#endif -+ /* Get the window attributes */ -+ /* -+ XGetWindowAttributes (pWMInfo->pDisplay, -+ pNode->msg.iWindow, -+ &attr); -+ */ -+ if (!winGetOverrideRedirectPriv(pNode->msg.pWin)) -+ { -+#ifdef NXWIN_MULTIWINDOW -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ if(nxwinMultiwindow) -+ ErrorF("winMultiWindowWMProc: LOCK before GetWindowName\n"); -+ else -+ ErrorF("winMultiWindowWMProc: before GetWindowName\n"); -+#endif -+ if(nxwinMultiwindow && pthread_mutex_lock(&nxwinMultiwindowMutex)) -+ ErrorF("winMultiWindowWMProc: pthread_mutex_lock failed\n"); -+#endif -+ /* Set the Windows window name */ -+ GetWindowName(pNode->msg.pWin, &pszName); -+#ifdef NXWIN_MULTIWINDOW -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ if(nxwinMultiwindow) -+ ErrorF("winMultiWindowWMProc: UNLOCK after GetWindowName\n"); -+ else -+ ErrorF("winMultiWindowWMProc: after GetWindowName\n"); -+#endif -+ if(nxwinMultiwindow && pthread_mutex_unlock(&nxwinMultiwindowMutex) != 0) -+ ErrorF("winMultiWindowWMProc: !!! pthread_mutex_unlock failed\n"); -+#endif -+ if(!pszName){ -+ ErrorF("winMultiWindowWMProc: GetWindowName failed\n"); -+ return; -+ } -+ -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ ErrorF("winMultiWindowWMProc!!!: Window title before converting - %s\n",pszName); -+#endif -+/* if you know, how to get system charset from server, tell me about them */ -+ pszWName = utf8_to_unicode(pszName); -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ ErrorF("winMultiWindowWMProc!!!: Window title after converting - %s\n",pszWName); -+#endif -+ SetWindowTextW (pNode->msg.hwndWindow, pszWName); -+// SetWindowText (pNode->msg.hwndWindow, pszName); -+ -+#ifdef NXWIN_MULTIWINDOW_DEBUG -+ ErrorF("winMultiWindowWMProc: Insert here LoadIcon\n"); -+#endif -+ free (pszName); -+ if (pszWName != NULL) -+ free (pszWName); -+ } -+ } -+} -+/* -----------End of my crooked additions ------------------------------------------- */ -+ -+ - static void * - winMultiWindowWMProc (void *pArg) - { -@@ -599,6 +703,10 @@ winMultiWindowWMProc (void *pArg) - /* - XRaiseWindow (pWMInfo->pDisplay, pNode->msg.iWindow); - */ -+ -+/* ------------------ My crooked additions ------------------------------------------- */ -+ winSetWinName (pNode); -+/* -----------End of my crooked additions ------------------------------------------- */ - break; - - case WM_WM_LOWER: -@@ -617,54 +725,9 @@ winMultiWindowWMProc (void *pArg) - #if CYGMULTIWINDOW_DEBUG - ErrorF ("\tWM_WM_MAP\n"); - #endif -- { -- /*XWindowAttributes attr;*/ -- char *pszName; --#if 0 -- XWMHints *pHints; --#endif -- -- /* Get the window attributes */ -- /* -- XGetWindowAttributes (pWMInfo->pDisplay, -- pNode->msg.iWindow, -- &attr); -- */ -- if (!winGetOverrideRedirectPriv(pNode->msg.pWin)) -- { --#ifdef NXWIN_MULTIWINDOW --#ifdef NXWIN_MULTIWINDOW_DEBUG -- if(nxwinMultiwindow) -- ErrorF("winMultiWindowWMProc: LOCK before GetWindowName\n"); -- else -- ErrorF("winMultiWindowWMProc: before GetWindowName\n"); --#endif -- if(nxwinMultiwindow && pthread_mutex_lock(&nxwinMultiwindowMutex)) -- ErrorF("winMultiWindowWMProc: pthread_mutex_lock failed\n"); --#endif -- /* Set the Windows window name */ -- GetWindowName(pNode->msg.pWin, &pszName); --#ifdef NXWIN_MULTIWINDOW --#ifdef NXWIN_MULTIWINDOW_DEBUG -- if(nxwinMultiwindow) -- ErrorF("winMultiWindowWMProc: UNLOCK after GetWindowName\n"); -- else -- ErrorF("winMultiWindowWMProc: after GetWindowName\n"); --#endif -- if(nxwinMultiwindow && pthread_mutex_unlock(&nxwinMultiwindowMutex) != 0) -- ErrorF("winMultiWindowWMProc: !!! pthread_mutex_unlock failed\n"); --#endif -- if(!pszName){ -- ErrorF("winMultiWindowWMProc: GetWindowName failed\n"); -- break; -- } -- SetWindowText (pNode->msg.hwndWindow, pszName); --#ifdef NXWIN_MULTIWINDOW_DEBUG -- ErrorF("winMultiWindowWMProc: Insert here LoadIcon\n"); --#endif -- free (pszName); -- } -- } -+/* ------------------ My crooked additions ------------------------------------------- */ -+ winSetWinName (pNode); -+/* -----------End of my crooked additions ------------------------------------------- */ - break; - - case WM_WM_UNMAP: -@@ -904,6 +967,9 @@ winMultiWindowWMProc (void *pArg) - if(nxwinMultiwindow && pthread_mutex_unlock(&nxwinMultiwindowMutex)) - ErrorF("!!! pthread_mutex_unlock failed\n"); - #endif -+/* ------------------ My crooked additions ------------------------------------------- */ -+ winSetWinName (pNode); -+/* -----------End of my crooked additions ------------------------------------------- */ - break; - #if 0 - case WM_WM_X_EVENT: -- cgit v1.2.3 From 1796f823363f38cfab6d0a7cc5882e0becbd8d91 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 30 Jan 2020 01:44:10 +0100 Subject: remove obsolete pending patches The changes are either applied in the current version or the affected file is no longer existing. --- .../fix-fprintf-usage.patch | 31 ----- .../patches_nx-X11-fix_format.patch | 126 --------------------- 2 files changed, 157 deletions(-) delete mode 100644 debian/patches-pending-evaluation/fix-fprintf-usage.patch delete mode 100644 debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch diff --git a/debian/patches-pending-evaluation/fix-fprintf-usage.patch b/debian/patches-pending-evaluation/fix-fprintf-usage.patch deleted file mode 100644 index 4abda6064..000000000 --- a/debian/patches-pending-evaluation/fix-fprintf-usage.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Vitaly Lipatov -Date: Wed, 3 Jun 2009 00:49:01 +0000 (+0400) -Subject: fix fprintf using -X-Git-Tag: 3.3.0-alt16.1~1^2 -X-Git-Url: http://git.etersoft.ru?p=rx%2Fnx.git;a=commitdiff_plain;h=f68888aab5c92e99f398f5fe7407edf09e2c86ce - - fix fprintf using - -+--- a/nx-X11/config/imake/imake.c -++++ b/nx-X11/config/imake/imake.c -+@@ -1015,7 +1015,7 @@ get_libc_version(FILE *inFile) -+ abort (); -+ -+ while (fgets (command, len, fp)) -+- fprintf (inFile, command); -++ fwrite (command, strlen(command), 1, inFile); -+ -+ len = pclose (fp); -+ remove (aout); -+ -+--- a/nx-X11/extras/rman/rman.c.orig 2009-06-03 04:29:39 +0400 -++++ b/nx-X11/extras/rman/rman.c 2009-06-03 05:19:07 +0400 -+@@ -1432,7 +1432,7 @@ HTML(enum command cmd) -+ break; -+ case BEGINSECTION: break; -+ case ENDSECTION: -+- if (sectheadid==NAME && message!=NULL) printf(message); -++ if (sectheadid==NAME && message!=NULL) printf("%s",message); -+ break; -+ case BEGINSUBSECTION: break; -+ case ENDSUBSECTION: break; diff --git a/debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch b/debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch deleted file mode 100644 index 201888150..000000000 --- a/debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/nx/lib/xtrans/Xtransint.h b/nx/lib/xtrans/Xtransint.h -index 88d2230..8d3d1cb 100644 ---- a/nx/lib/xtrans/Xtransint.h -+++ b/nx/lib/xtrans/Xtransint.h -@@ -443,7 +443,7 @@ static int trans_mkdir ( - int hack= 0, saveerrno=errno; \ - struct timeval tp;\ - gettimeofday(&tp,0); \ -- ErrorF(__xtransname); \ -+ ErrorF("%s", __xtransname); \ - ErrorF(x+hack,a,b,c); \ - ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ - errno=saveerrno; \ -@@ -453,7 +453,7 @@ static int trans_mkdir ( - int hack= 0, saveerrno=errno; \ - struct timeval tp;\ - gettimeofday(&tp,0); \ -- fprintf(stderr, __xtransname); fflush(stderr); \ -+ fprintf(stderr, "%s", __xtransname); fflush(stderr); \ - fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ - fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ - fflush(stderr); \ -@@ -465,14 +465,14 @@ static int trans_mkdir ( - /* Use ErrorF() for the X server */ - #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ - int hack= 0, saveerrno=errno; \ -- ErrorF(__xtransname); \ -+ ErrorF("%s", __xtransname); \ - ErrorF(x+hack,a,b,c); \ - errno=saveerrno; \ - } else ((void)0) - #else - #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ - int hack= 0, saveerrno=errno; \ -- fprintf(stderr, __xtransname); fflush(stderr); \ -+ fprintf(stderr, "%s", __xtransname); fflush(stderr); \ - fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ - errno=saveerrno; \ - } else ((void)0) -diff --git a/nx/lib/Xaw/DisplayList.c b/nx/lib/Xaw/DisplayList.c -index e43621b..5b2dfe6 100644 ---- a/nx/lib/Xaw/DisplayList.c -+++ b/nx/lib/Xaw/DisplayList.c -@@ -293,7 +293,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen, - } - if (fp) - { -- XmuSnprintf(cname, fp - fname + 1, fname); -+ XmuSnprintf(cname, fp - fname + 1, "%s", fname); - memmove(fname, fp + 1, strlen(fp)); - lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc; - if (!lc) -diff --git a/nx/programs/Xserver/os/log.c b/nx/programs/Xserver/os/log.c -index d3aef03..c8d0d5b 100644 ---- a/nx/programs/Xserver/os/log.c -+++ b/nx/programs/Xserver/os/log.c -@@ -692,9 +692,9 @@ Error(char *str) - return; - sprintf(err, "%s: ", str); - strcat(err, strerror(saveErrno)); -- LogWrite(-1, err); -+ LogWrite(-1, "%s", err); - } else -- LogWrite(-1, strerror(saveErrno)); -+ LogWrite(-1, "%s", strerror(saveErrno)); - } - - void -diff --git a/nx/programs/Xserver/GL/glx/glximports.c b/nx/programs/Xserver/GL/glx/glximports.c -index fae2346..6e1f0db 100644 ---- a/nx/programs/Xserver/GL/glx/glximports.c -+++ b/nx/programs/Xserver/GL/glx/glximports.c -@@ -110,12 +110,12 @@ void *__glXImpRealloc(__GLcontext *gc, void *addr, size_t newSize) - - void __glXImpWarning(__GLcontext *gc, char *msg) - { -- ErrorF((char *)msg); -+ ErrorF("%s", (char *)msg); - } - - void __glXImpFatal(__GLcontext *gc, char *msg) - { -- ErrorF((char *)msg); -+ ErrorF("%s", (char *)msg); - __glXAbort(); - } - -diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c -index 64b6583..0e0f9e1 100644 ---- a/nx-X11/programs/Xserver/hw/nxagent/Init.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c -@@ -454,7 +454,7 @@ void OsVendorVErrorFFunction(const char *f, va_list args) - - nxagentStartRedirectToClientsLog(); - -- fprintf(stderr, buffer); -+ fprintf(stderr, "%s", buffer); - - nxagentEndRedirectToClientsLog(); - } -diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c -index 963cfa2..2f778b7 100644 ---- a/nx-X11/programs/Xserver/hw/nxagent/Error.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c -@@ -232,7 +232,7 @@ static int nxagentPrintError(dpy, event, fp) - - int nxagentExitHandler(const char *message) - { -- FatalError(message); -+ FatalError("%s", message); - - return 0; - } -diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c -index 90fb23f..b494286 100644 ---- a/nxauth/programs/nxauth/process.c -+++ b/nxauth/programs/nxauth/process.c -@@ -974,7 +974,7 @@ fprintfhex(register FILE *fp, int len, char *cp) - char *hex; - - hex = bintohex(len, cp); -- fprintf(fp, hex); -+ fprintf(fp, "%s", hex); - free(hex); - } - -- cgit v1.2.3