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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.285 by root, Wed Jan 25 21:03:04 2006 UTC

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

Diff Legend

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