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.308 by root, Mon Feb 20 19:42:55 2006 UTC

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

Diff Legend

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