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.175 by root, Sat Dec 11 17:18:29 2004 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

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

Diff Legend

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