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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 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
53#include <cwchar> 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <csignal> 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:
… …
785 case XK_F35: /* "\033[49~" */ 823 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 824 FKEY (31, XK_F17);
787 break; 825 break;
788#undef FKEY 826#undef FKEY
789 default: 827 default:
790 if (len == 0 828 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 829 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 830 }
796 831
797 if (newlen) 832 if (newlen)
798 len = strlen (kbuf); 833 len = strlen (kbuf);
799 } 834 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 850 else if (keysym == XK_ISO_Left_Tab)
816 { 851 {
817 strcpy (kbuf, "\033[Z"); 852 strcpy (kbuf, "\033[Z");
818 len = 3; 853 len = 3;
819 } 854 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
827 else 855 else
828 { 856 {
829#ifdef META8_OPTION 857#ifdef META8_OPTION
830 /* set 8-bit on */ 858 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
832 { 860 {
833 unsigned char *ch; 861 char *ch;
834 862
835 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 864 *ch |= 0x80;
837 865
838 meta = 0; 866 meta = 0;
… …
840#endif 868#endif
841 /* nil */ ; 869 /* nil */ ;
842 } 870 }
843 } 871 }
844 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
845 if (len <= 0) 876 if (len <= 0)
846 return; /* not mapped */ 877 return; /* not mapped */
847 878
848 if (options & Opt_scrollTtyKeypress) 879 if (OPTION (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 880 if (view_start)
850 { 881 {
851 TermWin.view_start = 0; 882 view_start = 0;
852 want_refresh = 1; 883 want_refresh = 1;
853 } 884 }
854 885
855 /* 886 /*
856 * these modifications only affect the static keybuffer 887 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 902#ifdef META8_OPTION
872 && meta_char == C0_ESC 903 && meta_char == C0_ESC
873#endif 904#endif
874 ) 905 )
875 { 906 {
876 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
877 tt_write (&ch, 1); 908 tt_write (&ch, 1);
878 } 909 }
879 910
880#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */
882 unsigned char *p;
883 int i;
884
885 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
886 for (i = 0, p = kbuf; i < len; i++, p++)
887 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
888 fprintf (stderr, "'\n");
889#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
891} 912}
892/*}}} */ 913/*}}} */
893 914
894#if (MENUBAR_MAX) 915#if defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */
897unsigned int 916unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 918{
900 unsigned int n, s; 919 unsigned int n, s;
901 920
902 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 941
923 cmd_parse (); 942 cmd_parse ();
924 943
925 return 0; 944 return 0;
926} 945}
927#endif /* MENUBAR_MAX */ 946#endif
928 947
929void 948void
930rxvt_term::flush () 949rxvt_term::flush ()
931{ 950{
932 flush_ev.stop (); 951 flush_ev.stop ();
… …
940 } 959 }
941#endif 960#endif
942 961
943 if (want_refresh) 962 if (want_refresh)
944 { 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
945 scr_refresh (refresh_type); 1002 scr_refresh ();
946 scrollbar_show (1); 1003 scrollbar_show (1);
947#ifdef USE_XIM 1004#ifdef USE_XIM
948 IMSendSpot (); 1005 IMSendSpot ();
949#endif 1006#endif
950 } 1007 }
… …
953} 1010}
954 1011
955void 1012void
956rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
957{ 1014{
958 SET_R (this); 1015 make_current ();
959 SET_LOCALE (locale);
960 1016
961 display->flush (); 1017 display->flush ();
962 1018
963 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1021}
966 1022
967void 1023void
968rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
969{ 1025{
970 SET_R (this); 1026 make_current ();
971 SET_LOCALE (locale);
972 1027
973 refresh_limit = 1; 1028 refresh_limit = 1;
974 refresh_count = 0; 1029 refresh_count = 0;
975 flush (); 1030 flush ();
976} 1031}
… …
980rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
981{ 1036{
982 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
983 want_refresh = 1; 1038 want_refresh = 1;
984 1039
985 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
986} 1041}
987#endif 1042#endif
988 1043
989#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
990void 1045void
… …
1004rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
1005{ 1060{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 { 1063 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1; 1064 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 } 1066 }
1013} 1067}
1014#endif 1068#endif
… …
1018rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1019{ 1073{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 { 1075 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1; 1077 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 } 1079 }
1027} 1080}
1028#endif 1081#endif
… …
1033{ 1086{
1034 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1035 || 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)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1090 {
1038 refresh_type |= SMOOTH_REFRESH; 1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1039 want_refresh = 1; 1094 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1096 }
1042} 1097}
1043#endif 1098#endif
1044 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
1045bool 1118bool
1046rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
1047{ 1120{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1122
1050 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
1051 { 1124 {
1052 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");
1053 n = 0; 1126 n = 0;
1054 } 1127 }
1055 1128
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1059 1132
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1061 1134
1062 if (n > 0) 1135 if (r > 0)
1063 { 1136 {
1064 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
1065 return true; 1138 return true;
1066 } 1139 }
1067 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))
1068 destroy (); 1152 destroy ();
1153 }
1069 1154
1070 return false; 1155 return false;
1071} 1156}
1072 1157
1073void 1158void
1074rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1075{ 1160{
1076 SET_R (this); 1161 make_current ();
1077 SET_LOCALE (locale);
1078 1162
1079 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ()) 1165 while (pty_fill ())
1082 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1087} 1171}
1088 1172
1089void 1173void
1090rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1091{ 1175{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1093 recolour_cursor (); 1177 recolour_cursor ();
1094 1178
1095#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1180 hidden_pointer = 0;
1097 1181
1098 if (options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1184#endif
1101} 1185}
1102 1186
1103#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1104void 1188void
1105rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1106{ 1190{
1107 if (! (options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1108 return; 1192 return;
1109 1193
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1111 XFlush (display->display); 1195 XFlush (xdisp);
1112 1196
1113 hidden_pointer = 1; 1197 hidden_pointer = 1;
1114} 1198}
1115 1199
1116void 1200void
1117rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1118{ 1202{
1119 SET_R (this); 1203 make_current ();
1120 SET_LOCALE (locale);
1121 1204
1122 pointer_blank (); 1205 pointer_blank ();
1123} 1206}
1124#endif 1207#endif
1125 1208
… …
1190 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1191 (32 + x + 1), 1274 (32 + x + 1),
1192 (32 + y + 1)); 1275 (32 + y + 1));
1193} 1276}
1194 1277
1195#ifdef USING_W11LIB
1196void
1197rxvt_W11_process_x_event (XEvent *ev)
1198{
1199 rxvt_t *r = rxvt_get_r ();
1200
1201 x_cb (*ev);
1202}
1203#endif
1204
1205/*{{{ process an X event */ 1278/*{{{ process an X event */
1206void 1279void
1207rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1208{ 1281{
1209 SET_R (this); 1282 make_current ();
1210 SET_LOCALE (locale);
1211 1283
1212#if defined(CURSOR_BLINK) 1284 dLocal (Display *, xdisp);
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220 1285
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 if (ev.xany.window == vt
1222 } 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1223#endif 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return;
1224 1290
1225#if defined(POINTER_BLANK) 1291 // for XQueryPointer
1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1227 {
1228 if (ev.type == MotionNotify
1229 || ev.type == ButtonPress
1230 || ev.type == ButtonRelease)
1231 if (hidden_pointer)
1232 pointer_unblank ();
1233
1234 if (ev.type == KeyPress && hidden_pointer == 0)
1235 pointer_blank ();
1236 }
1237#endif
1238
1239 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1294 unsigned int unused_mask;
1242 1295
1243 switch (ev.type) 1296 switch (ev.type)
… …
1250 1303
1251 break; 1304 break;
1252 1305
1253 case KeyRelease: 1306 case KeyRelease:
1254 { 1307 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1256 KeySym ks; 1309 KeySym keysym;
1257 1310
1258 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 :/
1259#endif 1312#endif
1260 1313
1261#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support 1315 // ISO 14755 support
1263 if (iso14755buf) 1316 if (iso14755buf)
… …
1268# endif 1321# endif
1269# if ISO_14755 1322# if ISO_14755
1270 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1271 // first: controls 1324 // first: controls
1272 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1275 { 1328 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1277 commit_iso14755 (); 1330 commit_iso14755 ();
1278 return; // case-break; 1331 goto skip_switch;
1279 } 1332 }
1280 1333
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks) 1335 if (i[0] == keysym)
1283 { 1336 {
1284 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 (); 1338 commit_iso14755 ();
1286 return; // case-break; 1339 goto skip_switch;
1287 } 1340 }
1288 1341
1289 scr_bell (); 1342 scr_bell ();
1290# endif 1343# endif
1291 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1310 else 1363 else
1311 iso14755buf = 0; 1364 iso14755buf = 0;
1312 } 1365 }
1313#endif 1366#endif
1314 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
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1319 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1320#endif 1377#endif
1321 break; 1378 break;
1322 } 1379 }
1323 1380
… …
1329 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1330 break; 1387 break;
1331 1388
1332 case ClientMessage: 1389 case ClientMessage:
1333 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1335 destroy ();
1336#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink))
1342 { 1392 {
1343 /* Get Dnd data */ 1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1344 Atom ActualType; 1394 {
1345 int ActualFormat; 1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1346 unsigned char *data; 1396 {
1347 unsigned long Size, RemainingBytes; 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1348 1398 {
1349 XGetWindowProperty (display->display, display->root, 1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1350 xa[XA_DNDSELECTION], 1400 destroy ();
1351 0L, 1000000L, 1401 }
1352 False, AnyPropertyType, 1402#if ENABLE_EWMH
1353 &ActualType, &ActualFormat, 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1354 &Size, &RemainingBytes, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1355 &data); 1406 &ev);
1356 set_string_property (XA_CUT_BUFFER0, data); 1407#endif
1357 XFree (data); 1408 }
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1409 }
1359 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
1360 } 1419 }
1361#endif /* OFFIX_DND */
1362 break; 1420 break;
1363 1421
1364 case MappingNotify: 1422 case MappingNotify:
1365 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1366 break; 1424 break;
… …
1389 break; 1447 break;
1390 } 1448 }
1391 break; 1449 break;
1392 1450
1393 case FocusIn: 1451 case FocusIn:
1394 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])
1395 { 1461 {
1396 TermWin.focus = 1; 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 { 1463 ;
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416 1464
1417 }
1418 break;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1463
1464 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1466 {
1466 seen_resize = 1; 1467 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1469 }
1469 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1472 check_our_parents (); 1475 check_our_parents ();
1473#endif 1476#endif
1474 } 1477 }
1475 break; 1478 break;
1476 1479
1477 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481 1485
1482 break; 1486 break;
1483 1487
1484 case SelectionClear: 1488 case SelectionClear:
1485 selection_clear (); 1489 selection_clear ();
… …
1492 1496
1493 case SelectionRequest: 1497 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1495 break; 1499 break;
1496 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
1497 case UnmapNotify: 1509 case UnmapNotify:
1498 TermWin.mapped = 0; 1510 mapped = 0;
1499#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1501#endif 1513#endif
1502 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504 case MapNotify:
1505 TermWin.mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 break; 1515 break;
1510 1516
1511#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1512 case ReparentNotify: 1518 case ReparentNotify:
1513 rootwin_cb (ev); 1519 rootwin_cb (ev);
1514 break; 1520 break;
1515#endif /* TRANSPARENT */ 1521#endif /* TRANSPARENT */
1516 1522
1517 case GraphicsExpose: 1523 case GraphicsExpose:
1518 case Expose: 1524 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1525 if (ev.xany.window == vt)
1520 { 1526 {
1521 do 1527 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1525 1531
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1533
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1531 1537
1532 scr_refresh (refresh_type); 1538 want_refresh = 1;
1533 } 1539 }
1534 else 1540 else
1535 { 1541 {
1536 XEvent unused_event; 1542 XEvent unused_event;
1537 1543
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1539 ; 1545 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1547 ;
1542 1548
1543 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1544 { 1550 {
1545 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1546 scrollbar_show (0); 1552 scrollbar_show (0);
1547 } 1553 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552 1554
1553#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1556#endif 1558#endif
1557 } 1559 }
1558 break; 1560 break;
1559 1561
1560 case MotionNotify: 1562 case MotionNotify:
1561#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1564 if (hidden_pointer)
1563 pointer_unblank (); 1565 pointer_unblank ();
1564#endif 1566#endif
1565#if MENUBAR
1566 if (isMenuBarWindow (ev.xany.window))
1567 {
1568 menubar_control (ev.xbutton);
1569 break;
1570 }
1571#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1568 break;
1574 1569
1575 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1576 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1576 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1580 ; 1578 ;
1581 1579
1582 XQueryPointer (display->display, TermWin.vt, 1580 XQueryPointer (xdisp, vt,
1583 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1584 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1599#endif 1597#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1598 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1599 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1600
1603#ifdef SELECTION_SCROLLING 1601#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1602 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1603 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1604 {
1607 int dist; 1605 int dist;
1608 1606
1609 /* don't clobber the current delay if we are 1607 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1608 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1616 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1617 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1618 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1619
1622 /* calc number of lines to scroll */ 1620 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1621 if (ev.xbutton.y < int_bwidth)
1624 { 1622 {
1625 scroll_selection_dir = UP; 1623 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1624 dist = int_bwidth - ev.xbutton.y;
1627 } 1625 }
1628 else 1626 else
1629 { 1627 {
1630 scroll_selection_dir = DN; 1628 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1629 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1630 }
1633 1631
1634 scroll_selection_lines = Pixel2Height (dist) 1632 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1633 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1634 + 1;
1637 MIN_IT (scroll_selection_lines, 1635 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1636 SELECTION_SCROLL_MAX_LINES);
1639 } 1637 }
1640 else 1638 else
1641 { 1639 {
1642 /* we are within the text window, so we 1640 /* we are within the text window, so we
… …
1651#endif 1649#endif
1652 } 1650 }
1653 } 1651 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1653 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1657 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1658 ; 1656 ;
1659 1657
1660 XQueryPointer (display->display, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1661 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1662 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1664 scrollbar_size ());
1667 scr_refresh (refresh_type); 1665 want_refresh = 1;
1668 refresh_limit = 0; 1666 refresh_limit = 0;
1669 scrollbar_show (1); 1667 scrollbar_show (1);
1670 } 1668 }
1671 break; 1669 break;
1672 } 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 }
1673} 1769}
1674 1770
1675#if TRANSPARENT 1771#if TRANSPARENT
1676void 1772void
1677rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1774{
1679 SET_R (this); 1775 make_current ();
1680 SET_LOCALE (locale);
1681 1776
1682 switch (ev.type) 1777 switch (ev.type)
1683 { 1778 {
1684 case PropertyNotify: 1779 case PropertyNotify:
1685 /* 1780 /*
… …
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691 return; 1786 return;
1692 1787
1693 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1694 case ReparentNotify: 1789 case ReparentNotify:
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1697 break; 1792 break;
1698 } 1793 }
1699} 1794}
1700#endif 1795#endif
… …
1703rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1704{ 1799{
1705 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1706 1801
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1708 if (!bypass_keystate) 1804 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1806
1711 /* 1807 /*
1712 * VT window processing of button press 1808 * VT window processing of button press
1713 */ 1809 */
1714 if (ev.window == TermWin.vt) 1810 if (ev.window == vt)
1715 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1716#if ISO_14755 1815#if ISO_14755
1717 // 5.4 1816 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1818 {
1720 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1734 { 1833 {
1735 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1736 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1737 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1738 { 1838 {
1739 /* only report double clicks */ 1839 /* only report double clicks */
1740 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1741 mouse_report (ev); 1841 mouse_report (ev);
… …
1767 { 1867 {
1768 case Button1: 1868 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1869 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1870 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1871#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1872 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1873#else
1774 selection.rect = false; 1874 selection.rect = false;
1775#endif 1875#endif
1776 1876
1777 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1879 {
1780 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1782 else 1882 else
1783 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1924 case Button3: 2024 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2025 if (scrollBar.style != R_SB_XTERM)
1926 { 2026 {
1927 if (scrollbar_above_slider (ev.y)) 2027 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2029 scr_page (UP, nrow - 1);
1930# else 2030# else
1931 scr_page (UP, TermWin.nrow / 4); 2031 scr_page (UP, nrow / 4);
1932# endif 2032# endif
1933 else if (scrollbar_below_slider (ev.y)) 2033 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2034# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2035 scr_page (DN, nrow - 1);
1936# else 2036# else
1937 scr_page (DN, TermWin.nrow / 4); 2037 scr_page (DN, nrow / 4);
1938# endif 2038# endif
1939 else 2039 else
1940 scrollBar.setMotion (); 2040 scrollBar.setMotion ();
1941 } 2041 }
1942 else 2042 else
1943 { 2043 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2044 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2045 (nrow
1946 * scrollbar_position (ev.y) 2046 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2047 / scrollbar_size ()));
1948 } 2048 }
1949 2049
1950 break; 2050 break;
1951 } 2051 }
1952 } 2052 }
2053
1953 return; 2054 return;
1954 } 2055 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2056}
1963 2057
1964void 2058void
1965rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
1966{ 2060{
… …
1972 2066
1973 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1974 { 2068 {
1975 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1976 scrollbar_show (0); 2070 scrollbar_show (0);
1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1978 refresh_type &= ~SMOOTH_REFRESH;
1979#endif
1980 } 2071 }
1981 2072
1982#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
1985#endif 2076#endif
1986 2077
1987 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1988 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
1989#if ISO_14755 2083#if ISO_14755
1990 // 5.4 2084 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2086 return;
1993#endif 2087#endif
2088
1994 if (reportmode) 2089 if (reportmode)
1995 { 2090 {
1996 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1997 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1998 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2028 { 2123 {
2029 case Button1: 2124 case Button1:
2030 case Button3: 2125 case Button3:
2031 selection_make (ev.time); 2126 selection_make (ev.time);
2032 break; 2127 break;
2128
2033 case Button2: 2129 case Button2:
2034 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);
2035 break; 2132 break;
2133
2036#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2037 case Button4: 2135 case Button4:
2038 case Button5: 2136 case Button5:
2039 { 2137 {
2040 int i; 2138 int i;
… …
2042 2140
2043 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2044 2142
2045 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2046 i = 1; 2144 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2146 i = nrow - 1;
2049 else 2147 else
2050 i = 5; 2148 i = 5;
2051 2149
2052# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2151 if (ev.state & ControlMask)
2054 { 2152 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2056 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;
2057 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;
2058 2156
2059 if (slip_wheel_ev.at < NOW) 2157 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2159
2062 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2063 } 2161 }
2064 else 2162 else
2065 { 2163 {
2066# endif 2164# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2165 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2166 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2080 } 2168 }
2081#endif 2169# endif
2082 } 2170 }
2083 break; 2171 break;
2084#endif 2172#endif
2085 } 2173 }
2086 } 2174 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2175}
2092 2176
2093#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2094#if TINTING 2178#if TINTING
2095/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2096 2180
2097typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2098 2182
2099void 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)
2100{ 2184{
2101 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2102 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2190 int i;
2107 2191
2108 Visual* visual = display->visual; 2192 Visual *visual = term->visual;
2109 2193
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2195
2112 /* for convenience */ 2196 /* for convenience */
2113 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2337 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2339 2423
2340 pchanged = 0; 2424 pchanged = 0;
2341 2425
2342 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2344 2428
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2347 2431
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2349 2433
2350 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2351 { 2435 {
2352 if (am_transparent) 2436 if (am_transparent)
2353 { 2437 {
2354 pchanged = 1; 2438 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2357 } 2441 }
2358 2442
2359 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2360 } 2444 }
2361 2445
2362 /* 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. */
2363 XSync (display->display, False); 2447 XSync (xdisp, False);
2364 2448
2365 /* 2449 /*
2366 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2368 * 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.
2369 */ 2453 */
2370 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2374 2458
2375 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2380 2464
2381 if (!i || prop == NULL 2465 if (!i || prop == NULL
2382#if TINTING 2466#if TINTING
2383 || !rs[Rs_color + Color_tint] 2467 || !ISSET_PIXCOLOR (Color_tint)
2384#endif 2468#endif
2385 ) 2469 )
2386 have_pixmap = 0; 2470 have_pixmap = 0;
2387 else 2471 else
2388 { 2472 {
… …
2401 Window cr; 2485 Window cr;
2402 XImage *image; 2486 XImage *image;
2403 GC gc; 2487 GC gc;
2404 XGCValues gcvalue; 2488 XGCValues gcvalue;
2405 2489
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2494 nx = ny = 0;
2411 2495
… …
2421 nh += sy; 2505 nh += sy;
2422 ny = -sy; 2506 ny = -sy;
2423 sy = 0; 2507 sy = 0;
2424 } 2508 }
2425 2509
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2512
2429 XSync (display->display, False); 2513 XSync (xdisp, False);
2430 allowedxerror = -1; 2514 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2516
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2519 allowedxerror = 0;
2436 2520
2437 if (image == NULL) 2521 if (image == NULL)
2438 { 2522 {
2439 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2440 { 2524 {
2441 pchanged = 1; 2525 pchanged = 1;
2442 if (TermWin.pixmap != None) 2526 if (pixmap != None)
2443 { 2527 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2528 XFreePixmap (xdisp, pixmap);
2445 TermWin.pixmap = None; 2529 pixmap = None;
2446 } 2530 }
2447 } 2531 }
2448 2532
2449 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2450 } 2534 }
2451 else 2535 else
2452 { 2536 {
2453 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2538 XFreePixmap (xdisp, pixmap);
2455 2539
2456#if TINTING 2540#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2542 {
2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2461 2544
2545 rgba c;
2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2463 2547
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2465 } 2549 }
2466#endif 2550#endif
2467 2551
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2469 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2556 XFreeGC (xdisp, gc);
2474 XDestroyImage (image); 2557 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2477 2560
2478 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2562 pchanged = 1;
2480 2563
2481 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2482 } 2565 }
2483 } 2566 }
2484 2567
2485 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2487 else 2570 else
2488 { 2571 {
2489 unsigned int n; 2572 unsigned int n;
2490 /* 2573 /*
2491 * InheritPixmap transparency 2574 * InheritPixmap transparency
2492 */ 2575 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2577 {
2495 oldp = TermWin.parent[i]; 2578 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2497 &TermWin.parent[i], &list, &n);
2498 XFree (list); 2580 XFree (list);
2499 2581
2500 if (TermWin.parent[i] == display->root) 2582 if (parent[i] == display->root)
2501 { 2583 {
2502 if (oldp != None) 2584 if (oldp != None)
2503 pchanged = 1; 2585 pchanged = 1;
2504 2586
2505 break; 2587 break;
2506 } 2588 }
2507 2589
2508 if (oldp != TermWin.parent[i]) 2590 if (oldp != parent[i])
2509 pchanged = 1; 2591 pchanged = 1;
2510 } 2592 }
2511 2593
2512 n = 0; 2594 n = 0;
2513 2595
2514 if (pchanged) 2596 if (pchanged)
2515 {
2516 for (; n < (unsigned int)i; n++) 2597 for (; n < (unsigned int)i; n++)
2517 { 2598 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2602 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2604 break;
2523 } 2605 }
2524 } 2606 }
2607
2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2525 } 2609 {
2526
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2528 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2612 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2613 /* XXX: also turn off Opt_transparent? */
2533 } 2614 }
2534 else 2615 else
2535 { 2616 {
2536#if WAIT_FOR_WM
2537 /* wait (an arbitrary period) for the WM to do its thing
2538 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1);
2540#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2617 for (n = 0; n < (unsigned int)i; n++)
2542 { 2618 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2620 XClearWindow (xdisp, parent[n]);
2545 } 2621 }
2546 2622
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2548 am_transparent = 1; 2624 am_transparent = 1;
2549 } 2625 }
2550 2626
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2628 parent[i] = None;
2553 } 2629 }
2554 2630
2555 if (scrollBar.win) 2631 if (scrollBar.win)
2556 { 2632 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2634 scrollBar.setIdle ();
2559 scrollbar_show (0); 2635 scrollbar_show (0);
2560 } 2636 }
2561 2637
2562 if (am_transparent) 2638 if (am_transparent)
… …
2574 2650
2575bool 2651bool
2576rxvt_term::cmd_parse () 2652rxvt_term::cmd_parse ()
2577{ 2653{
2578 bool flag = false; 2654 bool flag = false;
2579 unicode_t ch = NOCHAR; 2655 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2656 char *seq_begin; // remember start of esc-sequence here
2581 2657
2582 for (;;) 2658 for (;;)
2583 { 2659 {
2584 if (ch == NOCHAR) 2660 if (ch == NOCHAR)
2585 { 2661 {
2586 seq_begin = cmdbuf_ptr; 2662 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2663 ch = next_char ();
2588 }
2589 2664
2590 if (ch == NOCHAR) // TODO: improve 2665 if (ch == NOCHAR)
2591 break; 2666 break;
2667 }
2592 2668
2593 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)
2594 { 2670 {
2595 if (!seen_input) 2671 if (!seen_input)
2596 { 2672 {
… …
2600 // some window managers resize the window early, and these programs 2676 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2677 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2678 // unfortunately other programs are even more buggy and dislike
2603 // 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
2604 // resized. 2680 // resized.
2605 if (seen_resize) 2681 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2682 kill (-cmd_pid, SIGWINCH);
2607 } 2683 }
2608 2684
2609 /* Read a text string from the input buffer */ 2685 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2686 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2687 bool refreshnow = false;
2612 int nlines = 0; 2688 int nlines = 0;
2613 unicode_t *str = buf; 2689 wchar_t *str = buf;
2690 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2691
2615 for (;;) 2692 for (;;)
2616 { 2693 {
2617 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))
2618 break; 2695 break;
2619 2696
2620 *str++ = ch; 2697 *str++ = ch;
2621 2698
2622 if (ch == C0_LF) 2699 if (ch == C0_LF || str >= eol)
2623 { 2700 {
2701 if (ch == C0_LF)
2624 nlines++; 2702 nlines++;
2703
2625 refresh_count++; 2704 refresh_count++;
2626 2705
2627 if (!(options & Opt_jumpScroll) 2706 if (!OPTION (Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2707 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2708 {
2630 refreshnow = true; 2709 refreshnow = true;
2710 refresh_count = 0;
2631 ch = NOCHAR; 2711 ch = NOCHAR;
2632 break; 2712 break;
2633 } 2713 }
2634 2714
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2715 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2716 if (nlines >= nrow - 1)
2637 { 2717 {
2718 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2719 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2720 scr_add_lines (buf, str - buf, nlines);
2721
2639 nlines = 0; 2722 nlines = 0;
2640 str = buf; 2723 str = buf;
2724 eol = str + min (ncol, UBUFSIZ);
2641 } 2725 }
2642 }
2643 2726
2644 if (str >= buf + UBUFSIZ) 2727 if (str >= eol)
2645 { 2728 {
2729 if (eol >= buf + UBUFSIZ)
2730 {
2646 ch = NOCHAR; 2731 ch = NOCHAR;
2647 break; 2732 break;
2733 }
2734 else
2735 eol = min (eol + ncol, buf + UBUFSIZ);
2736 }
2737
2648 } 2738 }
2649 2739
2650 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2741 ch = next_char ();
2652 } 2742 }
2653 2743
2744 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2745 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2746 scr_add_lines (buf, str - buf, nlines);
2655 2747
2656 /* 2748 /*
2657 * 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
2658 * 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.
2659 * the number of pages between refreshes is refresh_limit, which 2751 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling. 2752 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2753 */
2662 if (refreshnow) 2754 if (refreshnow)
2663 { 2755 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++; 2757 refresh_limit++;
2666 else 2758 else
2667 { 2759 {
2668 flag = true; 2760 flag = true;
2669 scr_refresh (refresh_type); 2761 scr_refresh ();
2762 want_refresh = 1;
2670 } 2763 }
2671 } 2764 }
2672 2765
2673 } 2766 }
2674 else 2767 else
… …
2689 } 2782 }
2690 2783
2691 return flag; 2784 return flag;
2692} 2785}
2693 2786
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character 2787// read the next character
2704unicode_t 2788wchar_t
2705rxvt_term::next_char () 2789rxvt_term::next_char () NOTHROW
2706{ 2790{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2791 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2792 {
2709 // assume 7-bit to be ascii ALWAYS 2793 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2794 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2795 return *cmdbuf_ptr++;
2712 2796
2713 wchar_t wc; 2797 wchar_t wc;
2714 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);
2715 2799
2716 if (len == (size_t)-2) 2800 if (len == (size_t)-2)
2717 { 2801 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2802 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2803 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2804 break;
2721 } 2805 }
2722 2806
2723 if (len == (size_t)-1) 2807 if (len == (size_t)-1)
2724 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
2725 2809
2726 // assume wchar == unicode 2810 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2811 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2812 return wc & UNICODE_MASK;
2729 } 2813 }
2730 2814
2731 return NOCHAR; 2815 return NOCHAR;
2732} 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;
2733 2828
2734/* rxvt_cmd_getc () - Return next input character */ 2829/* rxvt_cmd_getc () - Return next input character */
2735/* 2830/*
2736 * Return the next input character after first passing any keyboard input 2831 * Return the next input character after first passing any keyboard input
2737 * to the command. 2832 * to the command.
2738 */ 2833 */
2739unicode_t 2834wchar_t
2740rxvt_term::cmd_getc () 2835rxvt_term::cmd_getc () THROW ((class out_of_input))
2741{ 2836{
2742 unicode_t c = next_char (); 2837 wchar_t c = next_char ();
2743 2838
2744 if (c == NOCHAR) 2839 if (c == NOCHAR)
2745 throw out_of_input; 2840 throw out_of_input;
2746 2841
2747 return c; 2842 return c;
2748} 2843}
2749 2844
2750unicode_t 2845uint32_t
2751rxvt_term::cmd_get8 () 2846rxvt_term::cmd_get8 () THROW ((class out_of_input))
2752{ 2847{
2753 unicode_t c = next_octet (); 2848 uint32_t c = next_octet ();
2754 2849
2755 if (c == NOCHAR) 2850 if (c == NOCHAR)
2756 throw out_of_input; 2851 throw out_of_input;
2757 2852
2758 return c; 2853 return c;
… …
2858 case C0_ESC: 2953 case C0_ESC:
2859 process_escape_seq (); 2954 process_escape_seq ();
2860 break; 2955 break;
2861 case C0_ENQ: /* terminal Status */ 2956 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2957 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2958 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2959 else
2866 tt_write ((unsigned char *)VT100_ANS, 2960 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 2961 break;
2869 case C0_BEL: /* bell */ 2962 case C0_BEL: /* bell */
2870 scr_bell (); 2963 scr_bell ();
2871 break; 2964 break;
2872 case C0_BS: /* backspace */ 2965 case C0_BS: /* backspace */
… …
2996 scr_charset_set (2, (unsigned int)cmd_getc ()); 3089 scr_charset_set (2, (unsigned int)cmd_getc ());
2997 break; 3090 break;
2998 case '+': 3091 case '+':
2999 scr_charset_set (3, (unsigned int)cmd_getc ()); 3092 scr_charset_set (3, (unsigned int)cmd_getc ());
3000 break; 3093 break;
3001#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3002 case '6': 3095 case '6':
3003 scr_backindex (); 3096 scr_backindex ();
3004 break; 3097 break;
3005#endif 3098#endif
3006 case '7': 3099 case '7':
3007 scr_cursor (SAVE); 3100 scr_cursor (SAVE);
3008 break; 3101 break;
3009 case '8': 3102 case '8':
3010 scr_cursor (RESTORE); 3103 scr_cursor (RESTORE);
3011 break; 3104 break;
3012#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
3013 case '9': 3106 case '9':
3014 scr_forwardindex (); 3107 scr_forwardindex ();
3015 break; 3108 break;
3016#endif 3109#endif
3017 case '=': 3110 case '=':
… …
3027 break; 3120 break;
3028 3121
3029 /* 8.3.87: NEXT LINE */ 3122 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 3123 case C1_NEL: /* ESC E */
3031 { 3124 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 3125 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 3126 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 3127 }
3035 break; 3128 break;
3036 3129
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 3130 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 3131 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 3153 process_dcs_seq ();
3061 break; 3154 break;
3062 3155
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3156 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 3157 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 3158 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 3159 break; /* steal obsolete ESC [ c */
3068 3160
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3161 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 3162 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 3163 process_csi_seq ();
… …
3180 ndef = get_byte_array_bit (csi_defaults, i); 3272 ndef = get_byte_array_bit (csi_defaults, i);
3181 for (p = 0; p < nargs; p++) 3273 for (p = 0; p < nargs; p++)
3182 if (arg[p] == -1) 3274 if (arg[p] == -1)
3183 arg[p] = ndef; 3275 arg[p] = ndef;
3184 3276
3185#ifdef DEBUG_CMD
3186 fprintf (stderr, "CSI ");
3187 for (p = 0; p < nargs; p++)
3188 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3189 fprintf (stderr, "%c\n", ch);
3190#endif
3191
3192 /* 3277 /*
3193 * private mode handling 3278 * private mode handling
3194 */ 3279 */
3195 if (priv) 3280 if (priv)
3196 { 3281 {
3197 switch (priv) 3282 switch (priv)
3198 { 3283 {
3199 case '>': 3284 case '>':
3200 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 //
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3294 tt_printf ("\033[>%d;94;0c", 'U');
3295 }
3202 break; 3296 break;
3203 case '?': 3297 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3299 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3300 break;
… …
3311 3405
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3406 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3407 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3408 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3409 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3410 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3411 break;
3318 3412
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3413 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3414 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 3415 break;
3323 3416
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3417 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 3418 process_sgr_mode (nargs, arg);
3326 break; 3419 break;
… …
3333 break; 3426 break;
3334 case 6: /* CPR requested */ 3427 case 6: /* CPR requested */
3335 scr_report_position (); 3428 scr_report_position ();
3336 break; 3429 break;
3337 case 7: /* unofficial extension */ 3430 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3431 if (OPTION (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3432 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3433 break;
3341 case 8: /* unofficial extension */ 3434 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3435 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3436 break;
… …
3410 break; 3503 break;
3411 case CSI_75: 3504 case CSI_75:
3412 scr_cursor (RESTORE); 3505 scr_cursor (RESTORE);
3413 break; 3506 break;
3414 3507
3415#if ENABLE_FRILLS 3508#if !ENABLE_MINIMAL
3416 case CSI_74: 3509 case CSI_74:
3417 process_window_ops (arg, nargs); 3510 process_window_ops (arg, nargs);
3418 break; 3511 break;
3419#endif 3512#endif
3420 3513
… …
3427 break; 3520 break;
3428 } 3521 }
3429} 3522}
3430/*}}} */ 3523/*}}} */
3431 3524
3432#if ENABLE_FRILLS 3525#if !ENABLE_MINIMAL
3433/* ARGSUSED */ 3526/* ARGSUSED */
3434void 3527void
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3528rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3529{
3437 int x, y; 3530 int x, y;
3438 XWindowAttributes wattr; 3531 XWindowAttributes wattr;
3439 Window wdummy; 3532 Window wdummy;
3533
3534 dLocal (Display *, xdisp);
3440 3535
3441 if (nargs == 0) 3536 if (nargs == 0)
3442 return; 3537 return;
3443 3538
3444 switch (args[0]) 3539 switch (args[0])
3445 { 3540 {
3446 /* 3541 /*
3447 * commands 3542 * commands
3448 */ 3543 */
3449 case 1: /* deiconify window */ 3544 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3545 XMapWindow (xdisp, parent[0]);
3451 break; 3546 break;
3452 case 2: /* iconify window */ 3547 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3548 XIconifyWindow (xdisp, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3549 break;
3456 case 3: /* set position (pixels) */ 3550 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3551 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3458 break; 3552 break;
3459 case 4: /* set size (pixels) */ 3553 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3555 break;
3462 case 5: /* raise window */ 3556 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3557 XRaiseWindow (xdisp, parent[0]);
3464 break; 3558 break;
3465 case 6: /* lower window */ 3559 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3560 XLowerWindow (xdisp, parent[0]);
3467 break; 3561 break;
3468 case 7: /* refresh window */ 3562 case 7: /* refresh window */
3469 scr_touch (true); 3563 scr_touch (true);
3470 break; 3564 break;
3471 case 8: /* set size (chars) */ 3565 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3566 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3567 (unsigned int) (args[1] * fheight));
3474 break; 3568 break;
3475 3569
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3570 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3571 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3572 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3573 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3574 (unsigned int) (args[1] * fheight));
3481 break; 3575 break;
3482 3576
3483 3577
3484 /* 3578 /*
3485 * reports - some output format copied from XTerm 3579 * reports - some output format copied from XTerm
3486 */ 3580 */
3487 case 11: /* report window state */ 3581 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3582 XGetWindowAttributes (xdisp, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3583 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3584 break;
3491 case 13: /* report window position */ 3585 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3587 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3588 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3589 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3590 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3591 break;
3498 case 14: /* report window size (pixels) */ 3592 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3593 XGetWindowAttributes (xdisp, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3594 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3595 break;
3502 case 18: /* report text area size (chars) */ 3596 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3597 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3598 break;
3505 case 19: /* report window size (chars) */ 3599 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3600 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3601 break;
3508 case 20: /* report icon label */ 3602 case 20: /* report icon label */
3509 { 3603 {
3510 char *s; 3604 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3605 XGetIconName (xdisp, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3606 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3607 XFree (s);
3514 } 3608 }
3515 break; 3609 break;
3516 case 21: /* report window title */ 3610 case 21: /* report window title */
3517 { 3611 {
3518 char *s; 3612 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3613 XFetchName (xdisp, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3615 XFree (s);
3522 } 3616 }
3523 break; 3617 break;
3524 } 3618 }
3525} 3619}
… …
3528/*----------------------------------------------------------------------*/ 3622/*----------------------------------------------------------------------*/
3529/* 3623/*
3530 * get input up until STRING TERMINATOR (or BEL) 3624 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3625 * ends_how is terminator used. returned input must be free()'d
3532 */ 3626 */
3533unsigned char * 3627char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3628rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3629{
3536 unicode_t ch; 3630 unicode_t ch;
3537 bool seen_esc = false; 3631 bool seen_esc = false;
3538 unsigned int n = 0; 3632 unsigned int n = 0;
… …
3557 else if (ch < 0x20) 3651 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3652 return NULL; /* other control character - exit */
3559 3653
3560 seen_esc = false; 3654 seen_esc = false;
3561 3655
3562 if (n >= sizeof (string) - 1) 3656 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3657 // stop at some sane length
3564 return NULL; 3658 return NULL;
3565 3659
3566 if (ch == C0_SYN) 3660 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3661 string[n++] = cmd_get8 ();
… …
3571 3665
3572 string[n++] = '\0'; 3666 string[n++] = '\0';
3573 3667
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3668 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3669
3576 return (unsigned char *)rxvt_wcstombs (string); 3670 return rxvt_wcstombs (string);
3577} 3671}
3578 3672
3579/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
3580/* 3674/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3675 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3676 */
3583void 3677void
3584rxvt_term::process_dcs_seq () 3678rxvt_term::process_dcs_seq ()
3585{ 3679{
3586 unsigned char *s; 3680 char *s;
3587 unicode_t eh; 3681 unicode_t eh;
3588 3682
3589 /* 3683 /*
3590 * Not handled yet 3684 * Not handled yet
3591 */ 3685 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3704 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3705 arg = arg * 10 + (ch - '0');
3612 3706
3613 if (ch == ';') 3707 if (ch == ';')
3614 { 3708 {
3615 unsigned char *s = get_to_st (eh); 3709 char *s = get_to_st (eh);
3616 3710
3617 if (s) 3711 if (s)
3618 { 3712 {
3619 process_xterm_seq (arg, (char *)s, eh); 3713 process_xterm_seq (arg, s, eh);
3620 free (s); 3714 free (s);
3621 } 3715 }
3622 } 3716 }
3623} 3717}
3624 3718
3625void 3719void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3720rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3721{
3628 if (str[0] == '?' && !str[1]) 3722 if (str[0] == '?' && !str[1])
3629 { 3723 {
3630 unsigned short r, g, b; 3724 rgba c;
3631 pix_colors_focused[color].get (display, r, g, b); 3725 pix_colors_focused[color].get (this, c);
3726
3727#if XFT
3728 if (c.a != rgba::MAX_CC)
3729 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3730 else
3731#endif
3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3633 } 3733 }
3634 else 3734 else
3635 set_window_color (color, str); 3735 set_window_color (color, str);
3636} 3736}
3637 3737
3638/* 3738/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3740 */
3663void 3741void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3743{
3666 int changed = 0;
3667 int color; 3744 int color;
3668 char *buf, *name; 3745 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3746 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3747 int saveop = op;
3748
3749 dLocal (Display *, xdisp);
3671 3750
3672 assert (str != NULL); 3751 assert (str != NULL);
3673 switch (op) 3752 switch (op)
3674 { 3753 {
3675 case XTerm_name: 3754 case XTerm_name:
… …
3691 unsigned long bytes_after; 3770 unsigned long bytes_after;
3692 unsigned char *value = 0; 3771 unsigned char *value = 0;
3693 const char *str = ""; 3772 const char *str = "";
3694 3773
3695 if (prop 3774 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3775 && XGetWindowProperty (xdisp, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3776 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3777 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3778 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3779 && actual_type != None
3701 && actual_format == 8) 3780 && actual_format == 8)
3702 str = (const char *)(value); 3781 str = (const char *)(value);
3703 3782
3704 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3783 tt_printf ("\033]%d;%s%c", op, str, resp);
3705 3784
3706 XFree (value); 3785 XFree (value);
3707 } 3786 }
3708 else 3787 else
3709 { 3788 {
… …
3713 { 3792 {
3714 *eq = 0; 3793 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3794 set_utf8_property (display->atom (str), eq + 1);
3716 } 3795 }
3717 else 3796 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3797 XDeleteProperty (xdisp, parent[0],
3719 display->atom (str)); 3798 display->atom (str));
3720 } 3799 }
3721 break; 3800 break;
3722 3801
3723 case XTerm_Color: 3802 case XTerm_Color:
… …
3725 { 3804 {
3726 if ((name = strchr (buf, ';')) == NULL) 3805 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3806 break;
3728 3807
3729 *name++ = '\0'; 3808 *name++ = '\0';
3730 color = atoi (buf); 3809 color = atoi (buf) + minCOLOR;
3731 3810
3732 if (color < 0 || color >= TOTAL_COLORS) 3811 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3812 break;
3734 3813
3735 if ((buf = strchr (name, ';')) != NULL) 3814 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3815 *buf++ = '\0';
3737 3816
3738 if (name[0] == '?' && !name[1]) 3817 process_color_seq (op, color, name, resp);
3739 {
3740 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 }
3744 else
3745 set_window_color (color + minCOLOR, name);
3746 } 3818 }
3747 break; 3819 break;
3748 case XTerm_Color00: 3820 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3821 process_color_seq (op, Color_fg, str, resp);
3750 break; 3822 break;
3751 case XTerm_Color01: 3823 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3824 process_color_seq (op, Color_bg, str, resp);
3753 break; 3825 break;
3754#ifndef NO_CURSORCOLOR 3826#ifndef NO_CURSORCOLOR
3755 case XTerm_Color_cursor: 3827 case XTerm_Color_cursor:
3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3828 process_color_seq (op, Color_cursor, str, resp);
3757 break; 3829 break;
3758#endif 3830#endif
3759 case XTerm_Color_pointer_fg: 3831 case XTerm_Color_pointer_fg:
3760 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3832 process_color_seq (op, Color_pointer_fg, str, resp);
3761 break; 3833 break;
3762 case XTerm_Color_pointer_bg: 3834 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3835 process_color_seq (op, Color_pointer_bg, str, resp);
3764 break; 3836 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3837#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break;
3775 case XTerm_Color_RV: 3838 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3839 process_color_seq (op, Color_RV, str, resp);
3840 break;
3841 case Rxvt_Color_BD:
3842 case URxvt_Color_BD:
3843 process_color_seq (op, Color_BD, str, resp);
3844 break;
3845 case Rxvt_Color_UL:
3846 case URxvt_Color_UL:
3847 process_color_seq (op, Color_UL, str, resp);
3848 break;
3849 case URxvt_Color_IT:
3850 process_color_seq (op, Color_IT, str, resp);
3777 break; 3851 break;
3778#endif 3852#endif
3779#if TRANSPARENT && TINTING 3853#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3854 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3855 process_color_seq (op, Color_tint, str, resp);
3856
3782 check_our_parents (); 3857 check_our_parents ();
3858
3783 if (am_transparent) 3859 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3785 break;
3786#endif
3787 3861
3862 break;
3863#endif
3864
3788 case XTerm_Pixmap: 3865 case Rxvt_Pixmap:
3866 {
3789 if (*str != ';') 3867 if (*str != ';')
3790 { 3868 {
3791#if XPM_BACKGROUND 3869#if XPM_BACKGROUND
3792 scale_pixmap (""); /* reset to default scaling */ 3870 scale_pixmap (""); /* reset to default scaling */
3793 set_bgPixmap (str); /* change pixmap */ 3871 set_bgPixmap (str); /* change pixmap */
3794#endif
3795 scr_touch (true); 3872 scr_touch (true);
3873#endif
3796 } 3874 }
3875
3876 int changed = 0;
3877
3797 while ((str = strchr (str, ';')) != NULL) 3878 while ((str = strchr (str, ';')) != NULL)
3798 { 3879 {
3799 str++; 3880 str++;
3800#if XPM_BACKGROUND 3881#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3882 changed += scale_pixmap (str);
3802#endif 3883#endif
3803
3804 } 3884 }
3885
3805 if (changed) 3886 if (changed)
3806 { 3887 {
3807#ifdef XPM_BACKGROUND 3888#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3889 resize_pixmap ();
3809#endif
3810 scr_touch (true); 3890 scr_touch (true);
3891#endif
3811 } 3892 }
3893 }
3812 break; 3894 break;
3813 3895
3814 case XTerm_restoreFG: 3896 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3897 set_window_color (Color_fg, str);
3816 break; 3898 break;
3817 case XTerm_restoreBG: 3899 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3900 set_window_color (Color_bg, str);
3819 break; 3901 break;
3820 3902
3821 case XTerm_logfile: 3903 case XTerm_logfile:
3822 // TODO, when secure mode? 3904 // TODO, when secure mode?
3823 break; 3905 break;
3824 3906
3907#if 0
3908 case Rxvt_dumpscreen: /* no error notices */
3909 {
3910 int fd;
3911 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3912 {
3913 scr_dump (fd);
3914 close (fd);
3915 }
3916 }
3917 break;
3918#endif
3825 case XTerm_font: 3919 case XTerm_font:
3826 op = URxvt_font; 3920 op = URxvt_font;
3827 case URxvt_font: 3921 case URxvt_font:
3828#if ENABLE_STYLES 3922#if ENABLE_STYLES
3829 case URxvt_boldFont: 3923 case URxvt_boldFont:
3830 case URxvt_italicFont: 3924 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3925 case URxvt_boldItalicFont:
3832#endif 3926#endif
3833 if (query) 3927 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3928 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3929 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3930 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3931 resp);
3838 else 3932 else
3839 { 3933 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3934 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3935
… …
3843 allocated.push_back ((void *)res); 3937 allocated.push_back ((void *)res);
3844 set_fonts (); 3938 set_fonts ();
3845 } 3939 }
3846 break; 3940 break;
3847 3941
3848#if ENABLE_FRILLS 3942 case URxvt_version:
3849 case XTerm_locale:
3850 if (query) 3943 if (query)
3944 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3945 op,
3946 rs[Rs_name], VERSION[0], VERSION[2],
3947 resp);
3948 break;
3949
3950#if !ENABLE_MINIMAL
3951 case URxvt_locale:
3952 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3953 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3852 else 3954 else
3853 { 3955 {
3854 set_locale (str); 3956 set_locale (str);
3855# ifdef USE_XIM 3957 pty->set_utf8_mode (enc_utf8);
3856 im_cb (); 3958 init_xlocale ();
3857# endif
3858 } 3959 }
3859 break; 3960 break;
3860#endif
3861 3961
3862#ifdef MENUBAR 3962 case URxvt_view_up:
3863 case XTerm_Menu: 3963 case URxvt_view_down:
3864 if (options & Opt_insecure) 3964 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3965 int lines = atoi (str);
3966
3967 if (lines)
3968 scr_page (op == URxvt_view_up ? UP : DN, lines);
3969 else
3970 scr_erase_savelines ();
3971 }
3972
3866 break; 3973 break;
3867#endif 3974#endif
3868#if 0 3975
3869 case XTerm_dumpscreen: /* no error notices */ 3976#if ENABLE_PERL
3870 { 3977 case URxvt_perl:
3871 int fd; 3978 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3979 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 3980 break;
3879#endif 3981#endif
3880 } 3982 }
3881} 3983}
3882/*----------------------------------------------------------------------*/ 3984/*----------------------------------------------------------------------*/
… …
3913 return state; 4015 return state;
3914} 4016}
3915 4017
3916/* we're not using priv _yet_ */ 4018/* we're not using priv _yet_ */
3917void 4019void
3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4020rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3919{ 4021{
3920 unsigned int i, j; 4022 unsigned int i, j;
3921 int state; 4023 int state;
3922 4024
3923 static const struct 4025 static const struct
… …
3934 { 5, PrivMode_rVideo }, 4036 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 4037 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 4038 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 4039 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 4040 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 4041 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 4042 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 4043#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 4044 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 4045#endif
… …
3991 } 4090 }
3992 4091
3993 /* extra handling for values with state unkept */ 4092 /* extra handling for values with state unkept */
3994 switch (arg[i]) 4093 switch (arg[i])
3995 { 4094 {
4095#if ENABLE_STYLES
4096 case 1021:
4097 set_option (Opt_intensityStyles, mode);
4098
4099 scr_touch (true);
4100 break;
4101#endif
3996 case 1048: /* alternative cursor save */ 4102 case 1048: /* alternative cursor save */
3997 case 1049: 4103 case 1049:
3998 if (options & Opt_secondaryScreen) 4104 if (OPTION (Opt_secondaryScreen))
3999 if (mode == 0) 4105 if (mode == 0)
4000 scr_cursor (RESTORE); 4106 scr_cursor (RESTORE);
4001 else if (mode == 1) 4107 else if (mode == 1)
4002 scr_cursor (SAVE); 4108 scr_cursor (SAVE);
4003 break; 4109 break;
… …
4015 */ 4121 */
4016 PrivMode (1, PrivMode_vt52); 4122 PrivMode (1, PrivMode_vt52);
4017 break; 4123 break;
4018 case 3: /* 80/132 */ 4124 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4125 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4126 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4127 break;
4022 case 4: /* smooth scrolling */ 4128 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 4129 set_option (Opt_jumpScroll, !state);
4027 break; 4130 break;
4028 case 5: /* reverse video */ 4131 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 4132 scr_rvideo_mode (state);
4030 break; 4133 break;
4031 case 6: /* relative/absolute origins */ 4134 case 6: /* relative/absolute origins */
… …
4037 /* case 8: - auto repeat, can't do on a per window basis */ 4140 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 4141 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 4142 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 4143 priv_modes &= ~PrivMode_MouseX11;
4041 break; 4144 break;
4042#ifdef menuBar_esc
4043 case menuBar_esc:
4044#ifdef MENUBAR
4045 map_menuBar (state);
4046#endif
4047 break;
4048#endif
4049#ifdef scrollBar_esc 4145#ifdef scrollBar_esc
4050 case scrollBar_esc: 4146 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 4147 if (scrollbar_mapping (state))
4052 { 4148 {
4053 resize_all_windows (0, 0, 0); 4149 resize_all_windows (0, 0, 0);
… …
4072#if 0 4168#if 0
4073 case 1001: 4169 case 1001:
4074 break; /* X11 mouse highlighting */ 4170 break; /* X11 mouse highlighting */
4075#endif 4171#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 4172 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 4173 set_option (Opt_scrollTtyOutput, !state);
4081 break; 4174 break;
4082 case 1011: /* scroll to bottom on key press */ 4175 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 4176 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 4177 break;
4088 case 1047: /* secondary screen w/ clearing last */ 4178 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 4179 if (OPTION (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 4180 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 4181 scr_erase_screen (2);
4092 scr_change_screen (state); 4182 scr_change_screen (state);
4093 break; 4183 break;
4094 case 1049: /* secondary screen w/ clearing first */ 4184 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 4185 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 4186 if (OPTION (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 4187 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 4188 scr_erase_screen (2);
4099 break; 4189 break;
4100 default: 4190 default:
4101 break; 4191 break;
… …
4229 scr_color (Color_bg, Color_bg); 4319 scr_color (Color_bg, Color_bg);
4230 break; 4320 break;
4231 4321
4232 //case 50: // not variable spacing 4322 //case 50: // not variable spacing
4233 4323
4234#ifndef NO_BRIGHTCOLOR 4324#if !ENABLE_MINIMAL
4235 case 90: 4325 case 90:
4236 case 91: /* set bright fg color */ 4326 case 91: /* set bright fg color */
4237 case 92: 4327 case 92:
4238 case 93: 4328 case 93:
4239 case 94: 4329 case 94:
… …
4251 case 106: 4341 case 106:
4252 case 107: 4342 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4343 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 4344 break;
4255#endif 4345#endif
4256
4257 } 4346 }
4258 } 4347 }
4259} 4348}
4260/*}}} */ 4349/*}}} */
4261 4350
… …
4285 */ 4374 */
4286void 4375void
4287rxvt_term::tt_printf (const char *fmt,...) 4376rxvt_term::tt_printf (const char *fmt,...)
4288{ 4377{
4289 va_list arg_ptr; 4378 va_list arg_ptr;
4290 unsigned char buf[256]; 4379 char buf[256];
4291 4380
4292 va_start (arg_ptr, fmt); 4381 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4382 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 4383 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 4384 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 4389 * or generated by us in response to a query ESC sequence.
4301 */ 4390 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4391const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 4392
4304void 4393void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4394rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 4395{
4396 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4397 return;
4398
4399 if (pty->pty < 0)
4400 return;
4401
4307 if (v_buflen == 0) 4402 if (v_buflen == 0)
4308 { 4403 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4404 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4310 4405
4311 if ((unsigned int)written == len) 4406 if ((unsigned int)written == len)
4312 return; 4407 return;
4313 4408
4314 data += written; 4409 data += written;
4315 len -= written; 4410 len -= written;
4316 } 4411 }
4317 4412
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4413 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4414
4320 memcpy (v_buffer + v_buflen, data, len); 4415 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4416 v_buflen += len;
4322 4417
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4418 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324} 4419}
4325 4420
4326void rxvt_term::pty_write () 4421void rxvt_term::pty_write ()
4327{ 4422{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4423 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329 4424
4330 if (written > 0) 4425 if (written > 0)
4331 { 4426 {
4332 v_buflen -= written; 4427 v_buflen -= written;
4333 4428
… …
4342 } 4437 }
4343 4438
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4439 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4440 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4441 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4442 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4443}
4350 4444
4351/*----------------------- end-of-file (C source) -----------------------*/ 4445/*----------------------- end-of-file (C source) -----------------------*/
4352 4446

Diff Legend

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