1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
Description: XWatch patches up to version 2.11-15
Author: Peter S Galbraith <[email protected]>
--- a/src/addline.c
b/src/addline.c
@@ -55,10 55,33 @@
if (strstr (buf, gagstring [i]))
return;
if (!watch_browser) {
fprintf(stderr, "%s\n", buf);
return;
}
/* determine width to use */
fl_get_browser_dimension (watch_browser, &curx, &cury,
&curwidth, &curheight);
- curwidth -= 5;
/*
Debian Bug#43157: xwatch: horizontal scrollbar not needed (Patch included)
Date: Wed, 18 Aug 1999 11:54:00 0200
From: Roland Rosenfeld <[email protected]>
Package: xwatch
Version: 2.11-1
xwatch linked with the actual version of xforms has some problems with
long lines: Sometimes the line wrapping seems not to work correct,
which has the effect that a horizontal scrollbar is displayed (for
scrolling less than 10 pixel right or left). The disadvantage of this
scroll bar is, that it reduces the height of the xwatch window by
ca. two lines (which makes my 5 line window to a 3 line window).
To avoid this effect, subtract 10 to curwidth instead of 5:
*/
/* curwidth -= 5; */
curwidth -= 10;
/* reset outbuffer */
outbuf [0] = '\0';
--- a/src/xwatch.c
b/src/xwatch.c
@@ -48,7 48,7 @@
{
"XWatch V" VER "\n",
"Copyright (C) 1995, 1996 Karel Kubat <[email protected]>.\n",
- "See /usr/doc/xwatch/README.debian\n",
"See \"man xwatch\" and also /usr/share/doc/xwatch/README.Debian\n",
},
titlebuffer [128], /* window title */
gagbuffer [1024], /* things to gag */
--- a/src/colorname2rgb.c
b/src/colorname2rgb.c
@@ -27,9 27,7 @@
/* <<< End of information >>> */
#include "xwatch.h"
-#ifndef RGB_FILE
-#define RGB_FILE "/usr/lib/X11/rgb.txt"
-#endif
#define RGB_FILE "/usr/share/xwatch/rgb.txt"
int colorname2rgb (char *name, int *r, int *g, int *b)
{
@@ -47,6 45,14 @@
if (! name || ! *name) /* need a real name arg */
return (0);
if (sscanf (name, "#xxx", &red, &green, &blue) == 3)
{
*r = red;
*g = green;
*b = blue;
return (1);
}
if (! (fp = fopen(RGB_FILE, "r")) ) /* open database file */
{
warning ("Cannot read RGB database %s", RGB_FILE);
--- a/src/ui.c
b/src/ui.c
@@ -27,7 27,7 @@
/* <<< End of information >>> */
/* Form definition file generated with fdesign. */
-#include <X11/forms.h>
#include <forms.h>
#include <stdlib.h>
#include "ui.h"
--- a/src/xwatch.h
b/src/xwatch.h
@@ -30,7 30,7 @@
#include <ctype.h>
#include <errno.h>
-#include <X11/forms.h>
#include <forms.h>
#include <malloc.h>
#include <signal.h>
#include <stdarg.h>
@@ -38,6 38,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <time.h>
#include <sys/time.h>
#include "ui.h"
--- a/doc/xwatch.yo
b/doc/xwatch.yo
@@ -298,7 298,7 @@
Mark Overmars) and distribute the resulting binary, under the
restrictions in clause 3 of the GPL, even though the resulting binary is
not, as a whole, covered by the GPL. (You still need a separate license
- to do so from the owner(s) of the copyright for XForms, however). If a
to do so from the owner (s) of the copyright for XForms, however). If a
derivative no longer requires XForms, you may use the unsupplemented GPL
as its license by deleting this paragraph and therefore removing this
exemption for XForms.
|
