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

Diff Legend

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