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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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 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);
… …
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{
915 flush_ev.stop (); 1030 flush_ev.stop ();
… …
923 } 1038 }
924#endif 1039#endif
925 1040
926 if (want_refresh) 1041 if (want_refresh)
927 { 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
928 scr_refresh (refresh_type); 1081 scr_refresh ();
929 scrollbar_show (1); 1082 scrollbar_show (1);
930#ifdef USE_XIM 1083#ifdef USE_XIM
931 IMSendSpot (); 1084 IMSendSpot ();
932#endif 1085#endif
933 } 1086 }
… …
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)))
1375 return;
1206 1376
1207#if defined(POINTER_BLANK) 1377 // for XQueryPointer
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 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1380 unsigned int unused_mask;
1224 1381
1225 switch (ev.type) 1382 switch (ev.type)
1226 { 1383 {
1227 case KeyPress: 1384 case KeyPress:
1228#if ISO_14755 1385 key_press (ev.xkey);
1229 if (!(iso14755buf & ISO_14755_52))
1230#endif
1231 lookup_key (ev.xkey);
1232
1233 break; 1386 break;
1234 1387
1235 case KeyRelease: 1388 case KeyRelease:
1236 { 1389 key_release (ev.xkey);
1237#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1238 KeySym ks;
1239
1240 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1241#endif
1242
1243#if ENABLE_FRILLS || ISO_14755
1244 // ISO 14755 support
1245 if (iso14755buf)
1246 if (iso14755buf & ISO_14755_52)
1247 {
1248# if ENABLE_OVERLAY
1249 scr_overlay_off ();
1250# endif
1251# if ISO_14755
1252 // iso14755 part 5.2 handling: release time
1253 // first: controls
1254 if ((ev.xkey.state & ControlMask)
1255 && ((ks >= 0x40 && ks <= 0x5f)
1256 || (ks >= 0x61 && ks <= 0x7f)))
1257 {
1258 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1259 commit_iso14755 ();
1260 return; // case-break;
1261 }
1262
1263 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1264 if (i[0] == ks)
1265 {
1266 iso14755buf = ISO_14755_51 | i[1];
1267 commit_iso14755 ();
1268 return; // case-break;
1269 }
1270
1271 scr_bell ();
1272# endif
1273 iso14755buf = 0;
1274 break;
1275 }
1276 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281 if (iso14755buf & ISO_14755_51)
1282 commit_iso14755 ();
1283#if ISO_14755
1284 else if (iso14755buf & ISO_14755_STARTED)
1285 {
1286 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1287
1288 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1289 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1290 }
1291# endif
1292 else
1293 iso14755buf = 0;
1294 }
1295#endif
1296
1297#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1298 if (!(ev.xkey.state & ControlMask))
1299 slip_wheel_ev.stop ();
1300 else if (ks == XK_Control_L || ks == XK_Control_R)
1301 mouse_slip_wheel_speed = 0;
1302#endif
1303 break; 1390 break;
1304 }
1305 1391
1306 case ButtonPress: 1392 case ButtonPress:
1307 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1308 break; 1394 break;
1309 1395
… …
1311 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1312 break; 1398 break;
1313 1399
1314 case ClientMessage: 1400 case ClientMessage:
1315 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1317 destroy ();
1318#ifdef OFFIX_DND
1319 /* OffiX Dnd (drag 'n' drop) protocol */
1320 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321 && (ev.xclient.data.l[0] == DndFile
1322 || ev.xclient.data.l[0] == DndDir
1323 || ev.xclient.data.l[0] == DndLink))
1324 { 1403 {
1325 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1326 Atom ActualType; 1405 {
1327 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1328 unsigned char *data; 1407 {
1329 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1330 1409 {
1331 XGetWindowProperty (display->display, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1332 xa[XA_DNDSELECTION], 1411 destroy ();
1333 0L, 1000000L, 1412 }
1334 False, AnyPropertyType, 1413#if ENABLE_EWMH
1335 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1336 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1337 &data); 1417 &ev);
1338 XChangeProperty (display->display, display->root, 1418#endif
1339 XA_CUT_BUFFER0, XA_STRING, 1419 }
1340 8, PropModeReplace, 1420 }
1341 data, strlen (data)); 1421#if ENABLE_XEMBED
1342 XFree (data); 1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1423 {
1344 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
1345 } 1430 }
1346#endif /* OFFIX_DND */
1347 break; 1431 break;
1348 1432
1349 case MappingNotify: 1433 case MappingNotify:
1350 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1351 break; 1435 break;
… …
1374 break; 1458 break;
1375 } 1459 }
1376 break; 1460 break;
1377 1461
1378 case FocusIn: 1462 case FocusIn:
1379 if (!TermWin.focus) 1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1466 focus_in ();
1467 break;
1468
1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1473 focus_out ();
1474 break;
1475
1476 case ConfigureNotify:
1477 if (ev.xconfigure.window == parent[0])
1380 { 1478 {
1381 TermWin.focus = 1; 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1382 want_refresh = 1;
1383#ifdef USE_XIM
1384 if (Input_Context != NULL)
1385 { 1480 ;
1386 IMSetStatusPosition ();
1387 XSetICFocus (Input_Context);
1388 }
1389#endif
1390#ifdef CURSOR_BLINK
1391 if (options & Opt_cursorBlink)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1400#endif
1401 1481
1402 }
1403 break;
1404
1405 case FocusOut:
1406 if (TermWin.focus)
1407 {
1408 TermWin.focus = 0;
1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1417#ifdef USE_XIM
1418 if (Input_Context != NULL)
1419 XUnsetICFocus (Input_Context);
1420#endif
1421#ifdef CURSOR_BLINK
1422 if (options & Opt_cursorBlink)
1423 cursor_blink_ev.stop ();
1424 hidden_cursor = 0;
1425#endif
1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1433 }
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == TermWin.parent[0])
1438 {
1439 int height, width;
1440
1441 do
1442 { /* Wrap lots of configures into one */
1443 width = ev.xconfigure.width;
1444 height = ev.xconfigure.height;
1445 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446 }
1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1448
1449 if (szHint.width != width || szHint.height != height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450 { 1483 {
1451 seen_resize = 1; 1484 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453 } 1486 }
1454 1487
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1456 if (options & Opt_transparent) 1491 if (option (Opt_transparent))
1457 {
1458 check_our_parents (); 1492 check_our_parents ();
1459 if (am_transparent)
1460 want_refresh = want_full_refresh = 1;
1461 }
1462#endif 1493#endif
1463 } 1494 }
1464 break; 1495 break;
1465 1496
1466 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1502
1471 break; 1503 break;
1472 1504
1473 case SelectionClear: 1505 case SelectionClear:
1474 selection_clear (); 1506 selection_clear ();
1475 break; 1507 break;
1476 1508
1477 case SelectionNotify: 1509 case SelectionNotify:
1478 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 ev.xselection.property, True);
1481 break; 1512 break;
1482 1513
1483 case SelectionRequest: 1514 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1485 break; 1516 break;
1486 1517
1518 case MapNotify:
1519 mapped = 1;
1520#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1522#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break;
1525
1487 case UnmapNotify: 1526 case UnmapNotify:
1488 TermWin.mapped = 0; 1527 mapped = 0;
1489#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1490 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1491#endif 1530#endif
1492 break; 1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1493
1494 case MapNotify:
1495 TermWin.mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 break; 1532 break;
1500 1533
1501#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1502 case ReparentNotify: 1535 case ReparentNotify:
1503 rootwin_cb (ev); 1536 rootwin_cb (ev);
1504 break; 1537 break;
1505#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1506 1539
1507 case GraphicsExpose: 1540 case GraphicsExpose:
1508 case Expose: 1541 case Expose:
1509 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1510 { 1543 {
1511 do 1544 do
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515 1548
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1550
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1521 1554
1522 scr_refresh (refresh_type); 1555 want_refresh = 1;
1523 } 1556 }
1524 else 1557 else
1525 { 1558 {
1526 XEvent unused_event; 1559 XEvent unused_event;
1527 1560
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1562 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1564 ;
1532 1565
1533 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1534 { 1567 {
1535 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1536 scrollbar_show (0); 1569 scrollbar_show (0);
1537 } 1570 }
1538#ifdef MENUBAR
1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1540 menubar_expose ();
1541#endif
1542 1571
1543#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1545 XClearWindow (display->display, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1546#endif 1575#endif
1547 } 1576 }
1548 break; 1577 break;
1549 1578
1550 case MotionNotify: 1579 case MotionNotify:
1551#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1552 if (hidden_pointer) 1581 if (hidden_pointer)
1553 pointer_unblank (); 1582 pointer_unblank ();
1554#endif 1583#endif
1555#if MENUBAR
1556 if (isMenuBarWindow (ev.xany.window))
1557 {
1558 menubar_control (ev.xbutton);
1559 break;
1560 }
1561#endif
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1585 break;
1564 1586
1565 if (ev.xany.window == TermWin.vt) 1587 if (ev.xany.window == vt)
1566 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1591 ; // nop
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1593 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1570 ; 1595 ;
1571 1596
1572 XQueryPointer (display->display, TermWin.vt, 1597 XQueryPointer (dpy, vt,
1573 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1601 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1589#endif 1614#endif
1590 selection_extend (ev.xbutton.x, ev.xbutton.y, 1615 selection_extend (ev.xbutton.x, ev.xbutton.y,
1591 ev.xbutton.state & Button3Mask ? 2 : 0); 1616 ev.xbutton.state & Button3Mask ? 2 : 0);
1592 1617
1593#ifdef SELECTION_SCROLLING 1618#ifdef SELECTION_SCROLLING
1594 if (ev.xbutton.y < TermWin.int_bwidth 1619 if (ev.xbutton.y < int_bwidth
1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1620 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1596 { 1621 {
1597 int dist; 1622 int dist;
1598 1623
1599 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1600 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
… …
1608 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
1609 selection_save_y = ev.xbutton.y; 1634 selection_save_y = ev.xbutton.y;
1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1635 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611 1636
1612 /* calc number of lines to scroll */ 1637 /* calc number of lines to scroll */
1613 if (ev.xbutton.y < TermWin.int_bwidth) 1638 if (ev.xbutton.y < int_bwidth)
1614 { 1639 {
1615 scroll_selection_dir = UP; 1640 scroll_selection_dir = UP;
1616 dist = TermWin.int_bwidth - ev.xbutton.y; 1641 dist = int_bwidth - ev.xbutton.y;
1617 } 1642 }
1618 else 1643 else
1619 { 1644 {
1620 scroll_selection_dir = DN; 1645 scroll_selection_dir = DN;
1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1646 dist = ev.xbutton.y - (int_bwidth + height);
1622 } 1647 }
1623 1648
1624 scroll_selection_lines = Pixel2Height (dist) 1649 scroll_selection_lines = Pixel2Height (dist)
1625 / SELECTION_SCROLL_LINE_SPEEDUP 1650 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1; 1651 + 1;
1627 MIN_IT (scroll_selection_lines, 1652 min_it (scroll_selection_lines,
1628 SELECTION_SCROLL_MAX_LINES); 1653 SELECTION_SCROLL_MAX_LINES);
1629 } 1654 }
1630 else 1655 else
1631 { 1656 {
1632 /* we are within the text window, so we 1657 /* we are within the text window, so we
… …
1641#endif 1666#endif
1642 } 1667 }
1643 } 1668 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645 { 1670 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1647 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1648 ; 1673 ;
1649 1674
1650 XQueryPointer (display->display, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1651 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1679 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1656 scrollbar_size ()); 1681 scrollbar_size ());
1657 scr_refresh (refresh_type); 1682 want_refresh = 1;
1658 refresh_limit = 0; 1683 refresh_limit = 0;
1659 scrollbar_show (1); 1684 scrollbar_show (1);
1660 } 1685 }
1661 break; 1686 break;
1662 } 1687 }
1663}
1664 1688
1665#if TRANSPARENT 1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1715}
1716
1717void
1718rxvt_term::focus_in ()
1719{
1720 if (!focus)
1721 {
1722 focus = 1;
1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM
1728 if (Input_Context != NULL)
1729 {
1730 IMSetPosition ();
1731 XSetICFocus (Input_Context);
1732 }
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_focused;
1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1758 }
1759}
1760
1761void
1762rxvt_term::focus_out ()
1763{
1764 if (focus)
1765 {
1766 focus = 0;
1767 want_refresh = 1;
1768
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1770
1771#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf)
1773 {
1774 iso14755buf = 0;
1775# if ENABLE_OVERLAY
1776 scr_overlay_off ();
1777# endif
1778 }
1779#endif
1780#if USE_XIM
1781 if (Input_Context != NULL)
1782 XUnsetICFocus (Input_Context);
1783#endif
1784#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop ();
1787 hidden_cursor = 0;
1788#endif
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 pix_colors = pix_colors_unfocused;
1793 scr_recolour ();
1794 }
1795#endif
1796 }
1797}
1798
1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1666void 1813void
1667rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1815{
1669 SET_R (this); 1816 make_current ();
1670 SET_LOCALE (locale);
1671 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1672 switch (ev.type) 1823 switch (ev.type)
1673 { 1824 {
1674 case PropertyNotify: 1825 case PropertyNotify:
1675 /* 1826 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1677 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1678 */ 1829 */
1679 if (xa[XA_XROOTPMAPID] == 0)
1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1683 return; 1832 return;
1684 1833
1685 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1686 case ReparentNotify: 1835 case ReparentNotify:
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1688 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1689 break; 1838 break;
1690 } 1839 }
1840# endif
1691} 1841}
1692#endif 1842#endif
1693 1843
1694void 1844void
1695rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
1696{ 1846{
1697 int reportmode = 0, clickintime; 1847 int reportmode = 0, clickintime;
1698 1848
1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1849 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1850
1700 if (!bypass_keystate) 1851 if (!bypass_keystate)
1701 reportmode = !! (priv_modes & PrivMode_mouse_report); 1852 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702 1853
1703 /* 1854 /*
1704 * VT window processing of button press 1855 * VT window processing of button press
1705 */ 1856 */
1706 if (ev.window == TermWin.vt) 1857 if (ev.window == vt)
1707 { 1858 {
1859 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 return;
1861
1708#if ISO_14755 1862#if ISO_14755
1709 // 5.4 1863 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 { 1865 {
1712 iso14755_54 (ev.x, ev.y); 1866 iso14755_54 (ev.x, ev.y);
… …
1724#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1725 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1726 { 1880 {
1727 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1728 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1729 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1730 { 1885 {
1731 /* only report double clicks */ 1886 /* only report double clicks */
1732 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1733 mouse_report (ev); 1888 mouse_report (ev);
… …
1759 { 1914 {
1760 case Button1: 1915 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1920#else
1766 selection.rect = false; 1921 selection.rect = false;
1767#endif 1922#endif
1768 1923
1769 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1771 { 1926 {
1772 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1773 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1774 else 1929 else
1775 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
… …
1916 case Button3: 2071 case Button3:
1917 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1918 { 2073 {
1919 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1921 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1922# else 2077# else
1923 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1924# endif 2079# endif
1925 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1926# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1927 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1928# else 2083# else
1929 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1930# endif 2085# endif
1931 else 2086 else
1932 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1933 } 2088 }
1934 else 2089 else
1935 { 2090 {
1936 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1937 (TermWin.nrow 2092 (nrow
1938 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1939 / scrollbar_size ())); 2094 / scrollbar_size ()));
1940 } 2095 }
1941 2096
1942 break; 2097 break;
1943 } 2098 }
1944 } 2099 }
2100
1945 return; 2101 return;
1946 } 2102 }
1947#if MENUBAR
1948 /*
1949 * Menubar window processing of button press
1950 */
1951 if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2103}
1955 2104
1956void 2105void
1957rxvt_term::button_release (XButtonEvent &ev) 2106rxvt_term::button_release (XButtonEvent &ev)
1958{ 2107{
… …
1964 2113
1965 if (scrollbar_isUpDn ()) 2114 if (scrollbar_isUpDn ())
1966 { 2115 {
1967 scrollBar.setIdle (); 2116 scrollBar.setIdle ();
1968 scrollbar_show (0); 2117 scrollbar_show (0);
1969#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1970 refresh_type &= ~SMOOTH_REFRESH;
1971#endif
1972 } 2118 }
1973 2119
1974#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
1975 if (sel_scroll_ev.active) 2121 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop(); 2122 sel_scroll_ev.stop();
1977#endif 2123#endif
1978 2124
1979 if (ev.window == TermWin.vt) 2125 if (ev.window == vt)
1980 { 2126 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
1981#if ISO_14755 2130#if ISO_14755
1982 // 5.4 2131 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2132 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return; 2133 return;
1985#endif 2134#endif
2135
1986 if (reportmode) 2136 if (reportmode)
1987 { 2137 {
1988 /* mouse report from vt window */ 2138 /* mouse report from vt window */
1989 /* don't report release of wheel "buttons" */ 2139 /* don't report release of wheel "buttons" */
1990 if (ev.button >= 4) 2140 if (ev.button >= 4)
… …
2020 { 2170 {
2021 case Button1: 2171 case Button1:
2022 case Button3: 2172 case Button3:
2023 selection_make (ev.time); 2173 selection_make (ev.time);
2024 break; 2174 break;
2175
2025 case Button2: 2176 case Button2:
2026 selection_request (ev.time, ev.x, ev.y); 2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2027 break; 2179 break;
2180
2028#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2029 case Button4: 2182 case Button4:
2030 case Button5: 2183 case Button5:
2031 { 2184 {
2032 int i; 2185 int i;
… …
2034 2187
2035 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2036 2189
2037 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2038 i = 1; 2191 i = 1;
2039 else if (options & Opt_mouseWheelScrollPage) 2192 else if (option (Opt_mouseWheelScrollPage))
2040 i = TermWin.nrow - 1; 2193 i = nrow - 1;
2041 else 2194 else
2042 i = 5; 2195 i = 5;
2043 2196
2044# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
2045 if (ev.state & ControlMask) 2198 if (ev.state & ControlMask)
2046 { 2199 {
2047 mouse_slip_wheel_speed += v ? -1 : 1; 2200 mouse_slip_wheel_speed += v ? -1 : 1;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2050 2203
2051 if (slip_wheel_ev.at < NOW) 2204 if (slip_wheel_ev.at < NOW)
2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2053 2206
2054 slip_wheel_ev.start (); 2207 slip_wheel_ev.start ();
2055 } 2208 }
2056 else 2209 else
2057 { 2210 {
2058# endif 2211# endif
2059# ifdef JUMP_MOUSE_WHEEL
2060 scr_page (v, i); 2212 scr_page (v, i);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1); 2213 scrollbar_show (1);
2063# else
2064 while (i--)
2065 {
2066 scr_page (v, 1);
2067 scr_refresh (SMOOTH_REFRESH);
2068 scrollbar_show (1);
2069 }
2070# endif
2071# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2072 } 2215 }
2073#endif 2216# endif
2074 } 2217 }
2075 break; 2218 break;
2076#endif 2219#endif
2077 } 2220 }
2078 } 2221 }
2079#ifdef MENUBAR
2080 else if (isMenuBarWindow (ev.window))
2081 menubar_control (ev);
2082#endif
2083} 2222}
2084 2223
2085#ifdef TRANSPARENT 2224#ifdef TRANSPARENT
2086#if TINTING 2225#if TINTING
2087/* taken from aterm-0.4.2 */ 2226/* taken from aterm-0.4.2 */
2088 2227
2089typedef uint32_t RUINT32T; 2228typedef uint32_t RUINT32T;
2090 2229
2091void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2092{ 2231{
2093 int sh_r, sh_g, sh_b; 2232 int sh_r, sh_g, sh_b;
2094 RUINT32T mask_r, mask_g, mask_b; 2233 RUINT32T mask_r, mask_g, mask_b;
2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i; 2237 int i;
2099 2238
2100 Visual* visual = display->visual; 2239 Visual *visual = term->visual;
2101 2240
2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103 2242
2104 /* for convenience */ 2243 /* for convenience */
2105 mask_r = visual->red_mask; 2244 mask_r = visual->red_mask;
… …
2329 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2330 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2331 2470
2332 pchanged = 0; 2471 pchanged = 0;
2333 2472
2334 if (!(options & Opt_transparent)) 2473 if (!option (Opt_transparent))
2335 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2336 2475
2337 XGetWindowAttributes (display->display, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2338 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2339 2478
2340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2341 2480
2342 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2343 { 2482 {
2344 if (am_transparent) 2483 if (am_transparent)
2345 { 2484 {
2346 pchanged = 1; 2485 pchanged = 1;
2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2348 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2349 } 2488 }
2350 2489
2351 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2352 } 2491 }
2353 2492
2354 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2355 XSync (display->display, False); 2494 XSync (dpy, False);
2356 2495
2357 /* 2496 /*
2358 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2359 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2360 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2361 */ 2500 */
2362 i = (xa[XA_XROOTPMAPID] 2501 i = (xa[XA_XROOTPMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2366 2505
2367 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2368 i = (xa[XA_XSETROOTID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2372 2511
2373 if (!i || prop == NULL 2512 if (!i || prop == NULL
2374#if TINTING 2513#if TINTING
2375 || !rs[Rs_color + Color_tint] 2514 || !ISSET_PIXCOLOR (Color_tint)
2376#endif 2515#endif
2377 ) 2516 )
2378 have_pixmap = 0; 2517 have_pixmap = 0;
2379 else 2518 else
2380 { 2519 {
… …
2393 Window cr; 2532 Window cr;
2394 XImage *image; 2533 XImage *image;
2395 GC gc; 2534 GC gc;
2396 XGCValues gcvalue; 2535 XGCValues gcvalue;
2397 2536
2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2399 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2400 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2401 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2402 nx = ny = 0; 2541 nx = ny = 0;
2403 2542
… …
2413 nh += sy; 2552 nh += sy;
2414 ny = -sy; 2553 ny = -sy;
2415 sy = 0; 2554 sy = 0;
2416 } 2555 }
2417 2556
2418 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2419 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2559
2560 XSync (dpy, False);
2420 allowedxerror = -1; 2561 allowedxerror = -1;
2421 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422 2563
2423 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2424 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2425 allowedxerror = 0; 2566 allowedxerror = 0;
2426 2567
2427 if (image == NULL) 2568 if (image == NULL)
2428 { 2569 {
2429 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2430 { 2571 {
2431 pchanged = 1; 2572 pchanged = 1;
2432 if (TermWin.pixmap != None) 2573 if (pixmap != None)
2433 { 2574 {
2434 XFreePixmap (display->display, TermWin.pixmap); 2575 XFreePixmap (dpy, pixmap);
2435 TermWin.pixmap = None; 2576 pixmap = None;
2436 } 2577 }
2437 } 2578 }
2438 2579
2439 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2440 } 2581 }
2441 else 2582 else
2442 { 2583 {
2443 if (TermWin.pixmap != None) 2584 if (pixmap != None)
2444 XFreePixmap (display->display, TermWin.pixmap); 2585 XFreePixmap (dpy, pixmap);
2445 2586
2446#if TINTING 2587#if TINTING
2447 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2448 { 2589 {
2449 unsigned short rm, gm, bm;
2450 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2451 2591
2592 rgba c;
2452 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2593 pix_colors_focused [Color_tint].get (c);
2453 2594
2454 ShadeXImage (display, image, shade, rm, gm, bm); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2455 } 2596 }
2456#endif 2597#endif
2457 2598
2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2459 szHint.width, szHint.height, image->depth);
2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2462 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2463 XFreeGC (display->display, gc); 2603 XFreeGC (dpy, gc);
2464 XDestroyImage (image); 2604 XDestroyImage (image);
2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]); 2606 XClearWindow (dpy, parent[0]);
2467 2607
2468 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2469 pchanged = 1; 2609 pchanged = 1;
2470 2610
2471 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2472 } 2612 }
2473 } 2613 }
2474 2614
2475 if (!am_pixmap_trans) 2615 if (am_pixmap_trans)
2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2617 else
2476 { 2618 {
2477 unsigned int n; 2619 unsigned int n;
2478 /* 2620 /*
2479 * InheritPixmap transparency 2621 * InheritPixmap transparency
2480 */ 2622 */
2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2482 { 2624 {
2483 oldp = TermWin.parent[i]; 2625 oldp = parent[i];
2484 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2485 &TermWin.parent[i], &list, &n);
2486 XFree (list); 2627 XFree (list);
2487 2628
2488 if (TermWin.parent[i] == display->root) 2629 if (parent[i] == display->root)
2489 { 2630 {
2490 if (oldp != None) 2631 if (oldp != None)
2491 pchanged = 1; 2632 pchanged = 1;
2492 2633
2493 break; 2634 break;
2494 } 2635 }
2495 2636
2496 if (oldp != TermWin.parent[i]) 2637 if (oldp != parent[i])
2497 pchanged = 1; 2638 pchanged = 1;
2498 } 2639 }
2499 2640
2500 n = 0; 2641 n = 0;
2501 2642
2502 if (pchanged) 2643 if (pchanged)
2503 {
2504 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2505 { 2645 {
2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508 { 2649 {
2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2510 break; 2651 break;
2511 } 2652 }
2512 } 2653 }
2654
2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2513 } 2656 {
2514
2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2516 {
2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2519 am_transparent = 0; 2659 am_transparent = 0;
2520 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2521 } 2661 }
2522 else 2662 else
2523 { 2663 {
2524#if WAIT_FOR_WM
2525 /* wait (an arbitrary period) for the WM to do its thing
2526 * needed for fvwm2.2.2 (and before?) */
2527 sleep (1);
2528#endif
2529 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2530 { 2665 {
2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]); 2667 XClearWindow (dpy, parent[n]);
2533 } 2668 }
2534 2669
2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2536 am_transparent = 1; 2671 am_transparent = 1;
2537 } 2672 }
2538 2673
2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2540 TermWin.parent[i] = None; 2675 parent[i] = None;
2541 } 2676 }
2542 2677
2543 if (scrollBar.win) 2678 if (scrollBar.win)
2544 { 2679 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2547 scrollbar_show (0); 2682 scrollbar_show (0);
2548 } 2683 }
2549 2684
2685 if (am_transparent)
2686 {
2687 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans)
2689 flush ();
2690 }
2691
2550 return pchanged; 2692 return pchanged;
2551} 2693}
2552#endif 2694#endif
2553 2695
2554/*}}} */ 2696/*}}} */
2555 2697
2556bool 2698bool
2557rxvt_term::cmd_parse () 2699rxvt_term::cmd_parse ()
2558{ 2700{
2559 bool flag = false; 2701 bool flag = false;
2560 unicode_t ch = NOCHAR; 2702 wchar_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2703 char *seq_begin; // remember start of esc-sequence here
2562 2704
2563 for (;;) 2705 for (;;)
2564 { 2706 {
2565 if (ch == NOCHAR) 2707 if (ch == NOCHAR)
2566 { 2708 {
2567 seq_begin = cmdbuf_ptr; 2709 seq_begin = cmdbuf_ptr;
2568 ch = next_char (); 2710 ch = next_char ();
2569 }
2570 2711
2571 if (ch == NOCHAR) // TODO: improve 2712 if (ch == NOCHAR)
2572 break; 2713 break;
2714 }
2573 2715
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 { 2717 {
2576 if (!seen_input) 2718 if (!seen_input)
2577 { 2719 {
… …
2581 // some window managers resize the window early, and these programs 2723 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2724 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2725 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2726 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2727 // resized.
2586 if (seen_resize) 2728 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2729 kill (-cmd_pid, SIGWINCH);
2588 } 2730 }
2589 2731
2590 /* Read a text string from the input buffer */ 2732 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2733 wchar_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2734 bool refreshnow = false;
2593 int nlines = 0; 2735 int nlines = 0;
2594 unicode_t *str = buf; 2736 wchar_t *str = buf;
2737 wchar_t *eol = str + min (ncol, UBUFSIZ);
2595 2738
2596 for (;;) 2739 for (;;)
2597 { 2740 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2742 break;
2600 2743
2601 *str++ = ch; 2744 *str++ = ch;
2602 2745
2603 if (ch == C0_LF) 2746 if (ch == C0_LF || str >= eol)
2604 { 2747 {
2748 if (ch == C0_LF)
2605 nlines++; 2749 nlines++;
2750
2606 refresh_count++; 2751 refresh_count++;
2607 2752
2608 if (!(options & Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2755 {
2611 refreshnow = true; 2756 refreshnow = true;
2757 refresh_count = 0;
2612 ch = NOCHAR; 2758 ch = NOCHAR;
2613 break; 2759 break;
2614 } 2760 }
2615 2761
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2763 if (nlines >= nrow - 1)
2618 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2619 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
2768
2620 nlines = 0; 2769 nlines = 0;
2621 str = buf; 2770 str = buf;
2771 eol = str + min (ncol, UBUFSIZ);
2622 } 2772 }
2623 }
2624 2773
2625 if (str >= buf + UBUFSIZ) 2774 if (str >= eol)
2626 { 2775 {
2776 if (eol >= buf + UBUFSIZ)
2777 {
2627 ch = NOCHAR; 2778 ch = NOCHAR;
2628 break; 2779 break;
2780 }
2781 else
2782 eol = min (eol + ncol, buf + UBUFSIZ);
2783 }
2784
2629 } 2785 }
2630 2786
2631 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2788 ch = next_char ();
2633 } 2789 }
2634 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2635 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2636 2794
2637 /* 2795 /*
2638 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2800 */
2643 if (refreshnow) 2801 if (refreshnow)
2644 { 2802 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2804 refresh_limit++;
2647 else 2805 else
2648 { 2806 {
2649 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2650 scr_refresh (refresh_type); 2809 scr_refresh ();
2810 want_refresh = 1;
2651 } 2811 }
2652 } 2812 }
2653 2813
2654 } 2814 }
2655 else 2815 else
… …
2670 } 2830 }
2671 2831
2672 return flag; 2832 return flag;
2673} 2833}
2674 2834
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2684// read the next character 2835// read the next character
2685unicode_t 2836wchar_t
2686rxvt_term::next_char () 2837rxvt_term::next_char () NOTHROW
2687{ 2838{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2839 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2840 {
2690 // assume 7-bit to be ascii ALWAYS 2841 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2842 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++; 2843 return *cmdbuf_ptr++;
2693 2844
2694 wchar_t wc; 2845 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2846 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2847
2697 if (len == (size_t)-2) 2848 if (len == (size_t)-2)
2698 { 2849 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2850 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2851 cmdbuf_ptr = cmdbuf_endp;
2701 break; 2852 break;
2702 } 2853 }
2703 2854
2704 if (len == (size_t)-1) 2855 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2856 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2857
2707 // assume wchar == unicode 2858 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2859 cmdbuf_ptr += len;
2709 return wc; 2860 return wc & UNICODE_MASK;
2710 } 2861 }
2711 2862
2712 return NOCHAR; 2863 return NOCHAR;
2713} 2864}
2865
2866// read the next octet
2867uint32_t
2868rxvt_term::next_octet () NOTHROW
2869{
2870 return cmdbuf_ptr < cmdbuf_endp
2871 ? (unsigned char)*cmdbuf_ptr++
2872 : NOCHAR;
2873}
2874
2875static class out_of_input out_of_input;
2714 2876
2715/* rxvt_cmd_getc () - Return next input character */ 2877/* rxvt_cmd_getc () - Return next input character */
2716/* 2878/*
2717 * Return the next input character after first passing any keyboard input 2879 * Return the next input character after first passing any keyboard input
2718 * to the command. 2880 * to the command.
2719 */ 2881 */
2720unicode_t 2882wchar_t
2721rxvt_term::cmd_getc () 2883rxvt_term::cmd_getc () THROW ((class out_of_input))
2722{ 2884{
2723 unicode_t c = next_char (); 2885 wchar_t c = next_char ();
2724 2886
2725 if (c == NOCHAR) 2887 if (c == NOCHAR)
2726 throw out_of_input; 2888 throw out_of_input;
2727 2889
2728 return c; 2890 return c;
2729} 2891}
2730 2892
2731unicode_t 2893uint32_t
2732rxvt_term::cmd_get8 () 2894rxvt_term::cmd_get8 () THROW ((class out_of_input))
2733{ 2895{
2734 unicode_t c = next_octet (); 2896 uint32_t c = next_octet ();
2735 2897
2736 if (c == NOCHAR) 2898 if (c == NOCHAR)
2737 throw out_of_input; 2899 throw out_of_input;
2738 2900
2739 return c; 2901 return c;
… …
2839 case C0_ESC: 3001 case C0_ESC:
2840 process_escape_seq (); 3002 process_escape_seq ();
2841 break; 3003 break;
2842 case C0_ENQ: /* terminal Status */ 3004 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 3005 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3006 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 3007 else
2847 tt_write ((unsigned char *)VT100_ANS, 3008 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 3009 break;
2850 case C0_BEL: /* bell */ 3010 case C0_BEL: /* bell */
2851 scr_bell (); 3011 scr_bell ();
2852 break; 3012 break;
2853 case C0_BS: /* backspace */ 3013 case C0_BS: /* backspace */
… …
2977 scr_charset_set (2, (unsigned int)cmd_getc ()); 3137 scr_charset_set (2, (unsigned int)cmd_getc ());
2978 break; 3138 break;
2979 case '+': 3139 case '+':
2980 scr_charset_set (3, (unsigned int)cmd_getc ()); 3140 scr_charset_set (3, (unsigned int)cmd_getc ());
2981 break; 3141 break;
2982#if ENABLE_FRILLS 3142#if !ENABLE_MINIMAL
2983 case '6': 3143 case '6':
2984 scr_backindex (); 3144 scr_backindex ();
2985 break; 3145 break;
2986#endif 3146#endif
2987 case '7': 3147 case '7':
2988 scr_cursor (SAVE); 3148 scr_cursor (SAVE);
2989 break; 3149 break;
2990 case '8': 3150 case '8':
2991 scr_cursor (RESTORE); 3151 scr_cursor (RESTORE);
2992 break; 3152 break;
2993#if ENABLE_FRILLS 3153#if !ENABLE_MINIMAL
2994 case '9': 3154 case '9':
2995 scr_forwardindex (); 3155 scr_forwardindex ();
2996 break; 3156 break;
2997#endif 3157#endif
2998 case '=': 3158 case '=':
… …
3008 break; 3168 break;
3009 3169
3010 /* 8.3.87: NEXT LINE */ 3170 /* 8.3.87: NEXT LINE */
3011 case C1_NEL: /* ESC E */ 3171 case C1_NEL: /* ESC E */
3012 { 3172 {
3013 unicode_t nlcr[] = { C0_LF, C0_CR }; 3173 wchar_t nlcr[] = { C0_LF, C0_CR };
3014 scr_add_lines (nlcr, 1, 2); 3174 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3015 } 3175 }
3016 break; 3176 break;
3017 3177
3018 /* kidnapped escape sequence: Should be 8.3.48 */ 3178 /* kidnapped escape sequence: Should be 8.3.48 */
3019 case C1_ESA: /* ESC G */ 3179 case C1_ESA: /* ESC G */
… …
3041 process_dcs_seq (); 3201 process_dcs_seq ();
3042 break; 3202 break;
3043 3203
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3204 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 3205 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 3206 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 3207 break; /* steal obsolete ESC [ c */
3049 3208
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3209 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3051 case C1_CSI: /* ESC [ */ 3210 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 3211 process_csi_seq ();
… …
3161 ndef = get_byte_array_bit (csi_defaults, i); 3320 ndef = get_byte_array_bit (csi_defaults, i);
3162 for (p = 0; p < nargs; p++) 3321 for (p = 0; p < nargs; p++)
3163 if (arg[p] == -1) 3322 if (arg[p] == -1)
3164 arg[p] = ndef; 3323 arg[p] = ndef;
3165 3324
3166#ifdef DEBUG_CMD
3167 fprintf (stderr, "CSI ");
3168 for (p = 0; p < nargs; p++)
3169 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3170 fprintf (stderr, "%c\n", ch);
3171#endif
3172
3173 /* 3325 /*
3174 * private mode handling 3326 * private mode handling
3175 */ 3327 */
3176 if (priv) 3328 if (priv)
3177 { 3329 {
3178 switch (priv) 3330 switch (priv)
3179 { 3331 {
3180 case '>': 3332 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3333 if (ch == CSI_DA) /* secondary device attributes */
3334 {
3335 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 //
3338 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3339 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3340 // that we do not support xterm mouse reporting (should be 95 when we do).
3341 //
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3342 tt_printf ("\033[>%d;94;0c", 'U');
3343 }
3183 break; 3344 break;
3184 case '?': 3345 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3347 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3348 break;
… …
3292 3453
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3454 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3455 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3456 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3457 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3458 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3459 break;
3299 3460
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3461 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3462 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 3463 break;
3304 3464
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3465 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 3466 process_sgr_mode (nargs, arg);
3307 break; 3467 break;
… …
3314 break; 3474 break;
3315 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3316 scr_report_position (); 3476 scr_report_position ();
3317 break; 3477 break;
3318 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3479 if (option (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3481 break;
3322 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3484 break;
… …
3391 break; 3551 break;
3392 case CSI_75: 3552 case CSI_75:
3393 scr_cursor (RESTORE); 3553 scr_cursor (RESTORE);
3394 break; 3554 break;
3395 3555
3396#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3397 case CSI_74: 3557 case CSI_74:
3398 process_window_ops (arg, nargs); 3558 process_window_ops (arg, nargs);
3399 break; 3559 break;
3400#endif 3560#endif
3401 3561
… …
3408 break; 3568 break;
3409 } 3569 }
3410} 3570}
3411/*}}} */ 3571/*}}} */
3412 3572
3413#if ENABLE_FRILLS 3573#if !ENABLE_MINIMAL
3414/* ARGSUSED */ 3574/* ARGSUSED */
3415void 3575void
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3576rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3577{
3418 int x, y; 3578 int x, y;
3419 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3420 Window wdummy; 3580 Window wdummy;
3581
3582 dLocal (Display *, dpy);
3421 3583
3422 if (nargs == 0) 3584 if (nargs == 0)
3423 return; 3585 return;
3424 3586
3425 switch (args[0]) 3587 switch (args[0])
3426 { 3588 {
3427 /* 3589 /*
3428 * commands 3590 * commands
3429 */ 3591 */
3430 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3593 XMapWindow (dpy, parent[0]);
3432 break; 3594 break;
3433 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3596 XIconifyWindow (dpy, parent[0], display->screen);
3435 DefaultScreen (display->display));
3436 break; 3597 break;
3437 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3439 break; 3600 break;
3440 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3603 break;
3443 case 5: /* raise window */ 3604 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3445 break; 3606 break;
3446 case 6: /* lower window */ 3607 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3448 break; 3609 break;
3449 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3450 scr_touch (true); 3611 scr_touch (true);
3451 break; 3612 break;
3452 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3614 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3615 (unsigned int) (args[1] * fheight));
3455 break; 3616 break;
3456 3617
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3618 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3619 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3620 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3621 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3622 (unsigned int) (args[1] * fheight));
3462 break; 3623 break;
3463
3464 3624
3465 /* 3625 /*
3466 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3467 */ 3627 */
3468 case 11: /* report window state */ 3628 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3631 break;
3472 case 13: /* report window position */ 3632 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3638 break;
3479 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3642 break;
3483 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3645 break;
3486 case 19: /* report window size (chars) */ 3646 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3648 break;
3489 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3490 { 3650 {
3491 char *s; 3651 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3654 XFree (s);
3495 } 3655 }
3496 break; 3656 break;
3497 case 21: /* report window title */ 3657 case 21: /* report window title */
3498 { 3658 {
3499 char *s; 3659 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3662 XFree (s);
3503 } 3663 }
3504 break; 3664 break;
3505 } 3665 }
3506} 3666}
… …
3509/*----------------------------------------------------------------------*/ 3669/*----------------------------------------------------------------------*/
3510/* 3670/*
3511 * get input up until STRING TERMINATOR (or BEL) 3671 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3672 * ends_how is terminator used. returned input must be free()'d
3513 */ 3673 */
3514unsigned char * 3674char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3675rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3676{
3517 unicode_t seen_esc = 0, ch; 3677 unicode_t ch;
3678 bool seen_esc = false;
3518 unsigned int n = 0; 3679 unsigned int n = 0;
3519 unsigned char *s;
3520 unsigned char string[STRING_MAX]; 3680 wchar_t string[STRING_MAX];
3521 3681
3522 while ((ch = cmd_getc ()) != NOCHAR) 3682 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3683 {
3524 if (seen_esc) 3684 if (seen_esc)
3525 { 3685 {
… …
3528 else 3688 else
3529 return NULL; 3689 return NULL;
3530 } 3690 }
3531 else if (ch == C0_ESC) 3691 else if (ch == C0_ESC)
3532 { 3692 {
3533 seen_esc = 1; 3693 seen_esc = true;
3534 continue; 3694 continue;
3535 } 3695 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3538 else if (ch < 0x20) 3700 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3540 3702
3541 seen_esc = 0; 3703 seen_esc = false;
3542 3704
3543 if (n >= sizeof (string) - 1) 3705 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3706 // stop at some sane length
3545 return NULL; 3707 return NULL;
3546 3708
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
3550 string[n++] = ch; 3709 string[n++] = ch;
3551 } 3710 }
3552 3711
3553 string[n++] = '\0'; 3712 string[n++] = '\0';
3554 3713
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3715
3560 return s; 3716 return rxvt_wcstombs (string);
3561} 3717}
3562 3718
3563/*----------------------------------------------------------------------*/ 3719/*----------------------------------------------------------------------*/
3564/* 3720/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3721 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3566 */ 3722 */
3567void 3723void
3568rxvt_term::process_dcs_seq () 3724rxvt_term::process_dcs_seq ()
3569{ 3725{
3570 unsigned char *s; 3726 char *s;
3571 unicode_t eh; 3727 unicode_t eh;
3572 3728
3573 /* 3729 /*
3574 * Not handled yet 3730 * Not handled yet
3575 */ 3731 */
… …
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3750 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3751 arg = arg * 10 + (ch - '0');
3596 3752
3597 if (ch == ';') 3753 if (ch == ';')
3598 { 3754 {
3599 unsigned char *s = get_to_st (eh); 3755 char *s = get_to_st (eh);
3600 3756
3601 if (s) 3757 if (s)
3602 { 3758 {
3603 process_xterm_seq (arg, (char *)s, eh); 3759 process_xterm_seq (arg, s, eh);
3604 free (s); 3760 free (s);
3605 } 3761 }
3606 } 3762 }
3607} 3763}
3608 3764
3609void 3765void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3766rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3611{ 3767{
3612 if (str[0] == '?' && !str[1]) 3768 if (str[0] == '?' && !str[1])
3613 { 3769 {
3614 unsigned short r, g, b; 3770 rgba c;
3615 pix_colors_focused[color].get (display, r, g, b); 3771 pix_colors_focused[color].get (c);
3772
3773#if XFT
3774 if (c.a != rgba::MAX_CC)
3775 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3776 else
3777#endif
3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3617 } 3779 }
3618 else 3780 else
3619 set_window_color (color, str); 3781 set_window_color (color, str);
3620} 3782}
3621 3783
3622/* 3784/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3786 */
3647void 3787void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3649{ 3789{
3650 int changed = 0;
3651 int color; 3790 int color;
3652 char *buf, *name; 3791 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3793 int saveop = op;
3655 3794
3795 dLocal (Display *, dpy);
3796
3656 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3657 switch (op) 3802 switch (op)
3658 { 3803 {
3659 case XTerm_name: 3804 case XTerm_name:
3660 set_title (str); 3805 set_title (str);
3661 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3666 set_title (str); 3811 set_title (str);
3667 break; 3812 break;
3668 case XTerm_property: 3813 case XTerm_property:
3669 if (str[0] == '?') 3814 if (str[0] == '?')
3670 { 3815 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3816 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3817 Atom actual_type;
3673 int actual_format; 3818 int actual_format;
3674 unsigned long nitems; 3819 unsigned long nitems;
3675 unsigned long bytes_after; 3820 unsigned long bytes_after;
3676 unsigned char *value = 0; 3821 unsigned char *value = 0;
3677 const char *str = ""; 3822 const char *str = "";
3678 3823
3679 if (prop 3824 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3829 && actual_type != None
3685 && actual_format == 8) 3830 && actual_format == 8)
3686 str = (const char *)(value); 3831 str = (const char *)(value);
3687 3832
3688 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3833 tt_printf ("\033]%d;%s%c", op, str, resp);
3689 3834
3690 XFree (value); 3835 XFree (value);
3691 } 3836 }
3692 else 3837 else
3693 { 3838 {
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3839 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695 3840
3696 if (eq) 3841 if (eq)
3697 { 3842 {
3698 *eq = 0; 3843 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3844 set_utf8_property (display->atom (str), eq + 1);
3700 display->atom (str), XA_STRING, 8,
3701 PropModeReplace, (unsigned char *)eq + 1,
3702 strlen (eq + 1));
3703 } 3845 }
3704 else 3846 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3847 XDeleteProperty (dpy, parent[0],
3706 display->atom (str)); 3848 display->atom (str));
3707 } 3849 }
3708 break; 3850 break;
3709 3851
3710 case XTerm_Color: 3852 case XTerm_Color:
… …
3712 { 3854 {
3713 if ((name = strchr (buf, ';')) == NULL) 3855 if ((name = strchr (buf, ';')) == NULL)
3714 break; 3856 break;
3715 3857
3716 *name++ = '\0'; 3858 *name++ = '\0';
3717 color = atoi (buf); 3859 color = atoi (buf) + minCOLOR;
3718 3860
3719 if (color < 0 || color >= TOTAL_COLORS) 3861 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3720 break; 3862 break;
3721 3863
3722 if ((buf = strchr (name, ';')) != NULL) 3864 if ((buf = strchr (name, ';')) != NULL)
3723 *buf++ = '\0'; 3865 *buf++ = '\0';
3724 3866
3725 if (name[0] == '?' && !name[1]) 3867 process_color_seq (op, color, name, resp);
3726 {
3727 unsigned short r, g, b;
3728 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3729 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3730 }
3731 else
3732 set_window_color (color + minCOLOR, name);
3733 } 3868 }
3734 break; 3869 break;
3735 case XTerm_Color00: 3870 case XTerm_Color00:
3736 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3871 process_color_seq (op, Color_fg, str, resp);
3737 break; 3872 break;
3738 case XTerm_Color01: 3873 case XTerm_Color01:
3739 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3874 process_color_seq (op, Color_bg, str, resp);
3740 break; 3875 break;
3741#ifndef NO_CURSORCOLOR 3876#ifndef NO_CURSORCOLOR
3742 case XTerm_Color_cursor: 3877 case XTerm_Color_cursor:
3743 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3878 process_color_seq (op, Color_cursor, str, resp);
3744 break; 3879 break;
3745#endif 3880#endif
3746 case XTerm_Color_pointer_fg: 3881 case XTerm_Color_pointer_fg:
3747 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3882 process_color_seq (op, Color_pointer_fg, str, resp);
3748 break; 3883 break;
3749 case XTerm_Color_pointer_bg: 3884 case XTerm_Color_pointer_bg:
3750 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3885 process_color_seq (op, Color_pointer_bg, str, resp);
3751 break; 3886 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE 3887#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break;
3762 case XTerm_Color_RV: 3888 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3889 process_color_seq (op, Color_RV, str, resp);
3890 break;
3891 case Rxvt_Color_BD:
3892 case URxvt_Color_BD:
3893 process_color_seq (op, Color_BD, str, resp);
3894 break;
3895 case Rxvt_Color_UL:
3896 case URxvt_Color_UL:
3897 process_color_seq (op, Color_UL, str, resp);
3898 break;
3899 case URxvt_Color_IT:
3900 process_color_seq (op, Color_IT, str, resp);
3764 break; 3901 break;
3765#endif 3902#endif
3766#if TRANSPARENT && TINTING 3903#if TRANSPARENT && TINTING
3767 case XTerm_Color_tint: 3904 case URxvt_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3905 process_color_seq (op, Color_tint, str, resp);
3906
3769 check_our_parents (); 3907 check_our_parents ();
3908
3770 if (am_transparent) 3909 if (am_transparent)
3771 want_full_refresh = want_refresh = 1; 3910 want_full_refresh = want_refresh = 1;
3772 break;
3773#endif
3774 3911
3912 break;
3913#endif
3914
3775 case XTerm_Pixmap: 3915 case Rxvt_Pixmap:
3916 {
3776 if (*str != ';') 3917 if (*str != ';')
3777 { 3918 {
3778#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3779 scale_pixmap (""); /* reset to default scaling */ 3920 scale_pixmap (""); /* reset to default scaling */
3780 set_bgPixmap (str); /* change pixmap */ 3921 set_bgPixmap (str); /* change pixmap */
3781#endif
3782 scr_touch (true); 3922 scr_touch (true);
3923#endif
3783 } 3924 }
3925
3926 int changed = 0;
3927
3784 while ((str = strchr (str, ';')) != NULL) 3928 while ((str = strchr (str, ';')) != NULL)
3785 { 3929 {
3786 str++; 3930 str++;
3787#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3788 changed += scale_pixmap (str); 3932 changed += scale_pixmap (str);
3789#endif 3933#endif
3790
3791 } 3934 }
3935
3792 if (changed) 3936 if (changed)
3793 { 3937 {
3794#ifdef XPM_BACKGROUND 3938#ifdef XPM_BACKGROUND
3795 resize_pixmap (); 3939 resize_pixmap ();
3796#endif
3797 scr_touch (true); 3940 scr_touch (true);
3941#endif
3798 } 3942 }
3943 }
3799 break; 3944 break;
3800 3945
3801 case XTerm_restoreFG: 3946 case Rxvt_restoreFG:
3802 set_window_color (Color_fg, str); 3947 set_window_color (Color_fg, str);
3803 break; 3948 break;
3804 case XTerm_restoreBG: 3949 case Rxvt_restoreBG:
3805 set_window_color (Color_bg, str); 3950 set_window_color (Color_bg, str);
3806 break; 3951 break;
3807 3952
3808 case XTerm_logfile: 3953 case XTerm_logfile:
3809 // TODO, when secure mode? 3954 // TODO, when secure mode?
3810 break; 3955 break;
3811 3956
3957#if 0
3958 case Rxvt_dumpscreen: /* no error notices */
3959 {
3960 int fd;
3961 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3962 {
3963 scr_dump (fd);
3964 close (fd);
3965 }
3966 }
3967 break;
3968#endif
3812 case XTerm_font: 3969 case XTerm_font:
3813 op = URxvt_font; 3970 op = URxvt_font;
3814 case URxvt_font: 3971 case URxvt_font:
3815#if ENABLE_STYLES 3972#if ENABLE_STYLES
3816 case URxvt_boldFont: 3973 case URxvt_boldFont:
3817 case URxvt_italicFont: 3974 case URxvt_italicFont:
3818 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3819#endif 3976#endif
3820 if (query) 3977 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3824 resp); 3981 resp);
3825 else 3982 else
3826 { 3983 {
3827 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
3828 3985
… …
3830 allocated.push_back ((void *)res); 3987 allocated.push_back ((void *)res);
3831 set_fonts (); 3988 set_fonts ();
3832 } 3989 }
3833 break; 3990 break;
3834 3991
3835#if ENABLE_FRILLS 3992 case URxvt_version:
3836 case XTerm_locale:
3837 if (query) 3993 if (query)
3994 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3995 op,
3996 rs[Rs_name], VERSION[0], VERSION[2],
3997 resp);
3998 break;
3999
4000#if !ENABLE_MINIMAL
4001 case URxvt_locale:
4002 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3839 else 4004 else
3840 { 4005 {
3841 set_locale (str); 4006 set_locale (str);
3842# ifdef USE_XIM 4007 pty->set_utf8_mode (enc_utf8);
3843 im_cb (); 4008 init_xlocale ();
3844# endif
3845 } 4009 }
3846 break; 4010 break;
3847#endif
3848 4011
3849#ifdef MENUBAR 4012 case URxvt_view_up:
3850 case XTerm_Menu: 4013 case URxvt_view_down:
3851 if (options & Opt_insecure) 4014 {
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4015 int lines = atoi (str);
4016
4017 if (lines)
4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
4019 else
4020 scr_erase_savelines ();
4021 }
4022
3853 break; 4023 break;
3854#endif 4024#endif
3855#if 0 4025
3856 case XTerm_dumpscreen: /* no error notices */ 4026#if ENABLE_PERL
3857 { 4027 case URxvt_perl:
3858 int fd; 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4029 ; // no responses yet
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break; 4030 break;
3866#endif 4031#endif
3867 } 4032 }
3868} 4033}
3869/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
3900 return state; 4065 return state;
3901} 4066}
3902 4067
3903/* we're not using priv _yet_ */ 4068/* we're not using priv _yet_ */
3904void 4069void
3905rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4070rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3906{ 4071{
3907 unsigned int i, j; 4072 unsigned int i, j;
3908 int state; 4073 int state;
3909 4074
3910 static const struct 4075 static const struct
… …
3921 { 5, PrivMode_rVideo }, 4086 { 5, PrivMode_rVideo },
3922 { 6, PrivMode_relOrigin }, 4087 { 6, PrivMode_relOrigin },
3923 { 7, PrivMode_Autowrap }, 4088 { 7, PrivMode_Autowrap },
3924 // 8, bi-directional support mode 4089 // 8, bi-directional support mode
3925 { 9, PrivMode_MouseX10 }, 4090 { 9, PrivMode_MouseX10 },
3926#ifdef menuBar_esc
3927 { menuBar_esc, PrivMode_menuBar },
3928#endif
3929 // 18, 19 printing-related 4091 // 18, 19 printing-related
3930 { 25, PrivMode_VisibleCursor }, 4092 { 25, PrivMode_VisibleCursor },
3931#ifdef scrollBar_esc 4093#ifdef scrollBar_esc
3932 { scrollBar_esc, PrivMode_scrollBar }, 4094 { scrollBar_esc, PrivMode_scrollBar },
3933#endif 4095#endif
… …
3978 } 4140 }
3979 4141
3980 /* extra handling for values with state unkept */ 4142 /* extra handling for values with state unkept */
3981 switch (arg[i]) 4143 switch (arg[i])
3982 { 4144 {
4145#if ENABLE_STYLES
4146 case 1021:
4147 set_option (Opt_intensityStyles, mode);
4148
4149 scr_touch (true);
4150 break;
4151#endif
3983 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
3984 case 1049: 4153 case 1049:
3985 if (options & Opt_secondaryScreen) 4154 if (option (Opt_secondaryScreen))
3986 if (mode == 0) 4155 if (mode == 0)
3987 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
3988 else if (mode == 1) 4157 else if (mode == 1)
3989 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
3990 break; 4159 break;
… …
4002 */ 4171 */
4003 PrivMode (1, PrivMode_vt52); 4172 PrivMode (1, PrivMode_vt52);
4004 break; 4173 break;
4005 case 3: /* 80/132 */ 4174 case 3: /* 80/132 */
4006 if (priv_modes & PrivMode_132OK) 4175 if (priv_modes & PrivMode_132OK)
4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4176 set_widthheight (((state ? 132 : 80) * fwidth), height);
4008 break; 4177 break;
4009 case 4: /* smooth scrolling */ 4178 case 4: /* smooth scrolling */
4010 if (state)
4011 options &= ~Opt_jumpScroll;
4012 else
4013 options |= Opt_jumpScroll; 4179 set_option (Opt_jumpScroll, !state);
4014 break; 4180 break;
4015 case 5: /* reverse video */ 4181 case 5: /* reverse video */
4016 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
4017 break; 4183 break;
4018 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
4024 /* case 8: - auto repeat, can't do on a per window basis */ 4190 /* case 8: - auto repeat, can't do on a per window basis */
4025 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
4026 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
4027 priv_modes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
4028 break; 4194 break;
4029#ifdef menuBar_esc
4030 case menuBar_esc:
4031#ifdef MENUBAR
4032 map_menuBar (state);
4033#endif
4034 break;
4035#endif
4036#ifdef scrollBar_esc 4195#ifdef scrollBar_esc
4037 case scrollBar_esc: 4196 case scrollBar_esc:
4038 if (scrollbar_mapping (state)) 4197 if (scrollbar_mapping (state))
4039 { 4198 {
4040 resize_all_windows (0, 0, 0); 4199 resize_all_windows (0, 0, 0);
… …
4059#if 0 4218#if 0
4060 case 1001: 4219 case 1001:
4061 break; /* X11 mouse highlighting */ 4220 break; /* X11 mouse highlighting */
4062#endif 4221#endif
4063 case 1010: /* scroll to bottom on TTY output inhibit */ 4222 case 1010: /* scroll to bottom on TTY output inhibit */
4064 if (state)
4065 options &= ~Opt_scrollTtyOutput;
4066 else
4067 options |= Opt_scrollTtyOutput; 4223 set_option (Opt_scrollTtyOutput, !state);
4068 break; 4224 break;
4069 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4070 if (state)
4071 options |= Opt_scrollTtyKeypress; 4226 set_option (Opt_scrollTtyKeypress, state);
4072 else
4073 options &= ~Opt_scrollTtyKeypress;
4074 break; 4227 break;
4075 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4076 if (options & Opt_secondaryScreen) 4229 if (option (Opt_secondaryScreen))
4077 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4078 scr_erase_screen (2); 4231 scr_erase_screen (2);
4079 scr_change_screen (state); 4232 scr_change_screen (state);
4080 break; 4233 break;
4081 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4082 scr_change_screen (state); 4235 scr_change_screen (state);
4083 if (options & Opt_secondaryScreen) 4236 if (option (Opt_secondaryScreen))
4084 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4085 scr_erase_screen (2); 4238 scr_erase_screen (2);
4086 break; 4239 break;
4087 default: 4240 default:
4088 break; 4241 break;
… …
4216 scr_color (Color_bg, Color_bg); 4369 scr_color (Color_bg, Color_bg);
4217 break; 4370 break;
4218 4371
4219 //case 50: // not variable spacing 4372 //case 50: // not variable spacing
4220 4373
4221#ifndef NO_BRIGHTCOLOR 4374#if !ENABLE_MINIMAL
4222 case 90: 4375 case 90:
4223 case 91: /* set bright fg color */ 4376 case 91: /* set bright fg color */
4224 case 92: 4377 case 92:
4225 case 93: 4378 case 93:
4226 case 94: 4379 case 94:
… …
4238 case 106: 4391 case 106:
4239 case 107: 4392 case 107:
4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4241 break; 4394 break;
4242#endif 4395#endif
4243
4244 } 4396 }
4245 } 4397 }
4246} 4398}
4247/*}}} */ 4399/*}}} */
4248 4400
… …
4272 */ 4424 */
4273void 4425void
4274rxvt_term::tt_printf (const char *fmt,...) 4426rxvt_term::tt_printf (const char *fmt,...)
4275{ 4427{
4276 va_list arg_ptr; 4428 va_list arg_ptr;
4277 unsigned char buf[256]; 4429 char buf[256];
4278 4430
4279 va_start (arg_ptr, fmt); 4431 va_start (arg_ptr, fmt);
4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4432 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4281 va_end (arg_ptr); 4433 va_end (arg_ptr);
4282 tt_write (buf, strlen (buf)); 4434 tt_write (buf, strlen (buf));
… …
4284 4436
4285/* ---------------------------------------------------------------------- */ 4437/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 4438/* Write data to the pty as typed by the user, pasted with the mouse,
4287 * or generated by us in response to a query ESC sequence. 4439 * or generated by us in response to a query ESC sequence.
4288 */ 4440 */
4441const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4442
4289void 4443void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4444rxvt_term::tt_write (const char *data, unsigned int len)
4291{ 4445{
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4446 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4447 return;
4293 4448
4294 if (len) 4449 if (pty->pty < 0)
4450 return;
4451
4452 if (v_buflen == 0)
4453 {
4454 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4455
4456 if ((unsigned int)written == len)
4457 return;
4458
4459 data += written;
4460 len -= written;
4295 { 4461 }
4462
4463 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4464
4465 memcpy (v_buffer + v_buflen, data, len);
4466 v_buflen += len;
4467
4468 pty_ev.set (EVENT_READ | EVENT_WRITE);
4469}
4470
4471void rxvt_term::pty_write ()
4472{
4473 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4474
4475 if (written > 0)
4476 {
4477 v_buflen -= written;
4478
4296 if (v_buflen == 0) 4479 if (v_buflen == 0)
4297 { 4480 {
4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300 if ((unsigned int)written == len)
4301 return;
4302
4303 data += written;
4304 len -= written;
4305 }
4306
4307
4308 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310 memcpy (v_buffer + v_buflen, data, len);
4311 v_buflen += len;
4312 }
4313
4314 for (;;)
4315 {
4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318 if (written > 0)
4319 {
4320 v_buflen -= written;
4321
4322 if (v_buflen == 0)
4323 {
4324 free (v_buffer); 4481 free (v_buffer);
4325 v_buffer = 0; 4482 v_buffer = 0;
4326 v_buflen = 0; 4483 v_buflen = 0;
4327 4484
4328 pty_ev.set (EVENT_READ); 4485 pty_ev.set (EVENT_READ);
4329 return;
4330 }
4331
4332 memmove (v_buffer, v_buffer + written, v_buflen);
4333 }
4334 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335 // original code just ignores this...
4336 destroy ();
4337 else
4338 {
4339 pty_ev.set (EVENT_READ | EVENT_WRITE);
4340 return; 4486 return;
4341 } 4487 }
4488
4489 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 4490 }
4491 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4492 pty_ev.set (EVENT_READ);
4343} 4493}
4344 4494
4345/*----------------------- end-of-file (C source) -----------------------*/ 4495/*----------------------- end-of-file (C source) -----------------------*/
4346 4496

Diff Legend

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