13e11da026
* make sure the pixmap is found even if xteddy is launched via an absolute path
42 lines
1.3 KiB
Text
42 lines
1.3 KiB
Text
$NetBSD: patch-ac,v 1.1 2006/09/10 13:39:40 schwarz Exp $
|
|
|
|
--- xteddy.c.orig 1998-04-23 09:58:17.000000000 +0200
|
|
+++ xteddy.c 2006-09-10 15:22:31.000000000 +0200
|
|
@@ -69,7 +69,8 @@
|
|
/* Initializing filenames */
|
|
{
|
|
#define FBUFLEN 200
|
|
- int buflen, w, h, xhotret, yhotret;
|
|
+ int buflen, xhotret, yhotret;
|
|
+ unsigned int w, h;
|
|
char fbuf[FBUFLEN];
|
|
|
|
if ( !xteddy->teddy || !(strlen(xteddy->teddy)) ) return -1;
|
|
@@ -130,8 +131,8 @@
|
|
XSetWindowAttributes setwinattr;
|
|
XGCValues gcvalues;
|
|
unsigned long valuemask, gcvaluemask, inputmask;
|
|
- int x, y, geomflags, xw, xh;
|
|
- unsigned int border_width = 0;
|
|
+ int x, y, geomflags;
|
|
+ unsigned int xw, xh, border_width = 0;
|
|
unsigned int display_width, display_height, display_depth;
|
|
Pixmap icon_pixmap, background_pixmap, shape_pixmap;
|
|
XSizeHints size_hints;
|
|
@@ -168,14 +169,14 @@
|
|
int offs_x, offs_y, new_x, new_y, tmp_x, tmp_y;
|
|
unsigned int tmp_mask;
|
|
|
|
- teddy.teddy = argv[0];
|
|
-
|
|
/* Determine program name */
|
|
if ((progname = strrchr(argv[0],'/')) == NULL)
|
|
progname = argv[0];
|
|
else
|
|
progname++;
|
|
|
|
+ teddy.teddy = progname;
|
|
+
|
|
/* Option handling: "-wm", "-float", "-noquit", "-mono", "-geometry" */
|
|
/* and "-display" are recognized. See manual page for details. */
|
|
/* -F<name> ... Other pixmap name */
|