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.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

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

Diff Legend

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