| blob | 4ace88bf4831c02bd9b788613ffe77d26eb9486d |
1 --- rxvt-2.6.4.orig/src/graphics/Makefile.in
2 +++ rxvt-2.6.4/src/graphics/Makefile.in
3 @@ -1,6 +1,6 @@
4 # test/graphics/Makefile.in -*- Makefile -*-
5 # $Id: Makefile.in,v 1.3 1998/11/26 05:28:28 mason Exp $
6 -@MCOMMON@
7 +#@MCOMMON@
9 srcdir = @srcdir@
10 VPATH = @srcdir@
11 --- rxvt-2.6.4.orig/src/command.h
12 +++ rxvt-2.6.4/src/command.h
13 @@ -181,7 +181,7 @@
15 /* time factor to slow down a `jumpy' mouse */
16 #define MOUSE_THRESHOLD 50
17 -#define CONSOLE "/dev/console" /* console device */
18 +#define CONSOLE "/dev/xconsole" /* console device */
20 /*
21 * key-strings: if only these keys were standardized <sigh>
22 @@ -196,20 +196,27 @@
24 #ifdef SCROLL_ON_SHIFT
25 # define SCROLL_SHIFTKEY (shft)
26 +# define NOSCROLL_SHIFTKEY 0
27 #else
28 # define SCROLL_SHIFTKEY 0
29 +# define NOSCROLL_SHIFTKEY (shft)
30 #endif
31 #ifdef SCROLL_ON_CTRL
32 # define SCROLL_CTRLKEY (ctrl)
33 +# define NOSCROLL_CTRLKEY 0
34 #else
35 # define SCROLL_CTRLKEY 0
36 +# define NOSCROLL_CTRLKEY (ctrl)
37 #endif
38 #ifdef SCROLL_ON_META
39 # define SCROLL_METAKEY (meta)
40 +# define NOSCROLL_METAKEY 0
41 #else
42 # define SCROLL_METAKEY 0
43 +# define NOSCROLL_METAKEY (meta)
44 #endif
45 -#define IS_SCROLL_MOD (SCROLL_SHIFTKEY || SCROLL_CTRLKEY || SCROLL_METAKEY)
46 +#define IS_SCROLL_MOD ((SCROLL_SHIFTKEY || SCROLL_CTRLKEY || SCROLL_METAKEY) \
47 + && (!NOSCROLL_SHIFTKEY && !NOSCROLL_CTRLKEY && !NOSCROLL_METAKEY))
49 typedef struct XCNQueue_t {
50 struct XCNQueue_t *next;
51 --- rxvt-2.6.4.orig/src/rsizes.h
52 +++ rxvt-2.6.4/src/rsizes.h
53 @@ -0,0 +1,22 @@
54 +/*
55 + * If we haven't pulled in typedef's like int16_t , then do them ourself
56 + */
57 +
58 +/* type of (normal and unsigned) basic sizes */
59 +/* e.g. typedef short int16_t */
60 +
61 +/* e.g. typedef unsigned short u_int16_t */
62 +
63 +/* e.g. typedef int int32_t */
64 +
65 +/* e.g. typedef unsigned int u_int32_t */
66 +
67 +/* e.g. typedef long int64_t */
68 +
69 +/* e.g. typedef unsigned long u_int64_t */
70 +
71 +
72 +/* whatever normal size corresponds to a integer pointer */
73 +#define intp_t int32_t
74 +/* whatever normal size corresponds to a unsigned integer pointer */
75 +#define u_intp_t u_int32_t
76 --- rxvt-2.6.4.orig/src/xdefaults.c
77 +++ rxvt-2.6.4/src/xdefaults.c
78 @@ -215,6 +215,8 @@
79 #ifdef MULTICHAR_SET
80 STRG(Rs_multichar_encoding, "multichar_encoding", "km", "mode",
81 "multiple-character font encoding; mode = eucj | sjis | big5 | gb"),
82 + BOOL(Rs_mc_hack, "mcCursor", "mcc", Opt_mc_hack,
83 + "Multibyte character cursor movement"),
84 #endif /* MULTICHAR_SET */
85 #ifdef USE_XIM
86 STRG(Rs_preeditType, "preeditType", "pt", "style",
87 @@ -299,10 +301,10 @@
88 fprintf(stderr, "Kanji,");
89 #endif
90 #ifdef ZH
91 - fprintf(stderr, "Chinese,");
92 + fprintf(stderr, "Chinese (Big5),");
93 #endif
94 #ifdef ZHCN
95 - fprintf(stderr, "Chinese(GB),");
96 + fprintf(stderr, "Chinese (GB),");
97 #endif
98 #ifdef XTERM_SCROLLBAR
99 fprintf(stderr, "XTerm-scrollbar,");
100 @@ -760,14 +762,23 @@
102 for (entry = 0; entry < optList_size(); entry++) {
103 int s;
104 - char *p;
105 + char *p, *p0;
106 const char *kw = optList[entry].kw;
108 if (kw == NULL || *(optList[entry].dp) != NULL)
109 continue; /* previously set */
110 - if ((p = XGetDefault(display, name, kw)) != NULL
111 - || (p = XGetDefault(display, APL_SUBCLASS, kw)) != NULL
112 - || (p = XGetDefault(display, APL_CLASS, kw)) != NULL) {
113 +
114 +#define STRCMP(x, y) strcmp((const char *)(x), (const char *)(y))
115 + p = XGetDefault(display, name, kw);
116 + p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
117 + if (p == NULL || (p0 && STRCMP(p, p0) == 0)) {
118 + p = XGetDefault(display, APL_SUBCLASS, kw);
119 + if (p == NULL || (p0 && STRCMP(p, p0) == 0))
120 + p = XGetDefault(display, APL_CLASS, kw);
121 + }
122 + if (p == NULL && p0)
123 + p = p0;
124 + if (p) {
125 *optList[entry].dp = p;
127 if (optList_isBool(entry)) {
128 --- rxvt-2.6.4.orig/src/screen.c
129 +++ rxvt-2.6.4/src/screen.c
130 @@ -188,7 +188,7 @@
131 rp[row] = MALLOC(sizeof(rend_t) * TermWin.ncol);
132 }
133 if (!keepr)
134 - efs &= ~(RS_Uline);
135 + efs &= ~(RS_Uline | RS_RVid);
136 MEMSET(tp[row], ' ', width);
137 for (er = rp[row]; width--;)
138 *er++ = efs;
139 @@ -2107,6 +2107,54 @@
140 #define FONT_RBEAR(X, Y) \
141 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
143 +#ifdef MULTICHAR_SET
144 +static int
145 +draw_string16(Display *display,
146 + Drawable d,
147 + GC gc,
148 + int x,
149 + int y,
150 + XChar2b *str,
151 + int len)
152 +{
153 + while (len > 0) {
154 + XDrawString16(display, d, gc, x, y, str, 1);
155 + if (str->byte1 == '\0') {
156 + x += TermWin.fwidth;
157 + }
158 + else {
159 + x += TermWin.fwidth * 2;
160 + }
161 + str++;
162 + len--;
163 + }
164 + return 0;
165 +}
166 +
167 +static int
168 +draw_image_string16(Display *display,
169 + Drawable d,
170 + GC gc,
171 + int x,
172 + int y,
173 + XChar2b *str,
174 + int len)
175 +{
176 + while (len > 0) {
177 + XDrawImageString16(display, d, gc, x, y, str, 1);
178 + if (str->byte1 == '\0') {
179 + x += TermWin.fwidth;
180 + }
181 + else {
182 + x += TermWin.fwidth * 2;
183 + }
184 + str++;
185 + len--;
186 + }
187 + return 0;
188 +}
189 +#endif
190 +
191 /* EXTPROTO */
192 void
193 scr_refresh(int type)
194 @@ -2262,11 +2310,19 @@
195 #ifndef NO_CURSORCOLOR
196 cc1 = *srp & (RS_fgMask | RS_bgMask);
197 if (Xdepth <= 2 || !rs[Rs_color + Color_cursor])
198 +#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
199 + ccol1 = GET_FGCOLOR(rstyle);
200 +#else
201 ccol1 = Color_fg;
202 +#endif
203 else
204 ccol1 = Color_cursor;
205 if (Xdepth <= 2 || !rs[Rs_color + Color_cursor2])
206 +#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
207 + ccol2 = GET_BGCOLOR(rstyle);
208 +#else
209 ccol2 = Color_bg;
210 +#endif
211 else
212 ccol2 = Color_cursor2;
213 *srp = SET_FGCOLOR(*srp, ccol1);
214 @@ -2366,9 +2422,9 @@
215 len = 0;
216 buffer[len++] = stp[col];
217 ypixelc = Row2Pixel(row);
218 - ypixel = ypixelc + TermWin.font->ascent;
219 + ypixel = ypixelc + TermWin.fascent;
220 xpixel = Col2Pixel(col);
221 - fontdiff = 0;
222 + fontdiff = TermWin.fontdiff;
223 wlen = 1;
225 /*
226 @@ -2382,9 +2438,14 @@
227 if (!wbyte) {
228 wbyte = 1;
229 XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid);
230 - fontdiff = TermWin.mprop;
231 - draw_string = XDrawString16;
232 - draw_image_string = XDrawImageString16;
233 + fontdiff |= TermWin.mprop;
234 + if (TermWin.mprop) {
235 + draw_string = draw_string16;
236 + draw_image_string = draw_image_string16;
237 + } else {
238 + draw_string = XDrawString16;
239 + draw_image_string = XDrawImageString16;
240 + }
241 }
242 /* double stepping - we're in Kanji mode */
243 for (; ++col < TermWin.ncol;) {
244 @@ -2512,11 +2573,12 @@
245 if (!wbyte && MONO_BOLD(rend) && TermWin.boldFont != NULL) {
246 bfont = 1;
247 XSetFont(Xdisplay, TermWin.gc, TermWin.boldFont->fid);
248 - fontdiff = TermWin.bprop;
249 + fontdiff |= TermWin.bprop;
250 rend &= ~RS_Bold; /* we've taken care of it */
251 } else if (bfont) {
252 bfont = 0;
253 - XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
254 + if (!wbyte)
255 + XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
256 }
257 #endif
258 /*
259 @@ -3341,14 +3403,6 @@
261 /* ------------------------------------------------------------------------- */
262 /*
263 - * On some systems, the Atom typedef is 64 bits wide. We need to have a type
264 - * that is exactly 32 bits wide, because a format of 64 is not allowed by
265 - * the X11 protocol.
266 - */
267 -typedef CARD32 Atom32;
268 -
269 -/* ------------------------------------------------------------------------- */
270 -/*
271 * Respond to a request for our current selection
272 * EXT: SelectionRequest
273 */
274 @@ -3357,7 +3411,7 @@
275 selection_send(const XSelectionRequestEvent * rq)
276 {
277 XEvent ev;
278 - Atom32 target_list[4];
279 + Atom target_list[4];
280 Atom target;
281 static Atom xa_targets = None;
282 static Atom xa_compound_text = None;
283 @@ -3382,13 +3436,12 @@
284 ev.xselection.time = rq->time;
286 if (rq->target == xa_targets) {
287 - target_list[0] = (Atom32) xa_targets;
288 - target_list[1] = (Atom32) XA_STRING;
289 - target_list[2] = (Atom32) xa_text;
290 - target_list[3] = (Atom32) xa_compound_text;
291 + target_list[0] = xa_targets;
292 + target_list[1] = XA_STRING;
293 + target_list[2] = xa_text;
294 + target_list[3] = xa_compound_text;
295 XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
296 - (8 * sizeof(target_list[0])), PropModeReplace,
297 - (unsigned char *)target_list,
298 + 32, PropModeReplace, (unsigned char *)target_list,
299 (sizeof(target_list) / sizeof(target_list[0])));
300 ev.xselection.property = rq->property;
301 } else if (rq->target == XA_STRING
302 @@ -3503,3 +3556,26 @@
303 pos->y = Height2Pixel((screen.cur.row + 1)) + xwa.y;
304 }
305 #endif
306 +
307 +#ifdef MULTICHAR_SET
308 +/* EXTPROTO */
309 +int
310 +scr_multi1(void)
311 +{
312 + rend_t rend;
313 +
314 + rend = screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col];
315 + return ((rend & RS_multiMask)==RS_multi1);
316 +}
317 +
318 +/* EXTPROTO */
319 +int
320 +scr_multi2(void)
321 +{
322 + rend_t rend;
323 +
324 + if (screen.cur.col==0) return 0;
325 + rend = screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col-1];
326 + return ((rend & RS_multiMask)==RS_multi2);
327 +}
328 +#endif
329 --- rxvt-2.6.4.orig/src/main.c
330 +++ rxvt-2.6.4/src/main.c
331 @@ -1010,6 +1010,9 @@
333 TermWin.fwidth = fw;
334 TermWin.fheight = fh;
335 + TermWin.fascent = TermWin.font->ascent;
336 + TermWin.fdescent = TermWin.font->descent;
337 + TermWin.fontdiff = 0;
338 }
340 /* check that size of boldFont is okay */
341 @@ -1035,10 +1038,17 @@
342 int fh, fw;
344 fw = get_fontwidest(TermWin.mfont);
345 - fh = TermWin.mfont->ascent + TermWin.mfont->descent;
346 - if (fw <= TermWin.fwidth && fh <= TermWin.fheight)
347 - /* WHAT TO DO!! */ ;
348 - TermWin.mprop = !(fw == TermWin.fwidth /* && fh == TermWin.fheight */ );
349 + if (TermWin.mfont->ascent > TermWin.fascent) {
350 + TermWin.fascent = TermWin.mfont->ascent;
351 + TermWin.fontdiff = 1;
352 + }
353 + if (TermWin.mfont->descent > TermWin.fdescent) {
354 + TermWin.fdescent = TermWin.mfont->descent;
355 + TermWin.fontdiff = 1;
356 + }
357 + if (TermWin.fontdiff)
358 + TermWin.fheight = TermWin.fascent + TermWin.fdescent;
359 + TermWin.mprop = (fw != TermWin.fwidth * 2);
360 }
361 #endif
363 @@ -1348,6 +1358,16 @@
364 sprintf(env_term, "TERM=%s", rs[Rs_term_name]);
365 putenv(env_term);
366 } else {
367 + /* Debian hack: We at Debian prefer to be correct. Therefore, we
368 + use TERM=rxvt on color displays and TERM=rxvt-m (the -m stands
369 + for monochrome, see terminfo(5)) on monochrome displays. For
370 + some unknown reason, the upstream maintianers don't recognize
371 + the usefulness of this. Oh well. */
372 +#ifndef KANJI
373 + if (Xdepth <= 2)
374 + putenv("TERM=" TERMENV "-m");
375 + else
376 +#endif
377 putenv("TERM=" TERMENV);
378 }
379 }
380 --- rxvt-2.6.4.orig/src/grkelot.c
381 +++ rxvt-2.6.4/src/grkelot.c
382 @@ -158,9 +158,9 @@
384 #define NUM_XLAT_TYPES (sizeof(xlat_type) / sizeof(xlat_type[0]))
386 -static void kstate_add_xlat(char *str);
387 -static void kstate_add_switcher(char *str);
388 -static void kstate_set_life(char *str);
389 +void kstate_add_xlat(char *str);
390 +void kstate_add_switcher(char *str);
391 +void kstate_set_life(char *str);
393 /* --- Functions ------------- */
394 /* INTPROTO */
395 --- rxvt-2.6.4.orig/src/graphics.c
396 +++ rxvt-2.6.4/src/graphics.c
397 @@ -144,15 +144,15 @@
398 x -= (XTextWidth(TermWin.font, data->text, data->coords[3]) >> 1);
400 if (align & TOP_TEXT)
401 - y += TermWin.font->ascent;
402 + y += TermWin.fascent;
403 else if (align & BOTTOM_TEXT)
404 - y -= TermWin.font->descent;
405 + y -= TermWin.fdescent;
407 if (align & VCENTER_TEXT)
408 - y -= TermWin.font->descent
409 - + ((TermWin.font->ascent + TermWin.font->descent) >> 1);
410 + y -= TermWin.fdescent
411 + + ((TermWin.fascent + TermWin.fdescent) >> 1);
412 if (align & VCAPS_CENTER_TEXT)
413 - y += (TermWin.font->ascent >> 1);
414 + y += (TermWin.fascent >> 1);
416 XPMClearArea(Xdisplay, grwin->win, x, y, Width2Pixel(data->coords[3]),
417 Height2Pixel(1), 0);
418 --- rxvt-2.6.4.orig/src/command.c
419 +++ rxvt-2.6.4/src/command.c
420 @@ -992,7 +992,9 @@
421 else {
422 /* To avoid Segmentation Fault in C locale */
423 setTermFontSet();
424 +#ifdef MULTICHAR_SET
425 if (strcmp(locale, "C"))
426 +#endif
427 XRegisterIMInstantiateCallback(Xdisplay, NULL, NULL, NULL,
428 IMInstantiateCallback, NULL);
429 }
430 @@ -1214,11 +1216,23 @@
431 ^ !!(shft | ctrl)) ? '\b' : '\177');
432 } else
433 len = strlen(STRCPY(kbuf, key_backspace));
434 +#ifdef MULTICHAR_SET
435 + if ((Options & Opt_mc_hack) && scr_multi2()) {
436 + memmove(kbuf + len, kbuf, len);
437 + len *= 2;
438 + }
439 +#endif
440 break;
441 #endif
442 #ifndef NO_DELETE_KEY
443 case XK_Delete:
444 len = strlen(STRCPY(kbuf, key_delete));
445 +#ifdef MULTICHAR_SET
446 + if ((Options & Opt_mc_hack) && scr_multi1()) {
447 + memmove(kbuf + len, kbuf, len);
448 + len *= 2;
449 + }
450 +#endif
451 break;
452 #endif
453 case XK_Tab:
454 @@ -1244,13 +1258,13 @@
456 #ifdef XK_KP_Left
457 case XK_KP_Up: /* \033Ox or standard */
458 - case XK_KP_Down: /* \033Ow or standard */
459 + case XK_KP_Down: /* \033Or or standard */
460 case XK_KP_Right: /* \033Ov or standard */
461 case XK_KP_Left: /* \033Ot or standard */
462 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
463 len = 3;
464 STRCPY(kbuf, "\033OZ");
465 - kbuf[2] = ("txvw"[keysym - XK_KP_Left]);
466 + kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
467 break;
468 } else
469 /* translate to std. cursor key */
470 @@ -1272,6 +1286,14 @@
471 kbuf[2] = ("dacb"[keysym - XK_Left]);
472 } else if (PrivateModes & PrivMode_aplCUR)
473 kbuf[1] = 'O';
474 +#ifdef MULTICHAR_SET
475 + if ((Options & Opt_mc_hack) &&
476 + ((keysym==XK_Left && scr_multi2()) ||
477 + (keysym==XK_Right && scr_multi1()))) {
478 + memmove(kbuf + len, kbuf, len);
479 + len *= 2;
480 + }
481 +#endif
482 break;
484 #ifndef UNSHIFTED_SCROLLKEYS
485 @@ -1670,8 +1692,16 @@
487 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
488 for (count = BUFSIZ; count; count -= n, cmdbuf_endp += n)
489 - if ((n = read(cmd_fd, cmdbuf_endp, count)) <= 0)
490 + if ((n = read(cmd_fd, cmdbuf_endp, count)) > 0)
491 + continue;
492 + else if (n == 0 || (n < 0 && errno == EAGAIN))
493 break;
494 + else {
495 +#if !defined (HAVE_ATEXIT) && !defined (__sun__)
496 + clean_exit();
497 +#endif
498 + exit(1); /* bad order of events? */
499 + }
500 if (count != BUFSIZ) /* some characters read in */
501 return (*cmdbuf_ptr++);
502 }
503 @@ -2376,7 +2406,7 @@
504 unsigned char buf[256];
506 va_start(arg_ptr, fmt);
507 - vsprintf(buf, fmt, arg_ptr);
508 + vsnprintf(buf, sizeof(buf), fmt, arg_ptr);
509 va_end(arg_ptr);
510 tt_write(buf, strlen(buf));
511 }
512 @@ -2826,6 +2856,7 @@
513 case 18: /* report window size (chars) */
514 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
515 break;
516 +#if 0 /* XXX: currently disabled due to security concerns */
517 case 20: /* report icon label */
518 XGetIconName(Xdisplay, TermWin.parent[0], &s);
519 tt_printf("\033]L%-.200s\033\\", s ? s : "");
520 @@ -2834,6 +2865,7 @@
521 XFetchName(Xdisplay, TermWin.parent[0], &s);
522 tt_printf("\033]l%-.200s\033\\", s ? s : "");
523 break;
524 +#endif
525 }
526 }
527 #endif
528 @@ -2853,7 +2885,8 @@
529 if (ch == ';') {
530 int n = 0;
532 - while ((ch = cmd_getc()) != 007) {
533 + while ((ch = cmd_getc()) != 007 &&
534 + !(ch == 0x1b && cmd_getc() == 0x5c)) {
535 if (ch) {
536 if (ch == '\t')
537 ch = ' '; /* translate '\t' to space */
538 @@ -2870,7 +2903,11 @@
539 * so do it here
540 */
541 if (arg == XTerm_Menu)
542 +#if 0 /* XXX: currently disabled due to security concerns */
543 menubar_dispatch((char *)string);
544 +#else
545 + 0;
546 +#endif
547 else
548 xterm_seq(arg, (char *)string);
549 }
550 --- rxvt-2.6.4.orig/src/rxvt.h
551 +++ rxvt-2.6.4/src/rxvt.h
552 @@ -173,9 +173,12 @@
553 height, /* window height [pixels] */
554 fwidth, /* font width [pixels] */
555 fheight, /* font height [pixels] */
556 + fascent, /* font ascent [pixels] */
557 + fdescent, /* font descent [pixels] */
558 fprop, /* font is proportional */
559 bprop, /* treat bold font as proportional */
560 mprop, /* treat multichar font as proportional */
561 + fontdiff, /* font size different */
562 ncol, nrow, /* window size [characters] */
563 focus, /* window has focus */
564 mapped, /* window state mapped? */
565 @@ -469,6 +472,7 @@
566 #define Opt_scrollTtyOutput (1LU<<11)
567 #define Opt_scrollKeypress (1LU<<12)
568 #define Opt_transparent (1LU<<13)
569 +#define Opt_mc_hack (1LU<<14)
570 /* place holder used for parsing command-line options */
571 #define Opt_Reverse (1LU<<30)
572 #define Opt_Boolean (1LU<<31)
573 @@ -610,6 +614,9 @@
574 Rs_preeditType,
575 Rs_inputMethod,
576 #endif
577 +#ifdef MULTICHAR_SET
578 + Rs_mc_hack,
579 +#endif
580 #if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
581 Rs_bigfont_key,
582 Rs_smallfont_key,
583 --- rxvt-2.6.4.orig/src/feature.h
584 +++ rxvt-2.6.4/src/feature.h
585 @@ -368,6 +368,10 @@
586 */
587 #define SUPPORT_BROKEN_APPS_WHICH_RELY_ON_UNDEFINED_BW_BEHAVIOUR_AS_XTERM
589 +/* Debian modification to change the cursor color to the foreground
590 + color */
591 +#define CURSOR_COLOR_IS_RENDITION_COLOR
592 +
593 /*
594 * List of default fonts available
595 * NFONTS is the number of fonts in the list
596 --- rxvt-2.6.4.orig/doc/etc/rxvt.terminfo
597 +++ rxvt-2.6.4/doc/etc/rxvt.terminfo
598 @@ -13,7 +13,13 @@
599 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
600 # Since rxvt is not really compatible with xterm, it should be configured as
601 # "rxvt-basic" (monochrom) and "rxvt"
602 -rxvt-basic|rxvt terminal base (X Window System),
603 +#
604 +# Debian's changes:
605 +# Debian has uses two termcap/terminfo entries:
606 +# rxvt for color displays
607 +# rxvt-m for monochrome displays
608 +# Debian also prefers ^? for kbs (backspace).
609 +rxvt-m|monochrome rxvt terminal emulator (X Window System),
610 am, bce, eo, km, mir, msgr, xenl, xon,
611 cols#80, it#8, lines#24,
612 acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
613 @@ -29,7 +35,7 @@
614 ind=^J, is1=\E[?47l\E=\E[?1l,
615 is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
616 kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$,
617 - kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^H,
618 + kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^?,
619 kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
620 kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^,
621 kend=\E[8~, kent=\EOM, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
622 @@ -50,4 +56,4 @@
623 colors#8, pairs#64,
624 op=\E[39;49m, setab=\E[%p1%{40}%+%dm,
625 sgr0=\E[m\017, setaf=\E[%p1%{30}%+%dm,
626 - use=rxvt-basic,
627 + use=rxvt-m,
628 --- rxvt-2.6.4.orig/doc/etc/rxvt.termcap
629 +++ rxvt-2.6.4/doc/etc/rxvt.termcap
630 @@ -1,5 +1,8 @@
631 -# Reconstructed via infocmp from file: /usr/share/terminfo/r/rxvt
632 -rxvt|rxvt terminal emulator (X Window System):\
633 +# Debian's changes:
634 +# Debian has uses two termcap/terminfo entries:
635 +# rxvt for color displays
636 +# rxvt-m for monochrome displays
637 +rxvt-m|monochrome rxvt terminal emulator (X Window System):\
638 :am:eo:km:mi:ms:xn:xo:\
639 :co#80:it#8:li#24:\
640 :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
641 @@ -11,9 +14,27 @@
642 :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
643 :k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
644 :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
645 - :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:\
646 - :kh=\E[7~:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:\
647 - :md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
648 + :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\E[B:\
649 + :ke=\E>:kh=\E[7~:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
650 + :mb=\E[5m:md=\E[1m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
651 :se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
652 :te=\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\
653 :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
654 +rxvt|rxvt terminal emulator (X Window System):\
655 + :am:eo:km:mi:ms:xn:xo:\
656 + :co#80:it#8:li#24:\
657 + :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
658 + :K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
659 + :RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
660 + :ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
661 + :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
662 + :ho=\E[H:i1=\E[?47l\E=\E[?1l:ic=\E[@:im=\E[4h:\
663 + :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
664 + :k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
665 + :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
666 + :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\E[B:\
667 + :ke=\E>:kh=\E[7~:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
668 + :mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\
669 + :sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
670 + :te=\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\
671 + :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
672 --- rxvt-2.6.4.orig/doc/yodl/rxvt-resources.yo
673 +++ rxvt-2.6.4/doc/yodl/rxvt-resources.yo
674 @@ -221,7 +221,7 @@
675 dit(bf(cutchars:) em(string))
676 The characters used as delimiters for double-click word selection.
677 The built-in default: nl()\
678 - bf(BACKSLASH `"'&()*,;<=>?@[]{|})
679 + bf(BACKSLASH \ `"'&()*,;<=>?@[]{|})
680 dit(bf(preeditType:) em(style))
681 bf(OverTheSpot), bf(OffTheSpot), bf(Root);
682 option bf(-pt).
683 --- rxvt-2.6.4.orig/doc/rxvt.tbl
684 +++ rxvt-2.6.4/doc/rxvt.tbl
685 @@ -1,4 +1,5 @@
686 -.TH "1" "RXVT" "02 NOVEMBER 2001" "X Version 11" "X Tools"
687 +'\" t
688 +.TH "RXVT" 1 "02 NOVEMBER 2001" "X Version 11" "X Tools"
689 .SH "NAME"
690 rxvt (ouR XVT) \- a VT102 emulator for the X window system
691 .PP
692 @@ -17,19 +18,19 @@
693 .PP
694 .SH "OPTIONS"
695 .PP
696 -The \fBrxvt\fP options (mostly a subset of \fIxterm\fP\'s) are listed below\&.
697 +The \fBrxvt\fP options (mostly a subset of \fIxterm\fP's) are listed below\&.
698 In keeping with the smaller-is-better philosophy, options may be eliminated
699 or default values chosen at compile-time, so options and defaults listed
700 may not accurately reflect the version installed on your system\&.
701 -`rxvt -h\' gives a list of major compile-time options on the usage line\&.
702 +\(lqrxvt -h\(rq gives a list of major compile-time options on the usage line\&.
703 Option descriptions may be prefixed with which compile option each is
704 -dependent upon\&. e\&.g\&. `Compile \fIXIM\fP:\' requires \fIXIM\fP on the usage line\&.
705 -Note: `rxvt -help\' gives a list of all options compiled into your version\&.
706 +dependent upon\&. e\&.g\&. \(lqCompile \fIXIM\fP:\(rq requires \fIXIM\fP on the usage line\&.
707 +Note: \(lqrxvt -help\(rq gives a list of all options compiled into your version\&.
708 .PP
709 Note that \fBrxvt\fP permits the resource name to be used as a long-option
710 (--/++ option) so the potential command-line options are far greater than
711 those listed\&.
712 -For example: `rxvt --loginShell --color1 Orange\'\&.
713 +For example: \(lqrxvt --loginShell --color1 Orange\(rq\&.
714 .PP
715 .IP "\fB-help\fP, \fB--help\fP"
716 Print out a message describing available options\&.
717 @@ -44,7 +45,7 @@
718 Turn on/off simulated reverse video;
719 resource \fBreverseVideo\fP\&.
720 .IP "\fB-ip\fP|\fB+ip\fP"
721 -Turn on/off inheriting parent window\'s pixmap\&. Alternative form
722 +Turn on/off inheriting parent window's pixmap\&. Alternative form
723 is \fB-tr\fP;
724 resource \fBinheritPixmap\fP\&.
725 .IP "\fB-bg\fP \fIcolour\fP"
726 @@ -57,7 +58,7 @@
727 Compile \fIXPM\fP: Specify XPM file for the background and also
728 optionally specify its scaling with a geometry string\&. Note you
729 may need to add quotes to avoid special shell interpretation of
730 -the `;\' in the command-line;
731 +the \(lq;\(rq in the command-line;
732 resource \fBbackgroundPixmap\fP\&.
733 .IP "\fB-cr\fP \fIcolour\fP"
734 The cursor colour;
735 @@ -90,7 +91,7 @@
736 .IP "\fB-name\fP \fIname\fP"
737 Specify the application name under which resources
738 are to be obtained, rather than the default executable file name\&.
739 -Name should not contain `\&.\' or `*\' characters\&.
740 +Name should not contain \(lq\&.\(rq or \(lq*\(rq characters\&.
741 Also sets the icon and title name\&.
742 .IP "\fB-ls\fP|\fB+ls\fP"
743 Start as a login-shell/sub-shell;
744 @@ -127,6 +128,9 @@
745 \fBTERM\fP environment variable\&. This terminal type must exist in the
746 \fItermcap(5)\fP database and should have \fIli#\fP and \fIco#\fP entries;
747 resource \fBtermName\fP\&.
748 +.IP "\fB-im\fP \fImethod\fP"
749 +This option specifies the input method to use;
750 +resource \fBinputMethod\fP\&.
751 .IP "\fB-e\fP \fIcommand [arguments]\fP"
752 Run the command with its command-line arguments in the \fBrxvt\fP
753 window; also sets the window title and icon name to be the basename
754 @@ -160,11 +164,11 @@
755 resource \fImodifier\fP\&.
756 .IP "\fB-xrm\fP \fIresourcestring\fP"
757 No effect on rxvt\&. Simply passes through an argument to be made
758 -available in the instance\'s argument list\&. Appears in \fIWM_COMMAND\fP
759 +available in the instance's argument list\&. Appears in \fIWM_COMMAND\fP
760 in some window managers\&.
761 .SH "RESOURCES (available also as long-options)"
762 .PP
763 -Note: `rxvt --help\' gives a list of all resources (long options) compiled
764 +Note: \(lqrxvt --help\(rq gives a list of all resources (long options) compiled
765 into your version\&.
766 If compiled with internal Xresources support (i\&.e\&. \fBrxvt -h\fP lists
767 \fB\&.Xdefaults\fP) then \fBrxvt\fP accepts application defaults set in
768 @@ -185,11 +189,11 @@
769 80x24];
770 option \fB-geometry\fP\&.
771 .IP "\fBbackground:\fP \fIcolour\fP"
772 -Use the specified colour as the window\'s background colour [default
773 +Use the specified colour as the window's background colour [default
774 White];
775 option \fB-bg\fP\&.
776 .IP "\fBforeground:\fP \fIcolour\fP"
777 -Use the specified colour as the window\'s foreground colour [default
778 +Use the specified colour as the window's foreground colour [default
779 Black];
780 option \fB-fg\fP\&.
781 .IP "\fBcolor\fP\fIn\fP\fB:\fP \fIcolour\fP"
782 @@ -221,26 +225,26 @@
783 option \fB+rv\fP\&.
784 See note in \fBCOLORS AND GRAPHICS\fP section\&.
785 .IP "\fBinheritPixmap:\fP \fIboolean\fP"
786 -\fBTrue\fP: make the background inherit the parent windows\' pixmap,
787 +\fBTrue\fP: make the background inherit the parent windows' pixmap,
788 giving artificial transparency\&.
789 -\fBFalse\fP: do not inherit the parent windows\' pixmap\&.
790 +\fBFalse\fP: do not inherit the parent windows' pixmap\&.
791 .IP "\fBscrollColor:\fP \fIcolour\fP"
792 Use the specified colour for the scrollbar [default #B2B2B2]\&.
793 .IP "\fBtroughColor:\fP \fIcolour\fP"
794 -Use the specified colour for the scrollbar\'s trough area [default
795 +Use the specified colour for the scrollbar's trough area [default
796 #969696]\&. Only relevant for normal (non XTerm/NeXT) scrollbar\&.
797 .IP "\fBbackgroundPixmap:\fP \fIfile[;geom]\fP"
798 -Use the specified XPM file (note the `\&.xpm\' extension is optional)
799 +Use the specified XPM file (note the \(lq\&.xpm\(rq extension is optional)
800 for the background and also optionally specify its scaling with a
801 -geometry string \fBWxH+X+Y\fP, in which \fB"W" / "H"\fP specify the
802 -horizontal/vertical scale (percent) and \fB"X" / "Y"\fP locate the
803 +geometry string \fBWxH+X+Y\fP, in which \fB\(lqW\(rq / \(lqH\(rq\fP specify the
804 +horizontal/vertical scale (percent) and \fB\(lqX\(rq / \(lqY\(rq\fP locate the
805 image centre (percent)\&. A scale of 0 displays the image with tiling\&.
806 A scale of 1 displays the image without any scaling\&. A scale of 2 to
807 9 specifies an integer number of images in that direction\&. No image
808 will be magnified beyond 10 times its original size\&. The maximum
809 permitted scale is 1000\&. [default 0x0+50+50]
810 .IP "\fBmenu:\fP \fIfile[;tag]\fP"
811 -Read in the specified menu file (note the `\&.menu\' extension is
812 +Read in the specified menu file (note the \(lq\&.menu\(rq extension is
813 optional) and also optionally specify a starting tag to find\&. See
814 the reference documentation for details on the syntax for the menuBar\&.
815 .IP "\fBpath:\fP \fIpath\fP"
816 @@ -304,8 +308,8 @@
817 name;
818 option \fB-title\fP\&.
819 .IP "\fBiconName:\fP \fItext\fP"
820 -Set the name used to label the window\'s icon or displayed in an icon
821 -manager window, it also sets the window\'s title unless it is
822 +Set the name used to label the window's icon or displayed in an icon
823 +manager window, it also sets the window's title unless it is
824 explicitly set;
825 option \fB-n\fP\&.
826 .IP "\fBmapAlert:\fP \fIboolean\fP"
827 @@ -318,7 +322,7 @@
828 \fBFalse\fP: no visual bell [default];
829 option \fB+vb\fP\&.
830 .IP "\fBloginShell:\fP \fIboolean\fP"
831 -\fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP
832 +\fBTrue\fP: start as a login shell by prepending a \(lq-\(rq to \fBargv[0]\fP
833 of the shell;
834 option \fB-ls\fP\&.
835 \fBFalse\fP: start as a normal sub-shell [default];
836 @@ -372,6 +376,9 @@
837 Specifies the terminal type name to be set in the \fBTERM\fP
838 environment variable;
839 option \fB-tn\fP\&.
840 +.IP "\fBinputMethod:\fP \fImethod\fP"
841 +Specifies the input method to use;
842 +option \fB-im\fP\&.
843 .IP "\fBmeta8:\fP \fIboolean\fP"
844 \fBTrue\fP: handle Meta (Alt) + keypress to set the 8th bit\&.
845 \fBFalse\fP: handle Meta (Alt) + keypress as an escape prefix [default]\&.
846 @@ -388,7 +395,7 @@
847 The characters used as delimiters for double-click word selection\&.
848 The built-in default:
849 .br
850 -\fBBACKSLASH `"\'&()*,;<=>?@[]{|}\fP
851 +\fBBACKSLASH \ `"'&()*,;<=>?@[]{|}\fP
852 .IP "\fBpreeditType:\fP \fIstyle\fP"
853 \fBOverTheSpot\fP, \fBOffTheSpot\fP, \fBRoot\fP;
854 option \fB-pt\fP\&.
855 @@ -497,7 +504,7 @@
856 as a number 0-15, as a convenient shorthand to reference the colour name of
857 color0-color15\&.
858 .PP
859 -Note that \fB-rv\fP (\fB"reverseVideo: True"\fP) simulates reverse video by
860 +Note that \fB-rv\fP (\fB\(lqreverseVideo: True\(rq\fP) simulates reverse video by
861 always swapping the foreground/background colours\&. This is in contrast to
862 \fIxterm\fP(1) where the colours are only swapped if they have not otherwise been
863 specified\&.
864 @@ -520,6 +527,16 @@
865 .IP "\fB/usr/lib/X11/rgb\&.txt\fP"
866 Color names\&.
867 .PP
868 +.SH "DEBIAN NOTES"
869 +.PP
870 +The standard Debian \fBrxvt\fP package provides two versions of the
871 +\fBrxvt\fP binary:
872 +.IP "\fBrxvt-xterm\fP"
873 +This version is compiled with no XPM support. It has been configured to
874 +be a smaller, more efficient xterm substitute.
875 +.IP "\fBrxvt-xpm\fP"
876 +This version is compiled with XPM and menu support.
877 +.PP
878 .SH "SEE ALSO"
879 .PP
880 \fIxterm\fP(1), \fIsh\fP(1), \fIresize\fP(1), \fIX\fP(1), \fIpty\fP(4), \fItty\fP(4),
881 @@ -534,7 +551,7 @@
882 .PP
883 Cursor change support is not yet implemented\&.
884 .PP
885 -Click-and-drag doesn\'t work with X11 mouse report overriding\&.
886 +Click-and-drag doesn't work with X11 mouse report overriding\&.
887 .PP
888 Graphics support is fairly crude\&.
889 .PP
890 --- rxvt-2.6.4.orig/doc/Makefile
891 +++ rxvt-2.6.4/doc/Makefile
892 @@ -0,0 +1,178 @@
893 +# Generated automatically from Makefile.in by configure.
894 +# doc/Makefile.in -*- Makefile -*-
895 +# $Id: Makefile.in,v 1.12.4.4 2000/04/15 08:59:44 gcw Exp $
896 +
897 +# autoconf/Make.common.in -*- Makefile -*-
898 +# release date (man), LSM date, version number/name, current maintainer
899 +DATE=02 NOVEMBER 2001
900 +LSMDATE=02NOV01
901 +VERSION=2.6.4
902 +VERNAME=rxvt-$(VERSION)#
903 +MAINT=Geoff Wing#
904 +MAINTEMAIL=<gcw@rxvt.org>#
905 +WEBMAINT=Oezguer Kesim#
906 +WEBMAINTEMAIL=<oec@rxvt.org>#
907 +WEBPAGE=<http://www.rxvt.org/>#
908 +FTPSITENAME=ftp.rxvt.org#
909 +FTPSITEDIR=/pub/rxvt#
910 +#-------------------------------------------------------------------------
911 +
912 +SHELL = /bin/sh
913 +
914 +# This variable makes it possible to move the installation root to another
915 +# directory. This is useful when you're creating a binary distribution
916 +# If empty, normal root will be used.
917 +# You can run eg. 'make install DESTDIR=/packages/rxvt-xx' to accomplish
918 +# that.
919 +# DESTDIR = /usr/local/X11/$(VERNAME)
920 +
921 +# Installation target directories & other installation stuff
922 +prefix = /usr
923 +exec_prefix = ${prefix}
924 +binprefix =
925 +manprefix =
926 +bindir = ${exec_prefix}/bin
927 +mandir = ${prefix}/share/man/man1
928 +manext = 1
929 +
930 +# Tools & program stuff
931 +CC = gcc
932 +CPP = gcc -E
933 +MV = /bin/mv
934 +RM = /bin/rm
935 +RMF = /bin/rm -f
936 +CP = /bin/cp
937 +SED = /bin/sed
938 +AWK = /usr/bin/awk
939 +ECHO = /bin/echo
940 +CMP = /usr/bin/cmp
941 +TBL = /usr/bin/tbl
942 +INSTALL = /usr/bin/install -c
943 +INSTALL_PROGRAM = /usr/bin/install -c -s -m 755
944 +INSTALL_DATA = /usr/bin/install -c -m 644
945 +
946 +# Flags & libs
947 +# add -DBINDIR=\""$(bindir)/"\" to CPPFLAGS, if we need to spawn a program
948 +
949 +CFLAGS = -O
950 +CPPFLAGS = -DHAVE_LIBXPM
951 +LDFLAGS =
952 +DEFS = -DHAVE_CONFIG_H
953 +LIBS =
954 +DINCLUDE =
955 +DLIB =
956 +
957 +# X Include directory
958 +XINC = -I/usr/X11R6/include -I/usr/include/X11
959 +
960 +# extra libraries needed by X on some systems, X library location
961 +XLIB = -L/usr/X11R6/lib -L/usr/X11R6/lib -lXpm -lX11
962 +
963 +# End of common section of the Makefile
964 +#-------------------------------------------------------------------------
965 +
966 +srcdir = .
967 +.PATH: .
968 +
969 +basedir = ..
970 +thisdir = doc
971 +
972 +first_rule: all
973 +dummy:
974 +
975 +#
976 +# Distribution variables
977 +#
978 +
979 +YODL_RXVT = yodl/rxvt-colours.yo yodl/rxvt-environment.yo\
980 + yodl/rxvt-files.yo yodl/rxvt-fonts.yo yodl/rxvt-login.yo\
981 + yodl/rxvt-mousereporting.yo yodl/rxvt-options.yo\
982 + yodl/rxvt-resources.yo yodl/rxvt-scrollbar.yo\
983 + yodl/rxvt-textselection.yo
984 +YODL_RREF = yodl/rxvtRef-csi.yo yodl/rxvtRef-definitions.yo\
985 + yodl/rxvtRef-graphics.yo yodl/rxvtRef-keycodes.yo\
986 + yodl/rxvtRef-menubar.yo yodl/rxvtRef-mouse.yo\
987 + yodl/rxvtRef-privatemodes.yo yodl/rxvtRef-sequences.yo\
988 + yodl/rxvtRef-values.yo yodl/rxvtRef-xpm.yo yodl/rxvtRef-xterm.yo
989 +
990 +DIST_ETC = etc/rxvt.termcap etc/rxvt.terminfo etc/XTerm.ad
991 +DIST_YODL = yodl/masonyodl.yo yodl/versioninfo.yo yodl/versioninfo.yo.in\
992 + $(YODL_RXVT) yodl/rxvt.yo yodl/rxvt.yo.in $(YODL_RREF)\
993 + yodl/rxvtRef.yo.in
994 +DIST_MENU = menu/menu menu/example.menu menu/rxvt.menu menu/terminal.menu\
995 + menu/jedmenu.sl
996 +DIST = Makefile.in README.greek README.menu README.xvt BUGS FAQ TODO\
997 + changes.txt xterm.seq LSM.in rxvt.1 rxvt.tbl rxvtRef.txt\
998 + rxvtRef.html rxvtRef-frame.html rxvtRef-toc.html rxvt.html
999 +
1000 +#-------------------------------------------------------------------------
1001 +
1002 +all: rxvt.1
1003 +
1004 +rxvt.1: Makefile
1005 + @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
1006 +
1007 +SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
1008 + -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
1009 + -e 's%@RXVT_DATE@%$(DATE)%g;'\
1010 + -e 's%@RXVT_MAINTEMAIL@%$(MAINTEMAIL)%g;'\
1011 + -e 's%@RXVT_MAINT@%$(MAINT)%g;'\
1012 + -e 's%@RXVT_WEBPAGE@%$(WEBPAGE)%g;'\
1013 + -e 's%@RXVT_WEBMAINTEMAIL@%$(WEBMAINTEMAIL)%g;'\
1014 + -e 's%@RXVT_WEBMAINT@%$(WEBMAINT)%g;'\
1015 + -e 's%@RXVT_FTPSITENAME@%$(FTPSITENAME)%g;'\
1016 + -e 's%@RXVT_FTPSITEDIR@%$(FTPSITEDIR)%g;'
1017 +
1018 +tags allbin:
1019 +
1020 +alldoc: $(basedir)/$(VERNAME).lsm rxvt.tbl rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
1021 +
1022 +yodl/versioninfo.yo: yodl/versioninfo.yo.in ../src/version.h
1023 + $(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
1024 +
1025 +$(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)/../src/version.h
1026 + $(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@
1027 +
1028 +rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
1029 + yodl2man -orxvt.tbl yodl/rxvt.yo
1030 +
1031 +rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
1032 + yodl2html -o$@ yodl/rxvt.yo
1033 +
1034 +rxvtRef.html: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
1035 + yodl2html -o$@ yodl/rxvtRef.yo
1036 +
1037 +rxvtRef.txt: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
1038 + yodl2txt -o$@ yodl/rxvtRef.yo
1039 +
1040 +clean:
1041 + $(RMF) rxvt.man *~ yodl/*~
1042 +
1043 +realclean: clean
1044 + $(RMF) tags rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
1045 +
1046 +distclean:
1047 +
1048 +install:
1049 + $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
1050 +
1051 +uninstall:
1052 + -cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
1053 +
1054 +distdirs:
1055 + mkdir $(basedir)/../$(VERNAME)/$(thisdir)
1056 + mkdir $(basedir)/../$(VERNAME)/$(thisdir)/etc
1057 + mkdir $(basedir)/../$(VERNAME)/$(thisdir)/menu
1058 + mkdir $(basedir)/../$(VERNAME)/$(thisdir)/yodl
1059 +
1060 +distcopy: distdepend
1061 + $(CP) -p $(basedir)/$(VERNAME).lsm $(basedir)/../$(VERNAME);
1062 + $(CP) -p $(DIST) $(basedir)/../$(VERNAME)/$(thisdir)
1063 + $(CP) -p $(DIST_ETC) $(basedir)/../$(VERNAME)/$(thisdir)/etc
1064 + $(CP) -p $(DIST_MENU) $(basedir)/../$(VERNAME)/$(thisdir)/menu
1065 + $(CP) -p $(DIST_YODL) $(basedir)/../$(VERNAME)/$(thisdir)/yodl
1066 +
1067 +distdepend: alldoc
1068 +
1069 +# ------------------------------------------------------------------------
1070 +# DO NOT DELETE: ugly dependency list follows
1071 --- rxvt-2.6.4.orig/doc/rxvt.html
1072 +++ rxvt-2.6.4/doc/rxvt.html
1073 @@ -468,7 +468,7 @@
1074 with the <strong>Execute</strong> key.
1075 <p></p><dt><strong><strong>cutchars:</strong> <em>string</em></strong><dd>
1076 The characters used as delimiters for double-click word selection.
1077 - The built-in default: <br><strong>BACKSLASH `"'&()*,;<=>?@[]{|}</strong>
1078 + The built-in default: <br><strong>BACKSLASH \ `"'&()*,;<=>?@[]{|}</strong>
1079 <p></p><dt><strong><strong>preeditType:</strong> <em>style</em></strong><dd>
1080 <strong>OverTheSpot</strong>, <strong>OffTheSpot</strong>, <strong>Root</strong>;
1081 option <strong>-pt</strong>.
1082 --- rxvt-2.6.4.orig/rclock/rclock.c
1083 +++ rxvt-2.6.4/rclock/rclock.c
1084 @@ -336,7 +336,7 @@
1085 if (*opt == 'd' && val) display_name = val; /* "d", "display" */
1086 else if (*opt == 'g' && val) rs_geometry = val; /* "g", "geometry" */
1087 #ifdef ICONWIN
1088 - else if (*opt == 'i' && val) /* "ic", "iconic" */
1089 + else if (*opt == 'i') /* "ic", "iconic" */
1090 {
1091 iconic_state = IconicState;
1092 i--; /* no argument */
1093 @@ -1201,8 +1201,16 @@
1094 int n = (sizeof(execPrgm) - strlen (execPrgm) - 2);
1095 if ((n > 0) && (n >= strlen (prgm)))
1096 {
1097 - /* for co-occurring programs */
1098 - strcat (execPrgm, ";");
1099 + /* for co-occurring programs */
1100 + switch (execPrgm[strlen (execPrgm)-1])
1101 + {
1102 + case '&':
1103 + case ';':
1104 + break;
1105 + default:
1106 + strcat (execPrgm, ";");
1107 + break;
1108 + }
1109 strncat (execPrgm, prgm, n);
1110 }
1111 }
1112 --- rxvt-2.6.4.orig/rclock/feature.h
1113 +++ rxvt-2.6.4/rclock/feature.h
1114 @@ -53,7 +53,7 @@
1115 #define MAIL
1116 /* #define MAIL_BELL */
1117 /* #define MAIL_SPAWN "xmh\ -font\ 7x14\&" */
1118 -/* #define MAIL_SPOOL "/var/spool/mail/" */
1119 +#define MAIL_SPOOL "/var/spool/mail/"
1121 /*----------------------------------------------------------------------*
1122 * #define CLOCKUPDATE 30
1123 --- rxvt-2.6.4.orig/Makefile.in
1124 +++ rxvt-2.6.4/Makefile.in
1125 @@ -1,6 +1,6 @@
1126 # ./Makefile.in -*- Makefile -*-
1127 # $Id: Makefile.in,v 1.5 1999/03/29 05:31:37 mason Exp $
1128 -@MCOMMON@
1129 +#@MCOMMON@
1131 srcdir = @srcdir@
1132 VPATH = @srcdir@