137 lines
3.9 KiB
Diff
137 lines
3.9 KiB
Diff
--- xrn/xrn.c 2022-02-22 08:49:49.002330796 -0400
|
|
+++ xrn-ttf/xrn.c 2022-02-22 08:49:08.976332361 -0400
|
|
@@ -8,18 +8,18 @@
|
|
* that the above copyright notice appear in all copies and that both that
|
|
* copyright notice and this permission notice appear in supporting
|
|
* documentation, and that the name of the University of California not
|
|
- * be used in advertising or publicity pertaining to distribution of
|
|
+ * be used in advertising or publicity pertaining to distribution of
|
|
* the software without specific, written prior permission. The University
|
|
* of California makes no representations about the suitability of this
|
|
* software for any purpose. It is provided "as is" without express or
|
|
* implied warranty.
|
|
*
|
|
- * THE UNIVERSITY OF CALIFORNIA DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
|
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
+ * THE UNIVERSITY OF CALIFORNIA DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
|
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
* FITNESS, IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE FOR
|
|
* ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
|
|
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
|
|
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
@@ -33,6 +33,7 @@
|
|
#include "utils.h"
|
|
#include <X11/Xos.h>
|
|
#include <X11/Intrinsic.h> /* so we have Widget */
|
|
+#include <X11/Xaw3dxft/Xaw3dXft.h>
|
|
#ifdef MOTIF
|
|
# include <Xm/Xm.h>
|
|
#endif
|
|
@@ -74,27 +75,47 @@
|
|
int argc;
|
|
char **argv;
|
|
{
|
|
- Widget frame;
|
|
|
|
- int sv[2];
|
|
+Xaw3dXftData *xaw3dxft_data=NULL;
|
|
+Xaw3dXftProc *xaw3dxft_proc=NULL;
|
|
|
|
- pipe (sv);
|
|
- inchannel = sv[0];
|
|
- outchannel = sv[1];
|
|
+GET_XAW3DXFT_DATA(xaw3dxft_data);
|
|
|
|
- XRNState = 0;
|
|
+if(xaw3dxft_data)
|
|
+ {
|
|
+ xaw3dxft_data->border_hack=1;
|
|
+ xaw3dxft_data->text_fg_alternate_color=0;
|
|
+ xaw3dxft_data->encoding=-1;
|
|
+ xaw3dxft_data->menu_spacing=1;
|
|
+ xaw3dxft_data->string_use_pixmap=0;
|
|
+ xaw3dxft_data->button_dashed=0;
|
|
+ xaw3dxft_data->show_tips=1;
|
|
+ }
|
|
+else
|
|
+ return(1);
|
|
+
|
|
+
|
|
+Widget frame;
|
|
+
|
|
+int sv[2];
|
|
+
|
|
+pipe (sv);
|
|
+inchannel = sv[0];
|
|
+outchannel = sv[1];
|
|
+
|
|
+XRNState = 0;
|
|
|
|
#ifdef XFILESEARCHPATH
|
|
- AddPathToSearchPath(XFILESEARCHPATH);
|
|
+AddPathToSearchPath(XFILESEARCHPATH);
|
|
#endif
|
|
-
|
|
- TopLevel = Initialize(argc, argv);
|
|
|
|
- if (app_resources.cacheFilesMaxFiles < 10)
|
|
+TopLevel = Initialize(argc, argv);
|
|
+
|
|
+if (app_resources.cacheFilesMaxFiles < 10)
|
|
app_resources.cacheFilesMaxFiles = 10;
|
|
if (app_resources.cacheFilesMaxSize < 0)
|
|
app_resources.cacheFilesMaxSize = 1;
|
|
-
|
|
+
|
|
ehInstallSignalHandlers();
|
|
ehInstallErrorHandlers();
|
|
|
|
@@ -105,14 +126,14 @@
|
|
if (app_resources.geometry != NIL(char)) {
|
|
GetMainFrameSize(TopLevel, (app_resources.geometry));
|
|
}
|
|
-
|
|
+
|
|
/* create the pane and its widgets */
|
|
|
|
frame = CreateMainFrame(TopLevel);
|
|
|
|
TopInfoLine = InfoLineCreate("info", "", frame);
|
|
BottomInfoLine = 0;
|
|
-
|
|
+
|
|
createButtons();
|
|
|
|
/* create the icon */
|
|
@@ -124,7 +145,7 @@
|
|
Be sure that initializeNews() and determineMode() get called after
|
|
the main window is already realized. -- jik 11/13/94
|
|
*/
|
|
-
|
|
+
|
|
XtRealizeWidget(TopLevel);
|
|
XRNState |= XRN_X_UP;
|
|
xthWaitForMapped(TopLevel, False);
|
|
@@ -150,7 +171,7 @@
|
|
}
|
|
|
|
XtAppAddInput(TopContext,
|
|
- inchannel, (XtPointer) XtInputReadMask, processMessage, (XtPointer) 0);
|
|
+ inchannel, (XtPointer) XtInputReadMask, processMessage, (XtPointer) 0);
|
|
|
|
#if XtSpecificationRelease < 6
|
|
MyMainLoop(TopContext);
|
|
@@ -158,7 +179,7 @@
|
|
XtAppMainLoop(TopContext);
|
|
#endif
|
|
exit(0);
|
|
-}
|
|
+}
|
|
|
|
#ifdef XFILESEARCHPATH
|
|
static void AddPathToSearchPath(path)
|