ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.179 by root, Wed Dec 15 05:39:08 2004 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <signal.h> 63#include <csignal>
55 64
56/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
57 66
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62 68
63#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
64 70
65#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
114 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 122 XK_Print, 0x2399,
117 123
118 XK_space, 0x2423, 124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
120 0, 134 0,
121}; 135};
122 136
123void 137void
124rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
125{ 139{
126 x = Pixel2Col (x); 140 x = Pixel2Col (x);
127 y = Pixel2Row (y); 141 y = Pixel2Row (y);
128 142
129 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 145 return;
132 146
133 for (;;) 147 for (;;)
134 { 148 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
136 152
137 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
138 { 154 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
142 break; 157 break;
143 } 158 }
144 159
145 x--; 160 x--;
146 } 161 }
147
148} 162}
149#endif
150 163
151#if ENABLE_OVERLAY
152void 164void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 166{
155 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 170 int len;
159 171
172 fname = rxvt_utf8towcs (f->name);
173
160#if ENABLE_COMBINING 174# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
162 { 176 {
163 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
166 } 180 }
167 else 181 else
168#endif 182# endif
169 { 183 {
170 ch2 = ch; 184 ch2 = ch;
171 185
172 alloc = 0; 186 alloc = 0;
173 chr = &ch2; 187 chr = &ch2;
174 len = 1; 188 len = 1;
175 } 189 }
176 190
177 int width = strlen (f->name); 191 char attr[80]; // plenty
178 192
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
180 215
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 217
183 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
184 { 219 {
… …
187 ch = *chr++; 222 ch = *chr++;
188 223
189 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
192#if !UNICODE3 227# if !UNICODE3
193 if (ch >= 0x10000) 228 if (ch >= 0x10000)
194 ch = 0xfffd; 229 ch = 0xfffd;
195#endif 230# endif
196 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
197 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
198 } 235 }
199 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
242 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 243 scr_overlay_set (0, len + 1, fname);
201 244
245 free (fname);
246
202#if ENABLE_COMBINING 247# if ENABLE_COMBINING
203 if (alloc) 248 if (alloc)
204 delete [] alloc; 249 delete [] alloc;
205#endif 250# endif
206} 251}
207#endif 252#endif
208 253
209void 254void
210rxvt_term::commit_iso14755 () 255rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 272 mb[0] = ch[0];
228 len = 1; 273 len = 1;
229 } 274 }
230 275
231 if (len > 0) 276 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 277 tt_write (mb, len);
233 else 278 else
234 scr_bell (); 279 scr_bell ();
235 } 280 }
236 281
237 iso14755buf = 0; 282 iso14755buf = 0;
… …
261rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
262{ 307{
263 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
264 unsigned int newlen; 309 unsigned int newlen;
265 KeySym keysym; 310 KeySym keysym;
266#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */
268#endif
269 int valid_keysym; 311 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
271 313
272 /* 314 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 316 * escape sequence to toggle the Keypad.
275 * 317 *
276 * Always permit `shift' to override the current setting 318 * Always permit `shift' to override the current setting
277 */ 319 */
278 shft = (ev.state & ShiftMask); 320 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 321 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 322 meta = ev.state & ModMetaMask;
281 323
282 if (numlock_state || (ev.state & ModNumLockMask)) 324 if (numlock_state || (ev.state & ModNumLockMask))
283 { 325 {
284 numlock_state = (ev.state & ModNumLockMask); 326 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 327 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 335 Status status_return;
294 336
295#if 0 337#if 0
296#ifdef X_HAVE_UTF8_STRING 338#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 339 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 340 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 341 KBUFSZ, &keysym, &status_return);
300 else 342 else
301#endif 343#endif
302#endif 344#endif
303 { 345 {
… …
305 347
306 // the XOpenIM manpage lies about hardcoding the locale 348 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 349 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 350 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 351 SET_LOCALE (rs[Rs_imLocale]);
352
310 // assume wchar_t == unicode or better 353 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 354 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 355 KBUFSZ, &keysym, &status_return);
356
313 if (rs[Rs_imLocale]) 357 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 358 SET_LOCALE (locale);
315 359
316 if (status_return == XLookupChars 360 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 361 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 382 || status_return == XLookupBoth;
339 } 383 }
340 else 384 else
341#endif 385#endif
342 { 386 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 387 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 388 valid_keysym = keysym != NoSymbol;
345 } 389 }
346 390
347 if (valid_keysym) 391 if (valid_keysym)
348 { 392 {
393#ifdef KEYSYM_RESOURCE
394 if (keyboard->dispatch (this, keysym, ev.state))
395 return;
396#endif
397
349 if (TermWin.saveLines) 398 if (saveLines)
350 { 399 {
351#ifdef UNSHIFTED_SCROLLKEYS 400#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 401 if (!ctrl && !meta)
353#else 402#else
354 if (IS_SCROLL_MOD) 403 if (IS_SCROLL_MOD)
355#endif 404#endif
356 { 405 {
357 int lnsppg; 406 int lnsppg;
358 407
359#ifdef PAGING_CONTEXT_LINES 408#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 409 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 410#else
362 lnsppg = TermWin.nrow * 4 / 5; 411 lnsppg = nrow * 4 / 5;
363#endif 412#endif
364 if (keysym == XK_Prior) 413 if (keysym == XK_Prior)
365 { 414 {
366 scr_page (UP, lnsppg); 415 scr_page (UP, lnsppg);
367 return; 416 return;
… …
395 scr_move_to (0, 1); 444 scr_move_to (0, 1);
396 return; 445 return;
397 } 446 }
398 else if (keysym == XK_End) 447 else if (keysym == XK_End)
399 { 448 {
400 scr_move_to (1, 0); 449 scr_move_to (1, 1);
401 return; 450 return;
402 } 451 }
403 } 452 }
404#endif 453#endif
405 } 454 }
… …
416 { 465 {
417 switch (keysym) 466 switch (keysym)
418 { 467 {
419 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
422 return; 471 return;
423#if TODO 472#if TODO
424 /* rxvt extras */ 473 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 475 change_font (FONT_UP);
… …
487 } 536 }
488#endif 537#endif
489 538
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 539 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 540 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 541 {
518 newlen = 1; 542 newlen = 1;
519 switch (keysym) 543 switch (keysym)
520 { 544 {
521#ifndef NO_BACKSPACE_KEY 545#ifndef NO_BACKSPACE_KEY
… …
529 else 553 else
530 strcpy (kbuf, key_backspace); 554 strcpy (kbuf, key_backspace);
531 break; 555 break;
532#endif 556#endif
533#ifndef NO_DELETE_KEY 557#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior
559 case XK_KP_Delete:
560 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
562 {
563 strcpy (kbuf, "\033On");
564 break;
565 }
566 /* FALLTHROUGH */
567# endif
534 case XK_Delete: 568 case XK_Delete:
535 strcpy (kbuf, key_delete); 569 strcpy (kbuf, key_delete);
536 break; 570 break;
537#endif 571#endif
538 case XK_Tab: 572 case XK_Tab:
… …
641#ifdef XK_KP_Begin 675#ifdef XK_KP_Begin
642 case XK_KP_Begin: 676 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 677 strcpy (kbuf, "\033Ou");
644 break; 678 break;
645 679
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 680#endif
654 case XK_KP_F1: /* "\033OP" */ 681 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 682 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 683 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 684 case XK_KP_F4: /* "\033OS" */
… …
689 break; 716 break;
690 717
691 case XK_Find: 718 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 719 strcpy (kbuf, "\033[1~");
693 break; 720 break;
721
722#ifdef XK_KP_End
723 case XK_KP_Insert:
724 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
726 {
727 strcpy (kbuf, "\033Op");
728 break;
729 }
730 /* FALLTHROUGH */
731#endif
694 case XK_Insert: 732 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 733 strcpy (kbuf, "\033[2~");
696 break; 734 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 735#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 736 case DXK_Remove:
… …
788#undef FKEY 826#undef FKEY
789 default: 827 default:
790 newlen = 0; 828 newlen = 0;
791 break; 829 break;
792 } 830 }
831
793 if (newlen) 832 if (newlen)
794 len = strlen (kbuf); 833 len = strlen (kbuf);
795 } 834 }
796 835
797 /* 836 /*
… …
806 else if (ctrl && keysym == XK_minus) 845 else if (ctrl && keysym == XK_minus)
807 { 846 {
808 len = 1; 847 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 848 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 849 }
850 else if (keysym == XK_ISO_Left_Tab)
851 {
852 strcpy (kbuf, "\033[Z");
853 len = 3;
854 }
811 else 855 else
812 { 856 {
813#ifdef META8_OPTION 857#ifdef META8_OPTION
814 /* set 8-bit on */ 858 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
816 { 860 {
817 unsigned char *ch; 861 char *ch;
818 862
819 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 864 *ch |= 0x80;
821 865
822 meta = 0; 866 meta = 0;
… …
824#endif 868#endif
825 /* nil */ ; 869 /* nil */ ;
826 } 870 }
827 } 871 }
828 872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
875
829 if (len <= 0) 876 if (len <= 0)
830 return; /* not mapped */ 877 return; /* not mapped */
831 878
832 if (options & Opt_scrollTtyKeypress) 879 if (OPTION (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 880 if (view_start)
834 { 881 {
835 TermWin.view_start = 0; 882 view_start = 0;
836 want_refresh = 1; 883 want_refresh = 1;
837 } 884 }
838 885
839 /* 886 /*
840 * these modifications only affect the static keybuffer 887 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 902#ifdef META8_OPTION
856 && meta_char == C0_ESC 903 && meta_char == C0_ESC
857#endif 904#endif
858 ) 905 )
859 { 906 {
860 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
861 tt_write (&ch, 1); 908 tt_write (&ch, 1);
862 } 909 }
863 910
864#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */
866 unsigned char *p;
867 int i;
868
869 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
870 for (i = 0, p = kbuf; i < len; i++, p++)
871 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
872 fprintf (stderr, "'\n");
873#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
875} 912}
876/*}}} */ 913/*}}} */
877 914
878#if (MENUBAR_MAX) 915#if defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */
881unsigned int 916unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 918{
884 unsigned int n, s; 919 unsigned int n, s;
885 920
886 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 941
907 cmd_parse (); 942 cmd_parse ();
908 943
909 return 0; 944 return 0;
910} 945}
911#endif /* MENUBAR_MAX */ 946#endif
912 947
913void 948void
914rxvt_term::flush () 949rxvt_term::flush ()
915{ 950{
916 flush_ev.stop (); 951 flush_ev.stop ();
… …
924 } 959 }
925#endif 960#endif
926 961
927 if (want_refresh) 962 if (want_refresh)
928 { 963 {
964 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
965 {
966 int row = view_start;
967 int end_row = row + nrow;
968
969 while (row > top_row && ROW (row - 1).is_longer ())
970 --row;
971
972 do
973 {
974 int start_row = row;
975 line_t *l;
976
977 do
978 {
979 l = &ROW (row++);
980
981 if (!(l->f & LINE_FILTERED))
982 {
983 // line not filtered, mark it as filtered
984 l->f |= LINE_FILTERED;
985 while (l->is_longer ())
986 {
987 l = &ROW (row++);
988 l->f |= LINE_FILTERED;
989 }
990
991 // and filter it
992 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
993
994 break;
995 }
996 }
997 while (l->is_longer () && row < end_row);
998 }
999 while (row < end_row);
1000 }
1001
929 scr_refresh (refresh_type); 1002 scr_refresh ();
930 scrollbar_show (1); 1003 scrollbar_show (1);
931#ifdef USE_XIM 1004#ifdef USE_XIM
932 IMSendSpot (); 1005 IMSendSpot ();
933#endif 1006#endif
934 } 1007 }
… …
937} 1010}
938 1011
939void 1012void
940rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
941{ 1014{
942 SET_R (this); 1015 make_current ();
943 SET_LOCALE (locale);
944 1016
945 display->flush (); 1017 display->flush ();
946 1018
947 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 1021}
950 1022
951void 1023void
952rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
953{ 1025{
954 SET_R (this); 1026 make_current ();
955 SET_LOCALE (locale);
956 1027
957 refresh_limit = 1; 1028 refresh_limit = 1;
958 refresh_count = 0; 1029 refresh_count = 0;
959 flush (); 1030 flush ();
960} 1031}
… …
964rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
965{ 1036{
966 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
967 want_refresh = 1; 1038 want_refresh = 1;
968 1039
969 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
970} 1041}
971#endif 1042#endif
972 1043
973#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
974void 1045void
… …
988rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
989{ 1060{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 { 1063 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1064 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 } 1066 }
997} 1067}
998#endif 1068#endif
… …
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1003{ 1073{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1075 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1077 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 } 1079 }
1011} 1080}
1012#endif 1081#endif
… …
1017{ 1086{
1018 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1090 {
1022 refresh_type |= SMOOTH_REFRESH; 1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1023 want_refresh = 1; 1094 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1096 }
1026} 1097}
1027#endif 1098#endif
1028 1099
1100#if HAVE_SCHED_YIELD
1101static struct event_handler
1102{
1103 check_watcher cw_yield;
1104
1105 void yield (check_watcher &w)
1106 {
1107 sched_yield ();
1108 w.stop ();
1109 }
1110
1111 event_handler ()
1112 : cw_yield (this, &event_handler::yield)
1113 {
1114 }
1115} event_handler;
1116#endif
1117
1029bool 1118bool
1030rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
1031{ 1120{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1122
1034 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
1035 { 1124 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1125 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1126 n = 0;
1038 } 1127 }
1039 1128
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1043 1132
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1134
1046 if (n > 0) 1135 if (r > 0)
1047 { 1136 {
1048 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
1049 return true; 1138 return true;
1050 } 1139 }
1051 else if (n < 0 && errno != EAGAIN) 1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 {
1142#if HAVE_SCHED_YIELD
1143 if (display->is_local)
1144 event_handler.cw_yield.start ();
1145#endif
1146 }
1147 else
1148 {
1149 pty_ev.stop ();
1150
1151 if (!OPTION (Opt_hold))
1052 destroy (); 1152 destroy ();
1153 }
1053 1154
1054 return false; 1155 return false;
1055} 1156}
1056 1157
1057void 1158void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1160{
1060 SET_R (this); 1161 make_current ();
1061 SET_LOCALE (locale);
1062 1162
1063 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ()) 1165 while (pty_fill ())
1066 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1071} 1171}
1072 1172
1073void 1173void
1074rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1075{ 1175{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1077 recolour_cursor (); 1177 recolour_cursor ();
1078 1178
1079#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1180 hidden_pointer = 0;
1081 1181
1082 if (options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif 1184#endif
1085} 1185}
1086 1186
1087#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1088void 1188void
1089rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1090{ 1190{
1091 if (! (options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1092 return; 1192 return;
1093 1193
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1095 XFlush (display->display); 1195 XFlush (xdisp);
1096 1196
1097 hidden_pointer = 1; 1197 hidden_pointer = 1;
1098} 1198}
1099 1199
1100void 1200void
1101rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1102{ 1202{
1103 SET_R (this); 1203 make_current ();
1104 SET_LOCALE (locale);
1105 1204
1106 pointer_blank (); 1205 pointer_blank ();
1107} 1206}
1108#endif 1207#endif
1109 1208
… …
1174 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1175 (32 + x + 1), 1274 (32 + x + 1),
1176 (32 + y + 1)); 1275 (32 + y + 1));
1177} 1276}
1178 1277
1179#ifdef USING_W11LIB
1180void
1181rxvt_W11_process_x_event (XEvent *ev)
1182{
1183 rxvt_t *r = rxvt_get_r ();
1184
1185 x_cb (*ev);
1186}
1187#endif
1188
1189/*{{{ process an X event */ 1278/*{{{ process an X event */
1190void 1279void
1191rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1192{ 1281{
1193 SET_R (this); 1282 make_current ();
1194 SET_LOCALE (locale);
1195 1283
1196#if defined(CURSOR_BLINK) 1284 dLocal (Display *, xdisp);
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1198 {
1199 if (hidden_cursor)
1200 {
1201 hidden_cursor = 0;
1202 want_refresh = 1;
1203 }
1204 1285
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 if (ev.xany.window == vt
1206 } 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1207#endif 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return;
1208 1290
1209#if defined(POINTER_BLANK) 1291 // for XQueryPointer
1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1211 {
1212 if (ev.type == MotionNotify
1213 || ev.type == ButtonPress
1214 || ev.type == ButtonRelease)
1215 if (hidden_pointer)
1216 pointer_unblank ();
1217
1218 if (ev.type == KeyPress && hidden_pointer == 0)
1219 pointer_blank ();
1220 }
1221#endif
1222
1223 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1224 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1225 unsigned int unused_mask; 1294 unsigned int unused_mask;
1226 1295
1227 switch (ev.type) 1296 switch (ev.type)
… …
1234 1303
1235 break; 1304 break;
1236 1305
1237 case KeyRelease: 1306 case KeyRelease:
1238 { 1307 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1240 KeySym ks; 1309 KeySym keysym;
1241 1310
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif 1312#endif
1244 1313
1245#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support 1315 // ISO 14755 support
1247 if (iso14755buf) 1316 if (iso14755buf)
… …
1252# endif 1321# endif
1253# if ISO_14755 1322# if ISO_14755
1254 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1255 // first: controls 1324 // first: controls
1256 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1259 { 1328 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1261 commit_iso14755 (); 1330 commit_iso14755 ();
1262 return; // case-break; 1331 goto skip_switch;
1263 } 1332 }
1264 1333
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks) 1335 if (i[0] == keysym)
1267 { 1336 {
1268 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 (); 1338 commit_iso14755 ();
1270 return; // case-break; 1339 goto skip_switch;
1271 } 1340 }
1272 1341
1273 scr_bell (); 1342 scr_bell ();
1274# endif 1343# endif
1275 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1294 else 1363 else
1295 iso14755buf = 0; 1364 iso14755buf = 0;
1296 } 1365 }
1297#endif 1366#endif
1298 1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1300 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1303 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1304#endif 1377#endif
1305 break; 1378 break;
1306 } 1379 }
1307 1380
… …
1313 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1314 break; 1387 break;
1315 1388
1316 case ClientMessage: 1389 case ClientMessage:
1317 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1319 destroy ();
1320#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink))
1326 { 1392 {
1327 /* Get Dnd data */ 1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1328 Atom ActualType; 1394 {
1329 int ActualFormat; 1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1330 unsigned char *data; 1396 {
1331 unsigned long Size, RemainingBytes; 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1332 1398 {
1333 XGetWindowProperty (display->display, display->root, 1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1334 xa[XA_DNDSELECTION], 1400 destroy ();
1335 0L, 1000000L, 1401 }
1336 False, AnyPropertyType, 1402#if ENABLE_EWMH
1337 &ActualType, &ActualFormat, 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1338 &Size, &RemainingBytes, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1339 &data); 1406 &ev);
1340 set_string_property (XA_CUT_BUFFER0, data); 1407#endif
1341 XFree (data); 1408 }
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1409 }
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1410#if ENABLE_XEMBED
1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1412 {
1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1414 focus_in ();
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out ();
1417 }
1418#endif
1344 } 1419 }
1345#endif /* OFFIX_DND */
1346 break; 1420 break;
1347 1421
1348 case MappingNotify: 1422 case MappingNotify:
1349 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1350 break; 1424 break;
… …
1373 break; 1447 break;
1374 } 1448 }
1375 break; 1449 break;
1376 1450
1377 case FocusIn: 1451 case FocusIn:
1378 if (!TermWin.focus) 1452 focus_in ();
1453 break;
1454
1455 case FocusOut:
1456 focus_out ();
1457 break;
1458
1459 case ConfigureNotify:
1460 if (ev.xconfigure.window == parent[0])
1379 { 1461 {
1380 TermWin.focus = 1; 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 { 1463 ;
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400 1464
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1447
1448 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1466 {
1450 seen_resize = 1; 1467 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1469 }
1453 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1456 check_our_parents (); 1475 check_our_parents ();
1457#endif 1476#endif
1458 } 1477 }
1459 break; 1478 break;
1460 1479
1461 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465 1485
1466 break; 1486 break;
1467 1487
1468 case SelectionClear: 1488 case SelectionClear:
1469 selection_clear (); 1489 selection_clear ();
… …
1476 1496
1477 case SelectionRequest: 1497 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1479 break; 1499 break;
1480 1500
1501 case MapNotify:
1502 mapped = 1;
1503#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1505#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break;
1508
1481 case UnmapNotify: 1509 case UnmapNotify:
1482 TermWin.mapped = 0; 1510 mapped = 0;
1483#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1485#endif 1513#endif
1486 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1487
1488 case MapNotify:
1489 TermWin.mapped = 1;
1490#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif
1493 break; 1515 break;
1494 1516
1495#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1496 case ReparentNotify: 1518 case ReparentNotify:
1497 rootwin_cb (ev); 1519 rootwin_cb (ev);
1498 break; 1520 break;
1499#endif /* TRANSPARENT */ 1521#endif /* TRANSPARENT */
1500 1522
1501 case GraphicsExpose: 1523 case GraphicsExpose:
1502 case Expose: 1524 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1525 if (ev.xany.window == vt)
1504 { 1526 {
1505 do 1527 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1509 1531
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1533
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1515 1537
1516 scr_refresh (refresh_type); 1538 want_refresh = 1;
1517 } 1539 }
1518 else 1540 else
1519 { 1541 {
1520 XEvent unused_event; 1542 XEvent unused_event;
1521 1543
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1523 ; 1545 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1547 ;
1526 1548
1527 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1528 { 1550 {
1529 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1530 scrollbar_show (0); 1552 scrollbar_show (0);
1531 } 1553 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536 1554
1537#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1540#endif 1558#endif
1541 } 1559 }
1542 break; 1560 break;
1543 1561
1544 case MotionNotify: 1562 case MotionNotify:
1545#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1564 if (hidden_pointer)
1547 pointer_unblank (); 1565 pointer_unblank ();
1548#endif 1566#endif
1549#if MENUBAR
1550 if (isMenuBarWindow (ev.xany.window))
1551 {
1552 menubar_control (ev.xbutton);
1553 break;
1554 }
1555#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1568 break;
1558 1569
1559 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1560 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1576 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1564 ; 1578 ;
1565 1579
1566 XQueryPointer (display->display, TermWin.vt, 1580 XQueryPointer (xdisp, vt,
1567 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1584 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1583#endif 1597#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1598 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1599 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1600
1587#ifdef SELECTION_SCROLLING 1601#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1602 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1603 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1604 {
1591 int dist; 1605 int dist;
1592 1606
1593 /* don't clobber the current delay if we are 1607 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1608 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1616 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1617 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1618 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1619
1606 /* calc number of lines to scroll */ 1620 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1621 if (ev.xbutton.y < int_bwidth)
1608 { 1622 {
1609 scroll_selection_dir = UP; 1623 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1624 dist = int_bwidth - ev.xbutton.y;
1611 } 1625 }
1612 else 1626 else
1613 { 1627 {
1614 scroll_selection_dir = DN; 1628 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1629 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1630 }
1617 1631
1618 scroll_selection_lines = Pixel2Height (dist) 1632 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1633 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1634 + 1;
1621 MIN_IT (scroll_selection_lines, 1635 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1636 SELECTION_SCROLL_MAX_LINES);
1623 } 1637 }
1624 else 1638 else
1625 { 1639 {
1626 /* we are within the text window, so we 1640 /* we are within the text window, so we
… …
1635#endif 1649#endif
1636 } 1650 }
1637 } 1651 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1653 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1641 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1642 ; 1656 ;
1643 1657
1644 XQueryPointer (display->display, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1645 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1662 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1664 scrollbar_size ());
1651 scr_refresh (refresh_type); 1665 want_refresh = 1;
1652 refresh_limit = 0; 1666 refresh_limit = 0;
1653 scrollbar_show (1); 1667 scrollbar_show (1);
1654 } 1668 }
1655 break; 1669 break;
1656 } 1670 }
1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1700}
1701
1702void
1703rxvt_term::focus_in ()
1704{
1705 if (!focus)
1706 {
1707 focus = 1;
1708 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1712#if USE_XIM
1713 if (Input_Context != NULL)
1714 {
1715 IMSetStatusPosition ();
1716 XSetICFocus (Input_Context);
1717 }
1718#endif
1719#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif
1723#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade])
1725 {
1726 pix_colors = pix_colors_focused;
1727 scr_recolour ();
1728 }
1729#endif
1730 }
1731}
1732
1733void
1734rxvt_term::focus_out ()
1735{
1736 if (focus)
1737 {
1738 focus = 0;
1739 want_refresh = 1;
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1742
1743#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf)
1745 {
1746 iso14755buf = 0;
1747# if ENABLE_OVERLAY
1748 scr_overlay_off ();
1749# endif
1750 }
1751#endif
1752#if USE_XIM
1753 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context);
1755#endif
1756#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink))
1758 cursor_blink_ev.stop ();
1759 hidden_cursor = 0;
1760#endif
1761#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade])
1763 {
1764 pix_colors = pix_colors_unfocused;
1765 scr_recolour ();
1766 }
1767#endif
1768 }
1657} 1769}
1658 1770
1659#if TRANSPARENT 1771#if TRANSPARENT
1660void 1772void
1661rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1774{
1663 SET_R (this); 1775 make_current ();
1664 SET_LOCALE (locale);
1665 1776
1666 switch (ev.type) 1777 switch (ev.type)
1667 { 1778 {
1668 case PropertyNotify: 1779 case PropertyNotify:
1669 /* 1780 /*
… …
1674 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675 return; 1786 return;
1676 1787
1677 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1678 case ReparentNotify: 1789 case ReparentNotify:
1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1680 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1681 break; 1792 break;
1682 } 1793 }
1683} 1794}
1684#endif 1795#endif
… …
1687rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1688{ 1799{
1689 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1690 1801
1691 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1692 if (!bypass_keystate) 1804 if (!bypass_keystate)
1693 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1694 1806
1695 /* 1807 /*
1696 * VT window processing of button press 1808 * VT window processing of button press
1697 */ 1809 */
1698 if (ev.window == TermWin.vt) 1810 if (ev.window == vt)
1699 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1700#if ISO_14755 1815#if ISO_14755
1701 // 5.4 1816 // 5.4
1702 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703 { 1818 {
1704 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1716#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1717 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1718 { 1833 {
1719 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1720 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1721 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1722 { 1838 {
1723 /* only report double clicks */ 1839 /* only report double clicks */
1724 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1725 mouse_report (ev); 1841 mouse_report (ev);
… …
1751 { 1867 {
1752 case Button1: 1868 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1869 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1870 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1871#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1872 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1873#else
1758 selection.rect = false; 1874 selection.rect = false;
1759#endif 1875#endif
1760 1876
1761 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1763 { 1879 {
1764 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1765 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1766 else 1882 else
1767 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1908 case Button3: 2024 case Button3:
1909 if (scrollBar.style != R_SB_XTERM) 2025 if (scrollBar.style != R_SB_XTERM)
1910 { 2026 {
1911 if (scrollbar_above_slider (ev.y)) 2027 if (scrollbar_above_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1913 scr_page (UP, TermWin.nrow - 1); 2029 scr_page (UP, nrow - 1);
1914# else 2030# else
1915 scr_page (UP, TermWin.nrow / 4); 2031 scr_page (UP, nrow / 4);
1916# endif 2032# endif
1917 else if (scrollbar_below_slider (ev.y)) 2033 else if (scrollbar_below_slider (ev.y))
1918# ifdef RXVT_SCROLL_FULL 2034# ifdef RXVT_SCROLL_FULL
1919 scr_page (DN, TermWin.nrow - 1); 2035 scr_page (DN, nrow - 1);
1920# else 2036# else
1921 scr_page (DN, TermWin.nrow / 4); 2037 scr_page (DN, nrow / 4);
1922# endif 2038# endif
1923 else 2039 else
1924 scrollBar.setMotion (); 2040 scrollBar.setMotion ();
1925 } 2041 }
1926 else 2042 else
1927 { 2043 {
1928 scr_page ((ev.button == Button1 ? DN : UP), 2044 scr_page ((ev.button == Button1 ? DN : UP),
1929 (TermWin.nrow 2045 (nrow
1930 * scrollbar_position (ev.y) 2046 * scrollbar_position (ev.y)
1931 / scrollbar_size ())); 2047 / scrollbar_size ()));
1932 } 2048 }
1933 2049
1934 break; 2050 break;
1935 } 2051 }
1936 } 2052 }
2053
1937 return; 2054 return;
1938 } 2055 }
1939#if MENUBAR
1940 /*
1941 * Menubar window processing of button press
1942 */
1943 if (isMenuBarWindow (ev.window))
1944 menubar_control (ev);
1945#endif
1946} 2056}
1947 2057
1948void 2058void
1949rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
1950{ 2060{
… …
1956 2066
1957 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1958 { 2068 {
1959 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1960 scrollbar_show (0); 2070 scrollbar_show (0);
1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1962 refresh_type &= ~SMOOTH_REFRESH;
1963#endif
1964 } 2071 }
1965 2072
1966#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1967 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
1969#endif 2076#endif
1970 2077
1971 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1972 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
1973#if ISO_14755 2083#if ISO_14755
1974 // 5.4 2084 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return; 2086 return;
1977#endif 2087#endif
2088
1978 if (reportmode) 2089 if (reportmode)
1979 { 2090 {
1980 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1981 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1982 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2012 { 2123 {
2013 case Button1: 2124 case Button1:
2014 case Button3: 2125 case Button3:
2015 selection_make (ev.time); 2126 selection_make (ev.time);
2016 break; 2127 break;
2128
2017 case Button2: 2129 case Button2:
2018 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2019 break; 2132 break;
2133
2020#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2021 case Button4: 2135 case Button4:
2022 case Button5: 2136 case Button5:
2023 { 2137 {
2024 int i; 2138 int i;
… …
2026 2140
2027 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2028 2142
2029 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2030 i = 1; 2144 i = 1;
2031 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2032 i = TermWin.nrow - 1; 2146 i = nrow - 1;
2033 else 2147 else
2034 i = 5; 2148 i = 5;
2035 2149
2036# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
2037 if (ev.state & ControlMask) 2151 if (ev.state & ControlMask)
2038 { 2152 {
2039 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042 2156
2043 if (slip_wheel_ev.at < NOW) 2157 if (slip_wheel_ev.at < NOW)
2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045 2159
2046 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2047 } 2161 }
2048 else 2162 else
2049 { 2163 {
2050# endif 2164# endif
2051# ifdef JUMP_MOUSE_WHEEL
2052 scr_page (v, i); 2165 scr_page (v, i);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1); 2166 scrollbar_show (1);
2055# else
2056 while (i--)
2057 {
2058 scr_page (v, 1);
2059 scr_refresh (SMOOTH_REFRESH);
2060 scrollbar_show (1);
2061 }
2062# endif
2063# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2064 } 2168 }
2065#endif 2169# endif
2066 } 2170 }
2067 break; 2171 break;
2068#endif 2172#endif
2069 } 2173 }
2070 } 2174 }
2071#ifdef MENUBAR
2072 else if (isMenuBarWindow (ev.window))
2073 menubar_control (ev);
2074#endif
2075} 2175}
2076 2176
2077#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2078#if TINTING 2178#if TINTING
2079/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2080 2180
2081typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2082 2182
2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2084{ 2184{
2085 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2086 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2190 int i;
2091 2191
2092 Visual* visual = display->visual; 2192 Visual *visual = term->visual;
2093 2193
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2195
2096 /* for convenience */ 2196 /* for convenience */
2097 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2321 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2323 2423
2324 pchanged = 0; 2424 pchanged = 0;
2325 2425
2326 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2328 2428
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2331 2431
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2333 2433
2334 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2335 { 2435 {
2336 if (am_transparent) 2436 if (am_transparent)
2337 { 2437 {
2338 pchanged = 1; 2438 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2341 } 2441 }
2342 2442
2343 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2344 } 2444 }
2345 2445
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2447 XSync (xdisp, False);
2348 2448
2349 /* 2449 /*
2350 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2353 */ 2453 */
2354 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2358 2458
2359 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2364 2464
2365 if (!i || prop == NULL 2465 if (!i || prop == NULL
2366#if TINTING 2466#if TINTING
2367 || !rs[Rs_color + Color_tint] 2467 || !ISSET_PIXCOLOR (Color_tint)
2368#endif 2468#endif
2369 ) 2469 )
2370 have_pixmap = 0; 2470 have_pixmap = 0;
2371 else 2471 else
2372 { 2472 {
… …
2385 Window cr; 2485 Window cr;
2386 XImage *image; 2486 XImage *image;
2387 GC gc; 2487 GC gc;
2388 XGCValues gcvalue; 2488 XGCValues gcvalue;
2389 2489
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2494 nx = ny = 0;
2395 2495
… …
2405 nh += sy; 2505 nh += sy;
2406 ny = -sy; 2506 ny = -sy;
2407 sy = 0; 2507 sy = 0;
2408 } 2508 }
2409 2509
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2412 2512
2413 XSync (display->display, False); 2513 XSync (xdisp, False);
2414 allowedxerror = -1; 2514 allowedxerror = -1;
2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416 2516
2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2418 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2419 allowedxerror = 0; 2519 allowedxerror = 0;
2420 2520
2421 if (image == NULL) 2521 if (image == NULL)
2422 { 2522 {
2423 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2424 { 2524 {
2425 pchanged = 1; 2525 pchanged = 1;
2426 if (TermWin.pixmap != None) 2526 if (pixmap != None)
2427 { 2527 {
2428 XFreePixmap (display->display, TermWin.pixmap); 2528 XFreePixmap (xdisp, pixmap);
2429 TermWin.pixmap = None; 2529 pixmap = None;
2430 } 2530 }
2431 } 2531 }
2432 2532
2433 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2434 } 2534 }
2435 else 2535 else
2436 { 2536 {
2437 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2438 XFreePixmap (display->display, TermWin.pixmap); 2538 XFreePixmap (xdisp, pixmap);
2439 2539
2440#if TINTING 2540#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2442 { 2542 {
2443 unsigned short rm, gm, bm;
2444 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2445 2544
2545 rgba c;
2446 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2447 2547
2448 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2449 } 2549 }
2450#endif 2550#endif
2451 2551
2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2453 szHint.width, szHint.height, image->depth);
2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2456 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2457 XFreeGC (display->display, gc); 2556 XFreeGC (xdisp, gc);
2458 XDestroyImage (image); 2557 XDestroyImage (image);
2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2461 2560
2462 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2463 pchanged = 1; 2562 pchanged = 1;
2464 2563
2465 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2466 } 2565 }
2467 } 2566 }
2468 2567
2469 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2471 else 2570 else
2472 { 2571 {
2473 unsigned int n; 2572 unsigned int n;
2474 /* 2573 /*
2475 * InheritPixmap transparency 2574 * InheritPixmap transparency
2476 */ 2575 */
2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2478 { 2577 {
2479 oldp = TermWin.parent[i]; 2578 oldp = parent[i];
2480 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2481 &TermWin.parent[i], &list, &n);
2482 XFree (list); 2580 XFree (list);
2483 2581
2484 if (TermWin.parent[i] == display->root) 2582 if (parent[i] == display->root)
2485 { 2583 {
2486 if (oldp != None) 2584 if (oldp != None)
2487 pchanged = 1; 2585 pchanged = 1;
2488 2586
2489 break; 2587 break;
2490 } 2588 }
2491 2589
2492 if (oldp != TermWin.parent[i]) 2590 if (oldp != parent[i])
2493 pchanged = 1; 2591 pchanged = 1;
2494 } 2592 }
2495 2593
2496 n = 0; 2594 n = 0;
2497 2595
2498 if (pchanged) 2596 if (pchanged)
2499 {
2500 for (; n < (unsigned int)i; n++) 2597 for (; n < (unsigned int)i; n++)
2501 { 2598 {
2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504 { 2602 {
2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2506 break; 2604 break;
2507 } 2605 }
2508 } 2606 }
2607
2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2509 } 2609 {
2510
2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2512 {
2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2515 am_transparent = 0; 2612 am_transparent = 0;
2516 /* XXX: also turn off Opt_transparent? */ 2613 /* XXX: also turn off Opt_transparent? */
2517 } 2614 }
2518 else 2615 else
2519 { 2616 {
2520#if WAIT_FOR_WM
2521 /* wait (an arbitrary period) for the WM to do its thing
2522 * needed for fvwm2.2.2 (and before?) */
2523 sleep (1);
2524#endif
2525 for (n = 0; n < (unsigned int)i; n++) 2617 for (n = 0; n < (unsigned int)i; n++)
2526 { 2618 {
2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]); 2620 XClearWindow (xdisp, parent[n]);
2529 } 2621 }
2530 2622
2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2532 am_transparent = 1; 2624 am_transparent = 1;
2533 } 2625 }
2534 2626
2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2536 TermWin.parent[i] = None; 2628 parent[i] = None;
2537 } 2629 }
2538 2630
2539 if (scrollBar.win) 2631 if (scrollBar.win)
2540 { 2632 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle (); 2634 scrollBar.setIdle ();
2543 scrollbar_show (0); 2635 scrollbar_show (0);
2544 } 2636 }
2545 2637
2546 if (am_transparent) 2638 if (am_transparent)
… …
2558 2650
2559bool 2651bool
2560rxvt_term::cmd_parse () 2652rxvt_term::cmd_parse ()
2561{ 2653{
2562 bool flag = false; 2654 bool flag = false;
2563 unicode_t ch = NOCHAR; 2655 wchar_t ch = NOCHAR;
2564 unsigned char *seq_begin; // remember start of esc-sequence here 2656 char *seq_begin; // remember start of esc-sequence here
2565 2657
2566 for (;;) 2658 for (;;)
2567 { 2659 {
2568 if (ch == NOCHAR) 2660 if (ch == NOCHAR)
2569 { 2661 {
2570 seq_begin = cmdbuf_ptr; 2662 seq_begin = cmdbuf_ptr;
2571 ch = next_char (); 2663 ch = next_char ();
2572 }
2573 2664
2574 if (ch == NOCHAR) // TODO: improve 2665 if (ch == NOCHAR)
2575 break; 2666 break;
2667 }
2576 2668
2577 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2669 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2578 { 2670 {
2579 if (!seen_input) 2671 if (!seen_input)
2580 { 2672 {
… …
2584 // some window managers resize the window early, and these programs 2676 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong. 2677 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike 2678 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being 2679 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized. 2680 // resized.
2589 if (seen_resize) 2681 if (seen_resize && cmd_pid)
2590 kill (-cmd_pid, SIGWINCH); 2682 kill (-cmd_pid, SIGWINCH);
2591 } 2683 }
2592 2684
2593 /* Read a text string from the input buffer */ 2685 /* Read a text string from the input buffer */
2594 unicode_t buf[UBUFSIZ]; 2686 wchar_t buf[UBUFSIZ];
2595 bool refreshnow = false; 2687 bool refreshnow = false;
2596 int nlines = 0; 2688 int nlines = 0;
2597 unicode_t *str = buf; 2689 wchar_t *str = buf;
2690 wchar_t *eol = str + min (ncol, UBUFSIZ);
2598 2691
2599 for (;;) 2692 for (;;)
2600 { 2693 {
2601 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2694 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2602 break; 2695 break;
2603 2696
2604 *str++ = ch; 2697 *str++ = ch;
2605 2698
2606 if (ch == C0_LF) 2699 if (ch == C0_LF || str >= eol)
2607 { 2700 {
2701 if (ch == C0_LF)
2608 nlines++; 2702 nlines++;
2703
2609 refresh_count++; 2704 refresh_count++;
2610 2705
2611 if (!(options & Opt_jumpScroll) 2706 if (!OPTION (Opt_jumpScroll)
2612 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2707 || (refresh_count >= refresh_limit * (nrow - 1)))
2613 { 2708 {
2614 refreshnow = true; 2709 refreshnow = true;
2710 refresh_count = 0;
2615 ch = NOCHAR; 2711 ch = NOCHAR;
2616 break; 2712 break;
2617 } 2713 }
2618 2714
2619 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2715 // scr_add_lines only works for nlines <= nrow - 1.
2620 if (nlines >= TermWin.nrow - 1) 2716 if (nlines >= nrow - 1)
2621 { 2717 {
2718 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2719 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2622 scr_add_lines (buf, nlines, str - buf); 2720 scr_add_lines (buf, str - buf, nlines);
2721
2623 nlines = 0; 2722 nlines = 0;
2624 str = buf; 2723 str = buf;
2724 eol = str + min (ncol, UBUFSIZ);
2625 } 2725 }
2626 }
2627 2726
2628 if (str >= buf + UBUFSIZ) 2727 if (str >= eol)
2629 { 2728 {
2729 if (eol >= buf + UBUFSIZ)
2730 {
2630 ch = NOCHAR; 2731 ch = NOCHAR;
2631 break; 2732 break;
2733 }
2734 else
2735 eol = min (eol + ncol, buf + UBUFSIZ);
2736 }
2737
2632 } 2738 }
2633 2739
2634 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2635 ch = next_char (); 2741 ch = next_char ();
2636 } 2742 }
2637 2743
2744 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2745 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2746 scr_add_lines (buf, str - buf, nlines);
2639 2747
2640 /* 2748 /*
2641 * If there have been a lot of new lines, then update the screen 2749 * If there have been a lot of new lines, then update the screen
2642 * What the heck I'll cheat and only refresh less than every page-full. 2750 * What the heck I'll cheat and only refresh less than every page-full.
2643 * the number of pages between refreshes is refresh_limit, which 2751 * the number of pages between refreshes is refresh_limit, which
2644 * is incremented here because we must be doing flat-out scrolling. 2752 * is incremented here because we must be doing flat-out scrolling.
2645 */ 2753 */
2646 if (refreshnow) 2754 if (refreshnow)
2647 { 2755 {
2648 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2649 refresh_limit++; 2757 refresh_limit++;
2650 else 2758 else
2651 { 2759 {
2652 flag = true; 2760 flag = true;
2653 scr_refresh (refresh_type); 2761 scr_refresh ();
2762 want_refresh = 1;
2654 } 2763 }
2655 } 2764 }
2656 2765
2657 } 2766 }
2658 else 2767 else
… …
2673 } 2782 }
2674 2783
2675 return flag; 2784 return flag;
2676} 2785}
2677 2786
2678// read the next octet
2679unicode_t
2680rxvt_term::next_octet ()
2681{
2682 return cmdbuf_ptr < cmdbuf_endp
2683 ? *cmdbuf_ptr++
2684 : NOCHAR;
2685}
2686
2687// read the next character 2787// read the next character
2688unicode_t 2788wchar_t
2689rxvt_term::next_char () 2789rxvt_term::next_char () NOTHROW
2690{ 2790{
2691 while (cmdbuf_ptr < cmdbuf_endp) 2791 while (cmdbuf_ptr < cmdbuf_endp)
2692 { 2792 {
2693 // assume 7-bit to be ascii ALWAYS 2793 // assume 7-bit to be ascii ALWAYS
2694 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2794 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2695 return *cmdbuf_ptr++; 2795 return *cmdbuf_ptr++;
2696 2796
2697 wchar_t wc; 2797 wchar_t wc;
2698 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2798 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2699 2799
2700 if (len == (size_t)-2) 2800 if (len == (size_t)-2)
2701 { 2801 {
2702 // the mbstate stores incomplete sequences. didn't know this :/ 2802 // the mbstate stores incomplete sequences. didn't know this :/
2703 cmdbuf_ptr = cmdbuf_endp; 2803 cmdbuf_ptr = cmdbuf_endp;
2704 break; 2804 break;
2705 } 2805 }
2706 2806
2707 if (len == (size_t)-1) 2807 if (len == (size_t)-1)
2708 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2808 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709 2809
2710 // assume wchar == unicode 2810 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2811 cmdbuf_ptr += len;
2712 return wc; 2812 return wc & UNICODE_MASK;
2713 } 2813 }
2714 2814
2715 return NOCHAR; 2815 return NOCHAR;
2716} 2816}
2817
2818// read the next octet
2819uint32_t
2820rxvt_term::next_octet () NOTHROW
2821{
2822 return cmdbuf_ptr < cmdbuf_endp
2823 ? (unsigned char)*cmdbuf_ptr++
2824 : NOCHAR;
2825}
2826
2827static class out_of_input out_of_input;
2717 2828
2718/* rxvt_cmd_getc () - Return next input character */ 2829/* rxvt_cmd_getc () - Return next input character */
2719/* 2830/*
2720 * Return the next input character after first passing any keyboard input 2831 * Return the next input character after first passing any keyboard input
2721 * to the command. 2832 * to the command.
2722 */ 2833 */
2723unicode_t 2834wchar_t
2724rxvt_term::cmd_getc () 2835rxvt_term::cmd_getc () THROW ((class out_of_input))
2725{ 2836{
2726 unicode_t c = next_char (); 2837 wchar_t c = next_char ();
2727 2838
2728 if (c == NOCHAR) 2839 if (c == NOCHAR)
2729 throw out_of_input; 2840 throw out_of_input;
2730 2841
2731 return c; 2842 return c;
2732} 2843}
2733 2844
2734unicode_t 2845uint32_t
2735rxvt_term::cmd_get8 () 2846rxvt_term::cmd_get8 () THROW ((class out_of_input))
2736{ 2847{
2737 unicode_t c = next_octet (); 2848 uint32_t c = next_octet ();
2738 2849
2739 if (c == NOCHAR) 2850 if (c == NOCHAR)
2740 throw out_of_input; 2851 throw out_of_input;
2741 2852
2742 return c; 2853 return c;
… …
2842 case C0_ESC: 2953 case C0_ESC:
2843 process_escape_seq (); 2954 process_escape_seq ();
2844 break; 2955 break;
2845 case C0_ENQ: /* terminal Status */ 2956 case C0_ENQ: /* terminal Status */
2846 if (rs[Rs_answerbackstring]) 2957 if (rs[Rs_answerbackstring])
2847 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2958 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2848 (unsigned int)strlen (rs[Rs_answerbackstring]));
2849 else 2959 else
2850 tt_write ((unsigned char *)VT100_ANS, 2960 tt_write (VT100_ANS, strlen (VT100_ANS));
2851 (unsigned int)strlen (VT100_ANS));
2852 break; 2961 break;
2853 case C0_BEL: /* bell */ 2962 case C0_BEL: /* bell */
2854 scr_bell (); 2963 scr_bell ();
2855 break; 2964 break;
2856 case C0_BS: /* backspace */ 2965 case C0_BS: /* backspace */
… …
2980 scr_charset_set (2, (unsigned int)cmd_getc ()); 3089 scr_charset_set (2, (unsigned int)cmd_getc ());
2981 break; 3090 break;
2982 case '+': 3091 case '+':
2983 scr_charset_set (3, (unsigned int)cmd_getc ()); 3092 scr_charset_set (3, (unsigned int)cmd_getc ());
2984 break; 3093 break;
2985#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
2986 case '6': 3095 case '6':
2987 scr_backindex (); 3096 scr_backindex ();
2988 break; 3097 break;
2989#endif 3098#endif
2990 case '7': 3099 case '7':
2991 scr_cursor (SAVE); 3100 scr_cursor (SAVE);
2992 break; 3101 break;
2993 case '8': 3102 case '8':
2994 scr_cursor (RESTORE); 3103 scr_cursor (RESTORE);
2995 break; 3104 break;
2996#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
2997 case '9': 3106 case '9':
2998 scr_forwardindex (); 3107 scr_forwardindex ();
2999 break; 3108 break;
3000#endif 3109#endif
3001 case '=': 3110 case '=':
… …
3011 break; 3120 break;
3012 3121
3013 /* 8.3.87: NEXT LINE */ 3122 /* 8.3.87: NEXT LINE */
3014 case C1_NEL: /* ESC E */ 3123 case C1_NEL: /* ESC E */
3015 { 3124 {
3016 unicode_t nlcr[] = { C0_LF, C0_CR }; 3125 wchar_t nlcr[] = { C0_LF, C0_CR };
3017 scr_add_lines (nlcr, 1, 2); 3126 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3018 } 3127 }
3019 break; 3128 break;
3020 3129
3021 /* kidnapped escape sequence: Should be 8.3.48 */ 3130 /* kidnapped escape sequence: Should be 8.3.48 */
3022 case C1_ESA: /* ESC G */ 3131 case C1_ESA: /* ESC G */
… …
3044 process_dcs_seq (); 3153 process_dcs_seq ();
3045 break; 3154 break;
3046 3155
3047 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3156 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3048 case C1_SCI: /* ESC Z */ 3157 case C1_SCI: /* ESC Z */
3049 tt_write ((const unsigned char *)ESCZ_ANSWER, 3158 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3050 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3051 break; /* steal obsolete ESC [ c */ 3159 break; /* steal obsolete ESC [ c */
3052 3160
3053 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3161 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3054 case C1_CSI: /* ESC [ */ 3162 case C1_CSI: /* ESC [ */
3055 process_csi_seq (); 3163 process_csi_seq ();
… …
3164 ndef = get_byte_array_bit (csi_defaults, i); 3272 ndef = get_byte_array_bit (csi_defaults, i);
3165 for (p = 0; p < nargs; p++) 3273 for (p = 0; p < nargs; p++)
3166 if (arg[p] == -1) 3274 if (arg[p] == -1)
3167 arg[p] = ndef; 3275 arg[p] = ndef;
3168 3276
3169#ifdef DEBUG_CMD
3170 fprintf (stderr, "CSI ");
3171 for (p = 0; p < nargs; p++)
3172 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3173 fprintf (stderr, "%c\n", ch);
3174#endif
3175
3176 /* 3277 /*
3177 * private mode handling 3278 * private mode handling
3178 */ 3279 */
3179 if (priv) 3280 if (priv)
3180 { 3281 {
3181 switch (priv) 3282 switch (priv)
3182 { 3283 {
3183 case '>': 3284 case '>':
3184 if (ch == CSI_DA) /* secondary device attributes */ 3285 if (ch == CSI_DA) /* secondary device attributes */
3286 {
3287 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3288 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3289 //
3290 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3291 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3292 // that we do not support xterm mouse reporting (should be 95 when we do).
3293 //
3185 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3294 tt_printf ("\033[>%d;94;0c", 'U');
3295 }
3186 break; 3296 break;
3187 case '?': 3297 case '?':
3188 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189 process_terminal_mode (ch, priv, nargs, arg); 3299 process_terminal_mode (ch, priv, nargs, arg);
3190 break; 3300 break;
… …
3295 3405
3296 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3406 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3297 arg[0] = -arg[0]; 3407 arg[0] = -arg[0];
3298 /* FALLTHROUGH */ 3408 /* FALLTHROUGH */
3299 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3409 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3300 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3410 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3301 break; 3411 break;
3302 3412
3303 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3413 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3304 tt_write ((const unsigned char *)VT100_ANS, 3414 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3305 (unsigned int) (sizeof (VT100_ANS) - 1));
3306 break; 3415 break;
3307 3416
3308 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3417 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3309 process_sgr_mode (nargs, arg); 3418 process_sgr_mode (nargs, arg);
3310 break; 3419 break;
… …
3317 break; 3426 break;
3318 case 6: /* CPR requested */ 3427 case 6: /* CPR requested */
3319 scr_report_position (); 3428 scr_report_position ();
3320 break; 3429 break;
3321 case 7: /* unofficial extension */ 3430 case 7: /* unofficial extension */
3322 if (options & Opt_insecure) 3431 if (OPTION (Opt_insecure))
3323 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3432 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3324 break; 3433 break;
3325 case 8: /* unofficial extension */ 3434 case 8: /* unofficial extension */
3326 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3435 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3327 break; 3436 break;
… …
3394 break; 3503 break;
3395 case CSI_75: 3504 case CSI_75:
3396 scr_cursor (RESTORE); 3505 scr_cursor (RESTORE);
3397 break; 3506 break;
3398 3507
3399#if ENABLE_FRILLS 3508#if !ENABLE_MINIMAL
3400 case CSI_74: 3509 case CSI_74:
3401 process_window_ops (arg, nargs); 3510 process_window_ops (arg, nargs);
3402 break; 3511 break;
3403#endif 3512#endif
3404 3513
… …
3411 break; 3520 break;
3412 } 3521 }
3413} 3522}
3414/*}}} */ 3523/*}}} */
3415 3524
3416#if ENABLE_FRILLS 3525#if !ENABLE_MINIMAL
3417/* ARGSUSED */ 3526/* ARGSUSED */
3418void 3527void
3419rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3528rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420{ 3529{
3421 int x, y; 3530 int x, y;
3422 XWindowAttributes wattr; 3531 XWindowAttributes wattr;
3423 Window wdummy; 3532 Window wdummy;
3533
3534 dLocal (Display *, xdisp);
3424 3535
3425 if (nargs == 0) 3536 if (nargs == 0)
3426 return; 3537 return;
3427 3538
3428 switch (args[0]) 3539 switch (args[0])
3429 { 3540 {
3430 /* 3541 /*
3431 * commands 3542 * commands
3432 */ 3543 */
3433 case 1: /* deiconify window */ 3544 case 1: /* deiconify window */
3434 XMapWindow (display->display, TermWin.parent[0]); 3545 XMapWindow (xdisp, parent[0]);
3435 break; 3546 break;
3436 case 2: /* iconify window */ 3547 case 2: /* iconify window */
3437 XIconifyWindow (display->display, TermWin.parent[0], 3548 XIconifyWindow (xdisp, parent[0], display->screen);
3438 DefaultScreen (display->display));
3439 break; 3549 break;
3440 case 3: /* set position (pixels) */ 3550 case 3: /* set position (pixels) */
3441 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3551 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3442 break; 3552 break;
3443 case 4: /* set size (pixels) */ 3553 case 4: /* set size (pixels) */
3444 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445 break; 3555 break;
3446 case 5: /* raise window */ 3556 case 5: /* raise window */
3447 XRaiseWindow (display->display, TermWin.parent[0]); 3557 XRaiseWindow (xdisp, parent[0]);
3448 break; 3558 break;
3449 case 6: /* lower window */ 3559 case 6: /* lower window */
3450 XLowerWindow (display->display, TermWin.parent[0]); 3560 XLowerWindow (xdisp, parent[0]);
3451 break; 3561 break;
3452 case 7: /* refresh window */ 3562 case 7: /* refresh window */
3453 scr_touch (true); 3563 scr_touch (true);
3454 break; 3564 break;
3455 case 8: /* set size (chars) */ 3565 case 8: /* set size (chars) */
3456 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3566 set_widthheight ((unsigned int) (args[2] * fwidth),
3457 (unsigned int) (args[1] * TermWin.fheight)); 3567 (unsigned int) (args[1] * fheight));
3458 break; 3568 break;
3459 3569
3460 //case 9: NYI, TODO, restore maximized window or maximize window 3570 //case 9: NYI, TODO, restore maximized window or maximize window
3461 default: 3571 default:
3462 if (args[0] >= 24) /* set height (chars) */ 3572 if (args[0] >= 24) /* set height (chars) */
3463 set_widthheight ((unsigned int)TermWin.width, 3573 set_widthheight ((unsigned int)width,
3464 (unsigned int) (args[1] * TermWin.fheight)); 3574 (unsigned int) (args[1] * fheight));
3465 break; 3575 break;
3466
3467 3576
3468 /* 3577 /*
3469 * reports - some output format copied from XTerm 3578 * reports - some output format copied from XTerm
3470 */ 3579 */
3471 case 11: /* report window state */ 3580 case 11: /* report window state */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3582 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474 break; 3583 break;
3475 case 13: /* report window position */ 3584 case 13: /* report window position */
3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3585 XGetWindowAttributes (xdisp, parent[0], &wattr);
3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3586 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3478 -wattr.border_width, -wattr.border_width, 3587 -wattr.border_width, -wattr.border_width,
3479 &x, &y, &wdummy); 3588 &x, &y, &wdummy);
3480 tt_printf ("\033[3;%d;%dt", x, y); 3589 tt_printf ("\033[3;%d;%dt", x, y);
3481 break; 3590 break;
3482 case 14: /* report window size (pixels) */ 3591 case 14: /* report window size (pixels) */
3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (xdisp, parent[0], &wattr);
3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3593 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485 break; 3594 break;
3486 case 18: /* report text area size (chars) */ 3595 case 18: /* report text area size (chars) */
3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3596 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3488 break; 3597 break;
3489 case 19: /* report window size (chars) */ 3598 case 19: /* report window size (chars) */
3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3599 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3491 break; 3600 break;
3492 case 20: /* report icon label */ 3601 case 20: /* report icon label */
3493 { 3602 {
3494 char *s; 3603 char *s;
3495 XGetIconName (display->display, TermWin.parent[0], &s); 3604 XGetIconName (xdisp, parent[0], &s);
3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3605 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s); 3606 XFree (s);
3498 } 3607 }
3499 break; 3608 break;
3500 case 21: /* report window title */ 3609 case 21: /* report window title */
3501 { 3610 {
3502 char *s; 3611 char *s;
3503 XFetchName (display->display, TermWin.parent[0], &s); 3612 XFetchName (xdisp, parent[0], &s);
3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3613 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s); 3614 XFree (s);
3506 } 3615 }
3507 break; 3616 break;
3508 } 3617 }
3509} 3618}
… …
3512/*----------------------------------------------------------------------*/ 3621/*----------------------------------------------------------------------*/
3513/* 3622/*
3514 * get input up until STRING TERMINATOR (or BEL) 3623 * get input up until STRING TERMINATOR (or BEL)
3515 * ends_how is terminator used. returned input must be free()'d 3624 * ends_how is terminator used. returned input must be free()'d
3516 */ 3625 */
3517unsigned char * 3626char *
3518rxvt_term::get_to_st (unicode_t &ends_how) 3627rxvt_term::get_to_st (unicode_t &ends_how)
3519{ 3628{
3520 unicode_t ch; 3629 unicode_t ch;
3521 bool seen_esc = false; 3630 bool seen_esc = false;
3522 unsigned int n = 0; 3631 unsigned int n = 0;
… …
3541 else if (ch < 0x20) 3650 else if (ch < 0x20)
3542 return NULL; /* other control character - exit */ 3651 return NULL; /* other control character - exit */
3543 3652
3544 seen_esc = false; 3653 seen_esc = false;
3545 3654
3546 if (n >= sizeof (string) - 1) 3655 if (n >= STRING_MAX - 1)
3547 // stop at some sane length 3656 // stop at some sane length
3548 return NULL; 3657 return NULL;
3549 3658
3550 if (ch == C0_SYN) 3659 if (ch == C0_SYN)
3551 string[n++] = cmd_get8 (); 3660 string[n++] = cmd_get8 ();
… …
3555 3664
3556 string[n++] = '\0'; 3665 string[n++] = '\0';
3557 3666
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3667 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 3668
3560 return (unsigned char *)rxvt_wcstombs (string); 3669 return rxvt_wcstombs (string);
3561} 3670}
3562 3671
3563/*----------------------------------------------------------------------*/ 3672/*----------------------------------------------------------------------*/
3564/* 3673/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3674 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3566 */ 3675 */
3567void 3676void
3568rxvt_term::process_dcs_seq () 3677rxvt_term::process_dcs_seq ()
3569{ 3678{
3570 unsigned char *s; 3679 char *s;
3571 unicode_t eh; 3680 unicode_t eh;
3572 3681
3573 /* 3682 /*
3574 * Not handled yet 3683 * Not handled yet
3575 */ 3684 */
… …
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3703 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3704 arg = arg * 10 + (ch - '0');
3596 3705
3597 if (ch == ';') 3706 if (ch == ';')
3598 { 3707 {
3599 unsigned char *s = get_to_st (eh); 3708 char *s = get_to_st (eh);
3600 3709
3601 if (s) 3710 if (s)
3602 { 3711 {
3603 process_xterm_seq (arg, (char *)s, eh); 3712 process_xterm_seq (arg, s, eh);
3604 free (s); 3713 free (s);
3605 } 3714 }
3606 } 3715 }
3607} 3716}
3608 3717
3609void 3718void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3719rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3611{ 3720{
3612 if (str[0] == '?' && !str[1]) 3721 if (str[0] == '?' && !str[1])
3613 { 3722 {
3614 unsigned short r, g, b; 3723 rgba c;
3615 pix_colors_focused[color].get (display, r, g, b); 3724 pix_colors_focused[color].get (this, c);
3725
3726#if XFT
3727 if (c.a != rgba::MAX_CC)
3728 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3729 else
3730#endif
3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3731 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3617 } 3732 }
3618 else 3733 else
3619 set_window_color (color, str); 3734 set_window_color (color, str);
3620} 3735}
3621 3736
3622/* 3737/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3738 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3739 */
3647void 3740void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3741rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3649{ 3742{
3650 int changed = 0;
3651 int color; 3743 int color;
3652 char *buf, *name; 3744 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3745 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3746 int saveop = op;
3747
3748 dLocal (Display *, xdisp);
3655 3749
3656 assert (str != NULL); 3750 assert (str != NULL);
3657 switch (op) 3751 switch (op)
3658 { 3752 {
3659 case XTerm_name: 3753 case XTerm_name:
… …
3675 unsigned long bytes_after; 3769 unsigned long bytes_after;
3676 unsigned char *value = 0; 3770 unsigned char *value = 0;
3677 const char *str = ""; 3771 const char *str = "";
3678 3772
3679 if (prop 3773 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3774 && XGetWindowProperty (xdisp, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3775 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3776 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3777 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3778 && actual_type != None
3685 && actual_format == 8) 3779 && actual_format == 8)
3686 str = (const char *)(value); 3780 str = (const char *)(value);
3687 3781
3688 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3782 tt_printf ("\033]%d;%s%c", op, str, resp);
3689 3783
3690 XFree (value); 3784 XFree (value);
3691 } 3785 }
3692 else 3786 else
3693 { 3787 {
… …
3697 { 3791 {
3698 *eq = 0; 3792 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1); 3793 set_utf8_property (display->atom (str), eq + 1);
3700 } 3794 }
3701 else 3795 else
3702 XDeleteProperty (display->display, TermWin.parent[0], 3796 XDeleteProperty (xdisp, parent[0],
3703 display->atom (str)); 3797 display->atom (str));
3704 } 3798 }
3705 break; 3799 break;
3706 3800
3707 case XTerm_Color: 3801 case XTerm_Color:
… …
3709 { 3803 {
3710 if ((name = strchr (buf, ';')) == NULL) 3804 if ((name = strchr (buf, ';')) == NULL)
3711 break; 3805 break;
3712 3806
3713 *name++ = '\0'; 3807 *name++ = '\0';
3714 color = atoi (buf); 3808 color = atoi (buf) + minCOLOR;
3715 3809
3716 if (color < 0 || color >= TOTAL_COLORS) 3810 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3717 break; 3811 break;
3718 3812
3719 if ((buf = strchr (name, ';')) != NULL) 3813 if ((buf = strchr (name, ';')) != NULL)
3720 *buf++ = '\0'; 3814 *buf++ = '\0';
3721 3815
3722 if (name[0] == '?' && !name[1]) 3816 process_color_seq (op, color, name, resp);
3723 {
3724 unsigned short r, g, b;
3725 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3726 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3727 }
3728 else
3729 set_window_color (color + minCOLOR, name);
3730 } 3817 }
3731 break; 3818 break;
3732 case XTerm_Color00: 3819 case XTerm_Color00:
3733 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3820 process_color_seq (op, Color_fg, str, resp);
3734 break; 3821 break;
3735 case XTerm_Color01: 3822 case XTerm_Color01:
3736 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3823 process_color_seq (op, Color_bg, str, resp);
3737 break; 3824 break;
3738#ifndef NO_CURSORCOLOR 3825#ifndef NO_CURSORCOLOR
3739 case XTerm_Color_cursor: 3826 case XTerm_Color_cursor:
3740 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3827 process_color_seq (op, Color_cursor, str, resp);
3741 break; 3828 break;
3742#endif 3829#endif
3743 case XTerm_Color_pointer_fg: 3830 case XTerm_Color_pointer_fg:
3744 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3831 process_color_seq (op, Color_pointer_fg, str, resp);
3745 break; 3832 break;
3746 case XTerm_Color_pointer_bg: 3833 case XTerm_Color_pointer_bg:
3747 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3834 process_color_seq (op, Color_pointer_bg, str, resp);
3748 break; 3835 break;
3749#ifndef NO_BOLD_UNDERLINE_REVERSE 3836#ifndef NO_BOLD_UNDERLINE_REVERSE
3750 case XTerm_Color_BD:
3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3756 case XTerm_Color_UL:
3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758 break;
3759 case XTerm_Color_RV: 3837 case XTerm_Color_RV:
3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3838 process_color_seq (op, Color_RV, str, resp);
3839 break;
3840 case Rxvt_Color_BD:
3841 case URxvt_Color_BD:
3842 process_color_seq (op, Color_BD, str, resp);
3843 break;
3844 case Rxvt_Color_UL:
3845 case URxvt_Color_UL:
3846 process_color_seq (op, Color_UL, str, resp);
3847 break;
3848 case URxvt_Color_IT:
3849 process_color_seq (op, Color_IT, str, resp);
3761 break; 3850 break;
3762#endif 3851#endif
3763#if TRANSPARENT && TINTING 3852#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint: 3853 case URxvt_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3854 process_color_seq (op, Color_tint, str, resp);
3855
3766 check_our_parents (); 3856 check_our_parents ();
3857
3767 if (am_transparent) 3858 if (am_transparent)
3768 want_full_refresh = want_refresh = 1; 3859 want_full_refresh = want_refresh = 1;
3769 break;
3770#endif
3771 3860
3861 break;
3862#endif
3863
3772 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3773 if (*str != ';') 3866 if (*str != ';')
3774 { 3867 {
3775#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3776 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3777 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3778#endif
3779 scr_touch (true); 3871 scr_touch (true);
3872#endif
3780 } 3873 }
3874
3875 int changed = 0;
3876
3781 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3782 { 3878 {
3783 str++; 3879 str++;
3784#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3786#endif 3882#endif
3787
3788 } 3883 }
3884
3789 if (changed) 3885 if (changed)
3790 { 3886 {
3791#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3888 resize_pixmap ();
3793#endif
3794 scr_touch (true); 3889 scr_touch (true);
3890#endif
3795 } 3891 }
3892 }
3796 break; 3893 break;
3797 3894
3798 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3799 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3800 break; 3897 break;
3801 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3802 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3803 break; 3900 break;
3804 3901
3805 case XTerm_logfile: 3902 case XTerm_logfile:
3806 // TODO, when secure mode? 3903 // TODO, when secure mode?
3807 break; 3904 break;
3808 3905
3906#if 0
3907 case Rxvt_dumpscreen: /* no error notices */
3908 {
3909 int fd;
3910 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3911 {
3912 scr_dump (fd);
3913 close (fd);
3914 }
3915 }
3916 break;
3917#endif
3809 case XTerm_font: 3918 case XTerm_font:
3810 op = URxvt_font; 3919 op = URxvt_font;
3811 case URxvt_font: 3920 case URxvt_font:
3812#if ENABLE_STYLES 3921#if ENABLE_STYLES
3813 case URxvt_boldFont: 3922 case URxvt_boldFont:
3814 case URxvt_italicFont: 3923 case URxvt_italicFont:
3815 case URxvt_boldItalicFont: 3924 case URxvt_boldItalicFont:
3816#endif 3925#endif
3817 if (query) 3926 if (query)
3818 tt_printf ("\33]%d;%-.250s%c", saveop, 3927 tt_printf ("\33]%d;%-.250s%c", saveop,
3819 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3820 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3929 ? fontset[op - URxvt_font]->fontdesc : "",
3821 resp); 3930 resp);
3822 else 3931 else
3823 { 3932 {
3824 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3933 const char *&res = rs[Rs_font + (op - URxvt_font)];
3825 3934
… …
3827 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3828 set_fonts (); 3937 set_fonts ();
3829 } 3938 }
3830 break; 3939 break;
3831 3940
3832#if ENABLE_FRILLS 3941 case URxvt_version:
3833 case XTerm_locale:
3834 if (query) 3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3949#if !ENABLE_MINIMAL
3950 case URxvt_locale:
3951 if (query)
3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3836 else 3953 else
3837 { 3954 {
3838 set_locale (str); 3955 set_locale (str);
3839# ifdef USE_XIM 3956 pty->set_utf8_mode (enc_utf8);
3840 im_cb (); 3957 init_xlocale ();
3841# endif
3842 } 3958 }
3843 break; 3959 break;
3844#endif
3845 3960
3846#ifdef MENUBAR 3961 case URxvt_view_up:
3847 case XTerm_Menu: 3962 case URxvt_view_down:
3848 if (options & Opt_insecure) 3963 {
3849 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 scr_erase_savelines ();
3970 }
3971
3850 break; 3972 break;
3851#endif 3973#endif
3852#if 0 3974
3853 case XTerm_dumpscreen: /* no error notices */ 3975#if ENABLE_PERL
3854 { 3976 case URxvt_perl:
3855 int fd; 3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3856 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3978 ; // no responses yet
3857 {
3858 scr_dump (fd);
3859 close (fd);
3860 }
3861 }
3862 break; 3979 break;
3863#endif 3980#endif
3864 } 3981 }
3865} 3982}
3866/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3897 return state; 4014 return state;
3898} 4015}
3899 4016
3900/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3901void 4018void
3902rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3903{ 4020{
3904 unsigned int i, j; 4021 unsigned int i, j;
3905 int state; 4022 int state;
3906 4023
3907 static const struct 4024 static const struct
… …
3918 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3919 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3920 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
3921 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
3922 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3923#ifdef menuBar_esc
3924 { menuBar_esc, PrivMode_menuBar },
3925#endif
3926 // 18, 19 printing-related 4040 // 18, 19 printing-related
3927 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
3928#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
3929 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
3930#endif 4044#endif
… …
3975 } 4089 }
3976 4090
3977 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
3978 switch (arg[i]) 4092 switch (arg[i])
3979 { 4093 {
4094#if ENABLE_STYLES
4095 case 1021:
4096 set_option (Opt_intensityStyles, mode);
4097
4098 scr_touch (true);
4099 break;
4100#endif
3980 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
3981 case 1049: 4102 case 1049:
3982 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
3983 if (mode == 0) 4104 if (mode == 0)
3984 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
3985 else if (mode == 1) 4106 else if (mode == 1)
3986 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
3987 break; 4108 break;
… …
3999 */ 4120 */
4000 PrivMode (1, PrivMode_vt52); 4121 PrivMode (1, PrivMode_vt52);
4001 break; 4122 break;
4002 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4003 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4004 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4005 break; 4126 break;
4006 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4007 if (state)
4008 options &= ~Opt_jumpScroll;
4009 else
4010 options |= Opt_jumpScroll; 4128 set_option (Opt_jumpScroll, !state);
4011 break; 4129 break;
4012 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4013 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4014 break; 4132 break;
4015 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
… …
4021 /* case 8: - auto repeat, can't do on a per window basis */ 4139 /* case 8: - auto repeat, can't do on a per window basis */
4022 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4023 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4024 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4025 break; 4143 break;
4026#ifdef menuBar_esc
4027 case menuBar_esc:
4028#ifdef MENUBAR
4029 map_menuBar (state);
4030#endif
4031 break;
4032#endif
4033#ifdef scrollBar_esc 4144#ifdef scrollBar_esc
4034 case scrollBar_esc: 4145 case scrollBar_esc:
4035 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4036 { 4147 {
4037 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
… …
4056#if 0 4167#if 0
4057 case 1001: 4168 case 1001:
4058 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4059#endif 4170#endif
4060 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4061 if (state)
4062 options &= ~Opt_scrollTtyOutput;
4063 else
4064 options |= Opt_scrollTtyOutput; 4172 set_option (Opt_scrollTtyOutput, !state);
4065 break; 4173 break;
4066 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4067 if (state)
4068 options |= Opt_scrollTtyKeypress; 4175 set_option (Opt_scrollTtyKeypress, state);
4069 else
4070 options &= ~Opt_scrollTtyKeypress;
4071 break; 4176 break;
4072 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4073 if (options & Opt_secondaryScreen) 4178 if (OPTION (Opt_secondaryScreen))
4074 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4075 scr_erase_screen (2); 4180 scr_erase_screen (2);
4076 scr_change_screen (state); 4181 scr_change_screen (state);
4077 break; 4182 break;
4078 case 1049: /* secondary screen w/ clearing first */ 4183 case 1049: /* secondary screen w/ clearing first */
4079 scr_change_screen (state); 4184 scr_change_screen (state);
4080 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4081 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4082 scr_erase_screen (2); 4187 scr_erase_screen (2);
4083 break; 4188 break;
4084 default: 4189 default:
4085 break; 4190 break;
… …
4213 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4214 break; 4319 break;
4215 4320
4216 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4217 4322
4218#ifndef NO_BRIGHTCOLOR 4323#if !ENABLE_MINIMAL
4219 case 90: 4324 case 90:
4220 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4221 case 92: 4326 case 92:
4222 case 93: 4327 case 93:
4223 case 94: 4328 case 94:
… …
4235 case 106: 4340 case 106:
4236 case 107: 4341 case 107:
4237 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4342 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4238 break; 4343 break;
4239#endif 4344#endif
4240
4241 } 4345 }
4242 } 4346 }
4243} 4347}
4244/*}}} */ 4348/*}}} */
4245 4349
… …
4269 */ 4373 */
4270void 4374void
4271rxvt_term::tt_printf (const char *fmt,...) 4375rxvt_term::tt_printf (const char *fmt,...)
4272{ 4376{
4273 va_list arg_ptr; 4377 va_list arg_ptr;
4274 unsigned char buf[256]; 4378 char buf[256];
4275 4379
4276 va_start (arg_ptr, fmt); 4380 va_start (arg_ptr, fmt);
4277 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4381 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4278 va_end (arg_ptr); 4382 va_end (arg_ptr);
4279 tt_write (buf, strlen (buf)); 4383 tt_write (buf, strlen (buf));
… …
4284 * or generated by us in response to a query ESC sequence. 4388 * or generated by us in response to a query ESC sequence.
4285 */ 4389 */
4286const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4287 4391
4288void 4392void
4289rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4290{ 4394{
4395 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4396 return;
4397
4398 if (pty->pty < 0)
4399 return;
4400
4291 if (v_buflen == 0) 4401 if (v_buflen == 0)
4292 { 4402 {
4293 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4403 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4294 4404
4295 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4296 return; 4406 return;
4297 4407
4298 data += written; 4408 data += written;
4299 len -= written; 4409 len -= written;
4300 } 4410 }
4301 4411
4302 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4303 4413
4304 memcpy (v_buffer + v_buflen, data, len); 4414 memcpy (v_buffer + v_buflen, data, len);
4305 v_buflen += len; 4415 v_buflen += len;
4306 4416
4307 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4308} 4418}
4309 4419
4310void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4311{ 4421{
4312 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4313 4423
4314 if (written > 0) 4424 if (written > 0)
4315 { 4425 {
4316 v_buflen -= written; 4426 v_buflen -= written;
4317 4427
… …
4326 } 4436 }
4327 4437
4328 memmove (v_buffer, v_buffer + written, v_buflen); 4438 memmove (v_buffer, v_buffer + written, v_buflen);
4329 } 4439 }
4330 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331 // original code just ignores this... 4441 pty_ev.set (EVENT_READ);
4332 destroy ();
4333} 4442}
4334 4443
4335/*----------------------- end-of-file (C source) -----------------------*/ 4444/*----------------------- end-of-file (C source) -----------------------*/
4336 4445

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines