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

Diff Legend

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