ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 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 68
… …
114 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 125 XK_Print, 0x2399,
117 126
118 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
120 0, 137 0,
121}; 138};
122 139
123void 140void
124rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
125{ 142{
126 x = Pixel2Col (x); 143 x = Pixel2Col (x);
127 y = Pixel2Row (y); 144 y = Pixel2Row (y);
128 145
129 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 148 return;
132 149
133 for (;;) 150 for (;;)
134 { 151 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y + view_start);
153
154 text_t t = l.t[x];
136 155
137 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
138 { 157 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 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; 159 iso14755buf = ISO_14755_54;
142 break; 160 break;
143 } 161 }
144 162
145 x--; 163 x--;
146 } 164 }
147
148} 165}
149#endif
150 166
151#if ENABLE_OVERLAY
152void 167void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 169{
155 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 173 int len;
159 174
175 fname = rxvt_utf8towcs (f->name);
176
160#if ENABLE_COMBINING 177# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
162 { 179 {
163 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
166 } 183 }
167 else 184 else
168#endif 185# endif
169 { 186 {
170 ch2 = ch; 187 ch2 = ch;
171 188
172 alloc = 0; 189 alloc = 0;
173 chr = &ch2; 190 chr = &ch2;
174 len = 1; 191 len = 1;
175 } 192 }
176 193
177 int width = strlen (f->name); 194 char attr[80]; // plenty
178 195
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
180 218
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 220
183 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
184 { 222 {
… …
187 ch = *chr++; 225 ch = *chr++;
188 226
189 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
192#if !UNICODE3 230# if !UNICODE3
193 if (ch >= 0x10000) 231 if (ch >= 0x10000)
194 ch = 0xfffd; 232 ch = 0xfffd;
195#endif 233# endif
196 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
198 } 236 }
199 237
238 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
201 240
241 free (fname);
242
202#if ENABLE_COMBINING 243# if ENABLE_COMBINING
203 if (alloc) 244 if (alloc)
204 delete [] alloc; 245 delete [] alloc;
205#endif 246# endif
206} 247}
207#endif 248#endif
208 249
209void 250void
210rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 268 mb[0] = ch[0];
228 len = 1; 269 len = 1;
229 } 270 }
230 271
231 if (len > 0) 272 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
233 else 274 else
234 scr_bell (); 275 scr_bell ();
235 } 276 }
236 277
237 iso14755buf = 0; 278 iso14755buf = 0;
… …
265 KeySym keysym; 306 KeySym keysym;
266#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
268#endif 309#endif
269 int valid_keysym; 310 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
271 312
272 /* 313 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
275 * 316 *
276 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
277 */ 318 */
278 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
281 322
282 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
283 { 324 {
284 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 334 Status status_return;
294 335
295#if 0 336#if 0
296#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
300 else 341 else
301#endif 342#endif
302#endif 343#endif
303 { 344 {
… …
305 346
306 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
310 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
313 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 357 SET_LOCALE (locale);
315 358
316 if (status_return == XLookupChars 359 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
339 } 382 }
340 else 383 else
341#endif 384#endif
342 { 385 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
345 } 388 }
346 389
347 if (valid_keysym) 390 if (valid_keysym)
348 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
349 if (TermWin.saveLines) 397 if (saveLines)
350 { 398 {
351#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 400 if (!ctrl && !meta)
353#else 401#else
354 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
355#endif 403#endif
356 { 404 {
357 int lnsppg; 405 int lnsppg;
358 406
359#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 409#else
362 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
363#endif 411#endif
364 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
365 { 413 {
366 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
367 return; 415 return;
… …
395 scr_move_to (0, 1); 443 scr_move_to (0, 1);
396 return; 444 return;
397 } 445 }
398 else if (keysym == XK_End) 446 else if (keysym == XK_End)
399 { 447 {
400 scr_move_to (1, 0); 448 scr_move_to (1, 1);
401 return; 449 return;
402 } 450 }
403 } 451 }
404#endif 452#endif
405 } 453 }
… …
487 } 535 }
488#endif 536#endif
489 537
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 539 {
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 { 540 {
518 newlen = 1; 541 newlen = 1;
519 switch (keysym) 542 switch (keysym)
520 { 543 {
521#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
529 else 552 else
530 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
531 break; 554 break;
532#endif 555#endif
533#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
534 case XK_Delete: 567 case XK_Delete:
535 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
536 break; 569 break;
537#endif 570#endif
538 case XK_Tab: 571 case XK_Tab:
… …
641#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
642 case XK_KP_Begin: 675 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
644 break; 677 break;
645 678
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 679#endif
654 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
689 break; 715 break;
690 716
691 case XK_Find: 717 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
693 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
694 case XK_Insert: 731 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
696 break; 733 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 735 case DXK_Remove:
… …
788#undef FKEY 825#undef FKEY
789 default: 826 default:
790 newlen = 0; 827 newlen = 0;
791 break; 828 break;
792 } 829 }
830
793 if (newlen) 831 if (newlen)
794 len = strlen (kbuf); 832 len = strlen (kbuf);
795 } 833 }
796 834
797 /* 835 /*
… …
806 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
807 { 845 {
808 len = 1; 846 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
811 else 854 else
812 { 855 {
813#ifdef META8_OPTION 856#ifdef META8_OPTION
814 /* set 8-bit on */ 857 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
816 { 859 {
817 unsigned char *ch; 860 char *ch;
818 861
819 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 863 *ch |= 0x80;
821 864
822 meta = 0; 865 meta = 0;
… …
824#endif 867#endif
825 /* nil */ ; 868 /* nil */ ;
826 } 869 }
827 } 870 }
828 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
829 if (len <= 0) 875 if (len <= 0)
830 return; /* not mapped */ 876 return; /* not mapped */
831 877
832 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 879 if (view_start)
834 { 880 {
835 TermWin.view_start = 0; 881 view_start = 0;
836 want_refresh = 1; 882 want_refresh = 1;
837 } 883 }
838 884
839 /* 885 /*
840 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 901#ifdef META8_OPTION
856 && meta_char == C0_ESC 902 && meta_char == C0_ESC
857#endif 903#endif
858 ) 904 )
859 { 905 {
860 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
861 tt_write (&ch, 1); 907 tt_write (&ch, 1);
862 } 908 }
863 909
864#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
873#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
875} 921}
876/*}}} */ 922/*}}} */
877 923
878#if (MENUBAR_MAX) 924#if defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */
881unsigned int 925unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 927{
884 unsigned int n, s; 928 unsigned int n, s;
885 929
886 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 950
907 cmd_parse (); 951 cmd_parse ();
908 952
909 return 0; 953 return 0;
910} 954}
911#endif /* MENUBAR_MAX */ 955#endif
912 956
913void 957void
914rxvt_term::flush () 958rxvt_term::flush ()
915{ 959{
916 flush_ev.stop (); 960 flush_ev.stop ();
… …
924 } 968 }
925#endif 969#endif
926 970
927 if (want_refresh) 971 if (want_refresh)
928 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
929 scr_refresh (refresh_type); 1011 scr_refresh ();
930 scrollbar_show (1); 1012 scrollbar_show (1);
931#ifdef USE_XIM 1013#ifdef USE_XIM
932 IMSendSpot (); 1014 IMSendSpot ();
933#endif 1015#endif
934 } 1016 }
… …
937} 1019}
938 1020
939void 1021void
940rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
941{ 1023{
942 SET_R (this); 1024 make_current ();
943 SET_LOCALE (locale);
944 1025
945 display->flush (); 1026 display->flush ();
946 1027
947 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 1030}
950 1031
951void 1032void
952rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
953{ 1034{
954 SET_R (this); 1035 make_current ();
955 SET_LOCALE (locale);
956 1036
957 refresh_limit = 1; 1037 refresh_limit = 1;
958 refresh_count = 0; 1038 refresh_count = 0;
959 flush (); 1039 flush ();
960} 1040}
… …
988rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
989{ 1069{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 { 1072 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1073 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 } 1075 }
997} 1076}
998#endif 1077#endif
… …
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1003{ 1082{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1084 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1086 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 } 1088 }
1011} 1089}
1012#endif 1090#endif
… …
1017{ 1095{
1018 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1099 {
1022 refresh_type |= SMOOTH_REFRESH; 1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1023 want_refresh = 1; 1103 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1105 }
1026} 1106}
1027#endif 1107#endif
1028 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
1029bool 1127bool
1030rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
1031{ 1129{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1131
1034 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1035 { 1133 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1135 n = 0;
1038 } 1136 }
1039 1137
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1043 1141
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1143
1046 if (n > 0) 1144 if (r > 0)
1047 { 1145 {
1048 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
1049 return true; 1147 return true;
1050 } 1148 }
1051 else if (n < 0 && errno != EAGAIN) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1157 {
1158 pty_ev.stop ();
1159
1160 if (!OPTION (Opt_hold))
1052 destroy (); 1161 destroy ();
1162 }
1053 1163
1054 return false; 1164 return false;
1055} 1165}
1056 1166
1057void 1167void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1169{
1060 SET_R (this); 1170 make_current ();
1061 SET_LOCALE (locale);
1062 1171
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1174 while (pty_fill ())
1068 if (cmd_parse ()) 1175 if (cmd_parse ())
1069 break; 1176 break;
1177
1178 if (revents & EVENT_WRITE)
1179 pty_write ();
1070} 1180}
1071 1181
1072void 1182void
1073rxvt_term::pointer_unblank () 1183rxvt_term::pointer_unblank ()
1074{ 1184{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1185 XDefineCursor (display->display, vt, TermWin_cursor);
1076 recolour_cursor (); 1186 recolour_cursor ();
1077 1187
1078#ifdef POINTER_BLANK 1188#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1189 hidden_pointer = 0;
1080 1190
1081 if (options & Opt_pointerBlank) 1191 if (OPTION (Opt_pointerBlank))
1082 pointer_ev.start (NOW + pointerBlankDelay); 1192 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif 1193#endif
1084} 1194}
1085 1195
1086#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1087void 1197void
1088rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1089{ 1199{
1090 if (! (options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1091 return; 1201 return;
1092 1202
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1094 XFlush (display->display); 1204 XFlush (display->display);
1095 1205
1096 hidden_pointer = 1; 1206 hidden_pointer = 1;
1097} 1207}
1098 1208
1099void 1209void
1100rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1101{ 1211{
1102 SET_R (this); 1212 make_current ();
1103 SET_LOCALE (locale);
1104 1213
1105 pointer_blank (); 1214 pointer_blank ();
1106} 1215}
1107#endif 1216#endif
1108 1217
… …
1187 1296
1188/*{{{ process an X event */ 1297/*{{{ process an X event */
1189void 1298void
1190rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1191{ 1300{
1192 SET_R (this); 1301 make_current ();
1193 SET_LOCALE (locale);
1194 1302
1195#if defined(CURSOR_BLINK) 1303 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 1304
1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1305 if (ev.xany.window == vt
1205 } 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1206#endif 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1207 1309
1208#if defined(POINTER_BLANK) 1310 // 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; 1311 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1313 unsigned int unused_mask;
1225 1314
1226 switch (ev.type) 1315 switch (ev.type)
… …
1233 1322
1234 break; 1323 break;
1235 1324
1236 case KeyRelease: 1325 case KeyRelease:
1237 { 1326 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1239 KeySym ks; 1328 KeySym keysym;
1240 1329
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif 1331#endif
1243 1332
1244#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support 1334 // ISO 14755 support
1246 if (iso14755buf) 1335 if (iso14755buf)
… …
1251# endif 1340# endif
1252# if ISO_14755 1341# if ISO_14755
1253 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1254 // first: controls 1343 // first: controls
1255 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1258 { 1347 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1260 commit_iso14755 (); 1349 commit_iso14755 ();
1261 return; // case-break; 1350 goto skip_switch;
1262 } 1351 }
1263 1352
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks) 1354 if (i[0] == keysym)
1266 { 1355 {
1267 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 (); 1357 commit_iso14755 ();
1269 return; // case-break; 1358 goto skip_switch;
1270 } 1359 }
1271 1360
1272 scr_bell (); 1361 scr_bell ();
1273# endif 1362# endif
1274 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1293 else 1382 else
1294 iso14755buf = 0; 1383 iso14755buf = 0;
1295 } 1384 }
1296#endif 1385#endif
1297 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1299 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1302 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1303#endif 1396#endif
1304 break; 1397 break;
1305 } 1398 }
1306 1399
… …
1312 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1313 break; 1406 break;
1314 1407
1315 case ClientMessage: 1408 case ClientMessage:
1316 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1413 destroy ();
1414#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev);
1419#endif
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1319#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1325 { 1436 {
1326 /* Get Dnd data */ 1437 /* Get Dnd data */
1327 Atom ActualType; 1438 Atom ActualType;
1328 int ActualFormat; 1439 int ActualFormat;
1329 unsigned char *data; 1440 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1441 unsigned long Size, RemainingBytes;
1331 1442
1332 XGetWindowProperty (display->display, display->root, 1443 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1444 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1445 0L, 1000000L,
1335 False, AnyPropertyType, 1446 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1447 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1448 &Size, &RemainingBytes,
1338 &data); 1449 &data);
1339 set_string_property (XA_CUT_BUFFER0, data); 1450 set_string_property (XA_CUT_BUFFER0, data);
1340 XFree (data); 1451 XFree (data);
1341 selection_paste (display->root, XA_CUT_BUFFER0, true); 1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343 } 1454 }
1344#endif /* OFFIX_DND */ 1455#endif /* OFFIX_DND */
1345 break; 1456 break;
1346 1457
1347 case MappingNotify: 1458 case MappingNotify:
… …
1372 break; 1483 break;
1373 } 1484 }
1374 break; 1485 break;
1375 1486
1376 case FocusIn: 1487 case FocusIn:
1377 if (!TermWin.focus) 1488 focus_in ();
1489 break;
1490
1491 case FocusOut:
1492 focus_out ();
1493 break;
1494
1495 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0])
1378 { 1497 {
1379 TermWin.focus = 1;
1380 want_refresh = 1;
1381#ifdef USE_XIM
1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1385 XSetICFocus (Input_Context);
1386 }
1387#endif
1388#ifdef CURSOR_BLINK
1389 if (options & Opt_cursorBlink)
1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1398#endif
1399
1400 }
1401 break;
1402
1403 case FocusOut:
1404 if (TermWin.focus)
1405 {
1406 TermWin.focus = 0;
1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1415#ifdef USE_XIM
1416 if (Input_Context != NULL)
1417 XUnsetICFocus (Input_Context);
1418#endif
1419#ifdef CURSOR_BLINK
1420 if (options & Opt_cursorBlink)
1421 cursor_blink_ev.stop ();
1422 hidden_cursor = 0;
1423#endif
1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1431 }
1432 break;
1433
1434 case ConfigureNotify:
1435 if (ev.xconfigure.window == TermWin.parent[0])
1436 {
1437 int height, width;
1438
1439 do
1440 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ;
1446 1500
1447 if (szHint.width != width || szHint.height != height) 1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1448 { 1502 {
1449 seen_resize = 1; 1503 seen_resize = 1;
1450 resize_all_windows (width, height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1451 } 1505 }
1452 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1454 if (options & Opt_transparent) 1510 if (OPTION (Opt_transparent))
1455 check_our_parents (); 1511 check_our_parents ();
1456#endif 1512#endif
1457 } 1513 }
1458 break; 1514 break;
1459 1515
… …
1475 1531
1476 case SelectionRequest: 1532 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1478 break; 1534 break;
1479 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1480 case UnmapNotify: 1544 case UnmapNotify:
1481 TermWin.mapped = 0; 1545 mapped = 0;
1482#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1483 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1484#endif 1548#endif
1485 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1486
1487 case MapNotify:
1488 TermWin.mapped = 1;
1489#ifdef TEXT_BLINK
1490 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1491#endif
1492 break; 1550 break;
1493 1551
1494#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1495 case ReparentNotify: 1553 case ReparentNotify:
1496 rootwin_cb (ev); 1554 rootwin_cb (ev);
1497 break; 1555 break;
1498#endif /* TRANSPARENT */ 1556#endif /* TRANSPARENT */
1499 1557
1500 case GraphicsExpose: 1558 case GraphicsExpose:
1501 case Expose: 1559 case Expose:
1502 if (ev.xany.window == TermWin.vt) 1560 if (ev.xany.window == vt)
1503 { 1561 {
1504 do 1562 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1508 1566
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1568
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1514 1572
1515 scr_refresh (refresh_type); 1573 want_refresh = 1;
1516 } 1574 }
1517 else 1575 else
1518 { 1576 {
1519 XEvent unused_event; 1577 XEvent unused_event;
1520 1578
1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522 ; 1580 ;
1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1582 ;
1525 1583
1526 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1527 { 1585 {
1528 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1529 scrollbar_show (0); 1587 scrollbar_show (0);
1530 } 1588 }
1531#ifdef MENUBAR
1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1533 menubar_expose ();
1534#endif
1535 1589
1536#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1538 XClearWindow (display->display, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1539#endif 1593#endif
1540 } 1594 }
1541 break; 1595 break;
1542 1596
1543 case MotionNotify: 1597 case MotionNotify:
1544#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1545 if (hidden_pointer) 1599 if (hidden_pointer)
1546 pointer_unblank (); 1600 pointer_unblank ();
1547#endif 1601#endif
1548#if MENUBAR
1549 if (isMenuBarWindow (ev.xany.window))
1550 {
1551 menubar_control (ev.xbutton);
1552 break;
1553 }
1554#endif
1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1556 break; 1603 break;
1557 1604
1558 if (ev.xany.window == TermWin.vt) 1605 if (ev.xany.window == vt)
1559 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1560 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561 { 1611 {
1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1563 ; 1613 ;
1564 1614
1565 XQueryPointer (display->display, TermWin.vt, 1615 XQueryPointer (disp, vt,
1566 &unused_root, &unused_child, 1616 &unused_root, &unused_child,
1567 &unused_root_x, &unused_root_y, 1617 &unused_root_x, &unused_root_y,
1568 &ev.xbutton.x, &ev.xbutton.y, 1618 &ev.xbutton.x, &ev.xbutton.y,
1569 &ev.xbutton.state); 1619 &ev.xbutton.state);
1570#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
… …
1582#endif 1632#endif
1583 selection_extend (ev.xbutton.x, ev.xbutton.y, 1633 selection_extend (ev.xbutton.x, ev.xbutton.y,
1584 ev.xbutton.state & Button3Mask ? 2 : 0); 1634 ev.xbutton.state & Button3Mask ? 2 : 0);
1585 1635
1586#ifdef SELECTION_SCROLLING 1636#ifdef SELECTION_SCROLLING
1587 if (ev.xbutton.y < TermWin.int_bwidth 1637 if (ev.xbutton.y < int_bwidth
1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1638 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1589 { 1639 {
1590 int dist; 1640 int dist;
1591 1641
1592 /* don't clobber the current delay if we are 1642 /* don't clobber the current delay if we are
1593 * already in the middle of scrolling. 1643 * already in the middle of scrolling.
… …
1601 selection_save_x = ev.xbutton.x; 1651 selection_save_x = ev.xbutton.x;
1602 selection_save_y = ev.xbutton.y; 1652 selection_save_y = ev.xbutton.y;
1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1653 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1604 1654
1605 /* calc number of lines to scroll */ 1655 /* calc number of lines to scroll */
1606 if (ev.xbutton.y < TermWin.int_bwidth) 1656 if (ev.xbutton.y < int_bwidth)
1607 { 1657 {
1608 scroll_selection_dir = UP; 1658 scroll_selection_dir = UP;
1609 dist = TermWin.int_bwidth - ev.xbutton.y; 1659 dist = int_bwidth - ev.xbutton.y;
1610 } 1660 }
1611 else 1661 else
1612 { 1662 {
1613 scroll_selection_dir = DN; 1663 scroll_selection_dir = DN;
1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1664 dist = ev.xbutton.y - (int_bwidth + height);
1615 } 1665 }
1616 1666
1617 scroll_selection_lines = Pixel2Height (dist) 1667 scroll_selection_lines = Pixel2Height (dist)
1618 / SELECTION_SCROLL_LINE_SPEEDUP 1668 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1; 1669 + 1;
1620 MIN_IT (scroll_selection_lines, 1670 min_it (scroll_selection_lines,
1621 SELECTION_SCROLL_MAX_LINES); 1671 SELECTION_SCROLL_MAX_LINES);
1622 } 1672 }
1623 else 1673 else
1624 { 1674 {
1625 /* we are within the text window, so we 1675 /* we are within the text window, so we
… …
1634#endif 1684#endif
1635 } 1685 }
1636 } 1686 }
1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638 { 1688 {
1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1689 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640 MotionNotify, &ev)) 1690 MotionNotify, &ev))
1641 ; 1691 ;
1642 1692
1643 XQueryPointer (display->display, scrollBar.win, 1693 XQueryPointer (disp, scrollBar.win,
1644 &unused_root, &unused_child, 1694 &unused_root, &unused_child,
1645 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1647 &unused_mask); 1697 &unused_mask);
1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1649 scrollbar_size ()); 1699 scrollbar_size ());
1650 scr_refresh (refresh_type); 1700 want_refresh = 1;
1651 refresh_limit = 0; 1701 refresh_limit = 0;
1652 scrollbar_show (1); 1702 scrollbar_show (1);
1653 } 1703 }
1654 break; 1704 break;
1655 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1735}
1736
1737void
1738rxvt_term::focus_in ()
1739{
1740 if (!focus)
1741 {
1742 focus = 1;
1743 want_refresh = 1;
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1746
1747#if USE_XIM
1748 if (Input_Context != NULL)
1749 {
1750 IMSetStatusPosition ();
1751 XSetICFocus (Input_Context);
1752 }
1753#endif
1754#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1757#endif
1758#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade])
1760 {
1761 pix_colors = pix_colors_focused;
1762 scr_recolour ();
1763 }
1764#endif
1765 }
1766}
1767
1768void
1769rxvt_term::focus_out ()
1770{
1771 if (focus)
1772 {
1773 focus = 0;
1774 want_refresh = 1;
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777
1778#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf)
1780 {
1781 iso14755buf = 0;
1782# if ENABLE_OVERLAY
1783 scr_overlay_off ();
1784# endif
1785 }
1786#endif
1787#if USE_XIM
1788 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context);
1790#endif
1791#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink))
1793 cursor_blink_ev.stop ();
1794 hidden_cursor = 0;
1795#endif
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 pix_colors = pix_colors_unfocused;
1800 scr_recolour ();
1801 }
1802#endif
1803 }
1656} 1804}
1657 1805
1658#if TRANSPARENT 1806#if TRANSPARENT
1659void 1807void
1660rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1661{ 1809{
1662 SET_R (this); 1810 make_current ();
1663 SET_LOCALE (locale);
1664 1811
1665 switch (ev.type) 1812 switch (ev.type)
1666 { 1813 {
1667 case PropertyNotify: 1814 case PropertyNotify:
1668 /* 1815 /*
1669 * if user used some Esetroot compatible prog to set the root bg, 1816 * if user used some Esetroot compatible prog to set the root bg,
1670 * use the property to determine the pixmap. We use it later on. 1817 * use the property to determine the pixmap. We use it later on.
1671 */ 1818 */
1672 if (xa[XA_XROOTPMAPID] == 0)
1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1676 return; 1821 return;
1677 1822
1678 /* FALLTHROUGH */ 1823 /* FALLTHROUGH */
1679 case ReparentNotify: 1824 case ReparentNotify:
1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1681 want_refresh = want_full_refresh = 1; 1826 want_refresh = want_full_refresh = 1;
1682 break; 1827 break;
1683 } 1828 }
1684} 1829}
1685#endif 1830#endif
… …
1688rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1689{ 1834{
1690 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1691 1836
1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1693 if (!bypass_keystate) 1839 if (!bypass_keystate)
1694 reportmode = !! (priv_modes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695 1841
1696 /* 1842 /*
1697 * VT window processing of button press 1843 * VT window processing of button press
1698 */ 1844 */
1699 if (ev.window == TermWin.vt) 1845 if (ev.window == vt)
1700 { 1846 {
1701#if ISO_14755 1847#if ISO_14755
1702 // 5.4 1848 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 { 1850 {
… …
1717#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1718 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1719 { 1865 {
1720 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1721 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1722 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1723 { 1870 {
1724 /* only report double clicks */ 1871 /* only report double clicks */
1725 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1726 mouse_report (ev); 1873 mouse_report (ev);
… …
1746 else 1893 else
1747 { 1894 {
1748 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1749 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1750 1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1751 switch (ev.button) 1899 switch (ev.button)
1752 { 1900 {
1753 case Button1: 1901 case Button1:
1754 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1756#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1758#else 1906#else
1759 selection.rect = false; 1907 selection.rect = false;
1760#endif 1908#endif
1761 1909
1762 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1764 { 1912 {
1765 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1766 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1767 else 1915 else
1768 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1769 } 1917 }
1770 else 1918 else
1771 { 1919 {
1772 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1773 MEvent.clicks++; 1921 MEvent.clicks++;
1774 else 1922 else
1775 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1776 1924
1777 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1778 } 1926 }
1779 1927
1780 MEvent.button = Button1; 1928 MEvent.button = Button1;
1781 break; 1929 break;
1782 1930
1783 case Button3: 1931 case Button3:
1784 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1785 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1786 else 1934 else
1787 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1788 1936
1789 MEvent.button = Button3; 1937 MEvent.button = Button3;
1790 break; 1938 break;
1791 } 1939 }
1792 } 1940 }
1793 1941
1794 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1795 return; 1943 return;
1796 } 1944 }
1797 1945
… …
1909 case Button3: 2057 case Button3:
1910 if (scrollBar.style != R_SB_XTERM) 2058 if (scrollBar.style != R_SB_XTERM)
1911 { 2059 {
1912 if (scrollbar_above_slider (ev.y)) 2060 if (scrollbar_above_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 2061# ifdef RXVT_SCROLL_FULL
1914 scr_page (UP, TermWin.nrow - 1); 2062 scr_page (UP, nrow - 1);
1915# else 2063# else
1916 scr_page (UP, TermWin.nrow / 4); 2064 scr_page (UP, nrow / 4);
1917# endif 2065# endif
1918 else if (scrollbar_below_slider (ev.y)) 2066 else if (scrollbar_below_slider (ev.y))
1919# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
1920 scr_page (DN, TermWin.nrow - 1); 2068 scr_page (DN, nrow - 1);
1921# else 2069# else
1922 scr_page (DN, TermWin.nrow / 4); 2070 scr_page (DN, nrow / 4);
1923# endif 2071# endif
1924 else 2072 else
1925 scrollBar.setMotion (); 2073 scrollBar.setMotion ();
1926 } 2074 }
1927 else 2075 else
1928 { 2076 {
1929 scr_page ((ev.button == Button1 ? DN : UP), 2077 scr_page ((ev.button == Button1 ? DN : UP),
1930 (TermWin.nrow 2078 (nrow
1931 * scrollbar_position (ev.y) 2079 * scrollbar_position (ev.y)
1932 / scrollbar_size ())); 2080 / scrollbar_size ()));
1933 } 2081 }
1934 2082
1935 break; 2083 break;
1936 } 2084 }
1937 } 2085 }
2086
1938 return; 2087 return;
1939 } 2088 }
1940#if MENUBAR
1941 /*
1942 * Menubar window processing of button press
1943 */
1944 if (isMenuBarWindow (ev.window))
1945 menubar_control (ev);
1946#endif
1947} 2089}
1948 2090
1949void 2091void
1950rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
1951{ 2093{
… …
1957 2099
1958 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
1959 { 2101 {
1960 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
1961 scrollbar_show (0); 2103 scrollbar_show (0);
1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1963 refresh_type &= ~SMOOTH_REFRESH;
1964#endif
1965 } 2104 }
1966 2105
1967#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
1968 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
1969 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
1970#endif 2109#endif
1971 2110
1972 if (ev.window == TermWin.vt) 2111 if (ev.window == vt)
1973 { 2112 {
1974#if ISO_14755 2113#if ISO_14755
1975 // 5.4 2114 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return; 2116 return;
… …
2007 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2008 && bypass_keystate 2147 && bypass_keystate
2009 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2010 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2011 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2012 switch (ev.button) 2154 switch (ev.button)
2013 { 2155 {
2014 case Button1: 2156 case Button1:
2015 case Button3: 2157 case Button3:
2016 selection_make (ev.time); 2158 selection_make (ev.time);
… …
2027 2169
2028 v = ev.button == Button4 ? UP : DN; 2170 v = ev.button == Button4 ? UP : DN;
2029 2171
2030 if (ev.state & ShiftMask) 2172 if (ev.state & ShiftMask)
2031 i = 1; 2173 i = 1;
2032 else if (options & Opt_mouseWheelScrollPage) 2174 else if (OPTION (Opt_mouseWheelScrollPage))
2033 i = TermWin.nrow - 1; 2175 i = nrow - 1;
2034 else 2176 else
2035 i = 5; 2177 i = 5;
2036 2178
2037# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
2038 if (ev.state & ControlMask) 2180 if (ev.state & ControlMask)
2039 { 2181 {
2040 mouse_slip_wheel_speed += v ? -1 : 1; 2182 mouse_slip_wheel_speed += v ? -1 : 1;
2041 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2042 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2043 2185
2044 if (slip_wheel_ev.at < NOW) 2186 if (slip_wheel_ev.at < NOW)
2045 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046 2188
2047 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2048 } 2190 }
2049 else 2191 else
2050 { 2192 {
2051# endif 2193# endif
2052# ifdef JUMP_MOUSE_WHEEL
2053 scr_page (v, i); 2194 scr_page (v, i);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1); 2195 scrollbar_show (1);
2056# else
2057 while (i--)
2058 {
2059 scr_page (v, 1);
2060 scr_refresh (SMOOTH_REFRESH);
2061 scrollbar_show (1);
2062 }
2063# endif
2064# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2065 } 2197 }
2066#endif 2198# endif
2067 } 2199 }
2068 break; 2200 break;
2069#endif 2201#endif
2070 } 2202 }
2071 } 2203 }
2072#ifdef MENUBAR
2073 else if (isMenuBarWindow (ev.window))
2074 menubar_control (ev);
2075#endif
2076} 2204}
2077 2205
2078#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2079#if TINTING 2207#if TINTING
2080/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i; 2219 int i;
2092 2220
2093 Visual* visual = display->visual; 2221 Visual *visual = display->visual;
2094 2222
2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096 2224
2097 /* for convenience */ 2225 /* for convenience */
2098 mask_r = visual->red_mask; 2226 mask_r = visual->red_mask;
… …
2319 Atom atype; 2447 Atom atype;
2320 unsigned char *prop = NULL; 2448 unsigned char *prop = NULL;
2321 Window root, oldp, *list; 2449 Window root, oldp, *list;
2322 Pixmap rootpixmap = None; 2450 Pixmap rootpixmap = None;
2323 XWindowAttributes wattr, wrootattr; 2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2324 2453
2325 pchanged = 0; 2454 pchanged = 0;
2326 2455
2327 if (!(options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2328 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2329 2458
2330 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2331 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2332 2461
2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (disp, parent[0], &wattr);
2334 2463
2335 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2336 { 2465 {
2337 if (am_transparent) 2466 if (am_transparent)
2338 { 2467 {
2339 pchanged = 1; 2468 pchanged = 1;
2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2341 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2342 } 2471 }
2343 2472
2344 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2345 } 2474 }
2346 2475
2347 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2348 XSync (display->display, False); 2477 XSync (disp, False);
2349 2478
2350 /* 2479 /*
2351 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2352 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2353 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2354 */ 2483 */
2355 i = (xa[XA_XROOTPMAPID] 2484 i = (xa[XA_XROOTPMAP_ID]
2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2359 2488
2360 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2365 2494
2366 if (!i || prop == NULL 2495 if (!i || prop == NULL
2367#if TINTING 2496#if TINTING
… …
2386 Window cr; 2515 Window cr;
2387 XImage *image; 2516 XImage *image;
2388 GC gc; 2517 GC gc;
2389 XGCValues gcvalue; 2518 XGCValues gcvalue;
2390 2519
2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (disp, parent[0], display->root,
2392 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2393 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2394 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2395 nx = ny = 0; 2524 nx = ny = 0;
2396 2525
… …
2406 nh += sy; 2535 nh += sy;
2407 ny = -sy; 2536 ny = -sy;
2408 sy = 0; 2537 sy = 0;
2409 } 2538 }
2410 2539
2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2413 2542
2414 XSync (display->display, False); 2543 XSync (disp, False);
2415 allowedxerror = -1; 2544 allowedxerror = -1;
2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417 2546
2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2419 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2420 allowedxerror = 0; 2549 allowedxerror = 0;
2421 2550
2422 if (image == NULL) 2551 if (image == NULL)
2423 { 2552 {
2424 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2425 { 2554 {
2426 pchanged = 1; 2555 pchanged = 1;
2427 if (TermWin.pixmap != None) 2556 if (pixmap != None)
2428 { 2557 {
2429 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (disp, pixmap);
2430 TermWin.pixmap = None; 2559 pixmap = None;
2431 } 2560 }
2432 } 2561 }
2433 2562
2434 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2435 } 2564 }
2436 else 2565 else
2437 { 2566 {
2438 if (TermWin.pixmap != None) 2567 if (pixmap != None)
2439 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (disp, pixmap);
2440 2569
2441#if TINTING 2570#if TINTING
2442 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2443 { 2572 {
2444 unsigned short rm, gm, bm; 2573 unsigned short rm, gm, bm;
… …
2448 2577
2449 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (display, image, shade, rm, gm, bm);
2450 } 2579 }
2451#endif 2580#endif
2452 2581
2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2582 pixmap = XCreatePixmap (disp, vt,
2454 szHint.width, szHint.height, image->depth); 2583 szHint.width, szHint.height, image->depth);
2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2457 nx, ny, image->width, image->height); 2586 nx, ny, image->width, image->height);
2458 XFreeGC (display->display, gc); 2587 XFreeGC (disp, gc);
2459 XDestroyImage (image); 2588 XDestroyImage (image);
2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2461 XClearWindow (display->display, TermWin.parent[0]); 2590 XClearWindow (disp, parent[0]);
2462 2591
2463 if (!am_transparent || !am_pixmap_trans) 2592 if (!am_transparent || !am_pixmap_trans)
2464 pchanged = 1; 2593 pchanged = 1;
2465 2594
2466 am_transparent = am_pixmap_trans = 1; 2595 am_transparent = am_pixmap_trans = 1;
2467 } 2596 }
2468 } 2597 }
2469 2598
2470 if (am_pixmap_trans) 2599 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2472 else 2601 else
2473 { 2602 {
2474 unsigned int n; 2603 unsigned int n;
2475 /* 2604 /*
2476 * InheritPixmap transparency 2605 * InheritPixmap transparency
2477 */ 2606 */
2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2479 { 2608 {
2480 oldp = TermWin.parent[i]; 2609 oldp = parent[i];
2481 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2610 XQueryTree (disp, parent[i - 1], &root,
2482 &TermWin.parent[i], &list, &n); 2611 &parent[i], &list, &n);
2483 XFree (list); 2612 XFree (list);
2484 2613
2485 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
2486 { 2615 {
2487 if (oldp != None) 2616 if (oldp != None)
2488 pchanged = 1; 2617 pchanged = 1;
2489 2618
2490 break; 2619 break;
2491 } 2620 }
2492 2621
2493 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
2494 pchanged = 1; 2623 pchanged = 1;
2495 } 2624 }
2496 2625
2497 n = 0; 2626 n = 0;
2498 2627
2499 if (pchanged) 2628 if (pchanged)
2500 { 2629 {
2501 for (; n < (unsigned int)i; n++) 2630 for (; n < (unsigned int)i; n++)
2502 { 2631 {
2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2632 XGetWindowAttributes (disp, parent[n], &wattr);
2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505 { 2634 {
2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2507 break; 2636 break;
2508 } 2637 }
2509 } 2638 }
2510 } 2639 }
2511 2640
2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2513 { 2642 {
2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2516 am_transparent = 0; 2645 am_transparent = 0;
2517 /* XXX: also turn off Opt_transparent? */ 2646 /* XXX: also turn off Opt_transparent? */
2518 } 2647 }
2519 else 2648 else
2520 { 2649 {
… …
2523 * needed for fvwm2.2.2 (and before?) */ 2652 * needed for fvwm2.2.2 (and before?) */
2524 sleep (1); 2653 sleep (1);
2525#endif 2654#endif
2526 for (n = 0; n < (unsigned int)i; n++) 2655 for (n = 0; n < (unsigned int)i; n++)
2527 { 2656 {
2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]); 2658 XClearWindow (disp, parent[n]);
2530 } 2659 }
2531 2660
2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2533 am_transparent = 1; 2662 am_transparent = 1;
2534 } 2663 }
2535 2664
2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2537 TermWin.parent[i] = None; 2666 parent[i] = None;
2538 } 2667 }
2539 2668
2540 if (scrollBar.win) 2669 if (scrollBar.win)
2541 { 2670 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle (); 2672 scrollBar.setIdle ();
2544 scrollbar_show (0); 2673 scrollbar_show (0);
2545 } 2674 }
2546 2675
2547 if (am_transparent) 2676 if (am_transparent)
… …
2559 2688
2560bool 2689bool
2561rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2562{ 2691{
2563 bool flag = false; 2692 bool flag = false;
2564 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2565 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2566 2695
2567 for (;;) 2696 for (;;)
2568 { 2697 {
2569 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2570 { 2699 {
2571 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2572 ch = next_char (); 2701 ch = next_char ();
2573 }
2574 2702
2575 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2576 break; 2704 break;
2705 }
2577 2706
2578 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2579 { 2708 {
2580 if (!seen_input) 2709 if (!seen_input)
2581 { 2710 {
… …
2585 // some window managers resize the window early, and these programs 2714 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong. 2715 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike 2716 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being 2717 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized. 2718 // resized.
2590 if (seen_resize) 2719 if (seen_resize && cmd_pid)
2591 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2592 } 2721 }
2593 2722
2594 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2595 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2596 bool refreshnow = false; 2725 bool refreshnow = false;
2597 int nlines = 0; 2726 int nlines = 0;
2598 unicode_t *str = buf; 2727 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2599 2729
2600 for (;;) 2730 for (;;)
2601 { 2731 {
2602 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2603 break; 2733 break;
2604 2734
2605 *str++ = ch; 2735 *str++ = ch;
2606 2736
2607 if (ch == C0_LF) 2737 if (ch == C0_LF || str >= eol)
2608 { 2738 {
2739 if (ch == C0_LF)
2609 nlines++; 2740 nlines++;
2741
2610 refresh_count++; 2742 refresh_count++;
2611 2743
2612 if (!(options & Opt_jumpScroll) 2744 if (!OPTION (Opt_jumpScroll)
2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2614 { 2746 {
2615 refreshnow = true; 2747 refreshnow = true;
2748 refresh_count = 0;
2616 ch = NOCHAR; 2749 ch = NOCHAR;
2617 break; 2750 break;
2618 } 2751 }
2619 2752
2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2621 if (nlines >= TermWin.nrow - 1) 2754 if (nlines >= nrow - 1)
2622 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2623 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2624 nlines = 0; 2760 nlines = 0;
2625 str = buf; 2761 str = buf;
2762 eol = str + min (ncol, UBUFSIZ);
2626 } 2763 }
2627 }
2628 2764
2629 if (str >= buf + UBUFSIZ) 2765 if (str >= eol)
2630 { 2766 {
2767 if (eol >= buf + UBUFSIZ)
2768 {
2631 ch = NOCHAR; 2769 ch = NOCHAR;
2632 break; 2770 break;
2771 }
2772 else
2773 eol = min (eol + ncol, buf + UBUFSIZ);
2774 }
2775
2633 } 2776 }
2634 2777
2635 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2636 ch = next_char (); 2779 ch = next_char ();
2637 } 2780 }
2638 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2639 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2640 2785
2641 /* 2786 /*
2642 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2643 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2644 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
2645 * is incremented here because we must be doing flat-out scrolling. 2790 * is incremented here because we must be doing flat-out scrolling.
2646 */ 2791 */
2647 if (refreshnow) 2792 if (refreshnow)
2648 { 2793 {
2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2650 refresh_limit++; 2795 refresh_limit++;
2651 else 2796 else
2652 { 2797 {
2653 flag = true; 2798 flag = true;
2654 scr_refresh (refresh_type); 2799 scr_refresh ();
2800 want_refresh = 1;
2655 } 2801 }
2656 } 2802 }
2657 2803
2658 } 2804 }
2659 else 2805 else
… …
2674 } 2820 }
2675 2821
2676 return flag; 2822 return flag;
2677} 2823}
2678 2824
2679// read the next octet
2680unicode_t
2681rxvt_term::next_octet ()
2682{
2683 return cmdbuf_ptr < cmdbuf_endp
2684 ? *cmdbuf_ptr++
2685 : NOCHAR;
2686}
2687
2688// read the next character 2825// read the next character
2689unicode_t 2826wchar_t
2690rxvt_term::next_char () 2827rxvt_term::next_char ()
2691{ 2828{
2692 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2693 { 2830 {
2694 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2695 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2696 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2697 2834
2698 wchar_t wc; 2835 wchar_t wc;
2699 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2700 2837
2701 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2702 { 2839 {
2703 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2704 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2705 break; 2842 break;
2706 } 2843 }
2707 2844
2708 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2709 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2710 2847
2711 // assume wchar == unicode 2848 // assume wchar == unicode
2712 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2713 return wc; 2850 return wc & UNICODE_MASK;
2714 } 2851 }
2715 2852
2716 return NOCHAR; 2853 return NOCHAR;
2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet ()
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2717} 2863}
2718 2864
2719/* rxvt_cmd_getc () - Return next input character */ 2865/* rxvt_cmd_getc () - Return next input character */
2720/* 2866/*
2721 * Return the next input character after first passing any keyboard input 2867 * Return the next input character after first passing any keyboard input
2722 * to the command. 2868 * to the command.
2723 */ 2869 */
2724unicode_t 2870wchar_t
2725rxvt_term::cmd_getc () 2871rxvt_term::cmd_getc ()
2726{ 2872{
2727 unicode_t c = next_char (); 2873 wchar_t c = next_char ();
2728 2874
2729 if (c == NOCHAR) 2875 if (c == NOCHAR)
2730 throw out_of_input; 2876 throw out_of_input;
2731 2877
2732 return c; 2878 return c;
2733} 2879}
2734 2880
2735unicode_t 2881uint32_t
2736rxvt_term::cmd_get8 () 2882rxvt_term::cmd_get8 ()
2737{ 2883{
2738 unicode_t c = next_octet (); 2884 uint32_t c = next_octet ();
2739 2885
2740 if (c == NOCHAR) 2886 if (c == NOCHAR)
2741 throw out_of_input; 2887 throw out_of_input;
2742 2888
2743 return c; 2889 return c;
… …
2843 case C0_ESC: 2989 case C0_ESC:
2844 process_escape_seq (); 2990 process_escape_seq ();
2845 break; 2991 break;
2846 case C0_ENQ: /* terminal Status */ 2992 case C0_ENQ: /* terminal Status */
2847 if (rs[Rs_answerbackstring]) 2993 if (rs[Rs_answerbackstring])
2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2994 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2850 else 2995 else
2851 tt_write ((unsigned char *)VT100_ANS, 2996 tt_write (VT100_ANS, strlen (VT100_ANS));
2852 (unsigned int)strlen (VT100_ANS));
2853 break; 2997 break;
2854 case C0_BEL: /* bell */ 2998 case C0_BEL: /* bell */
2855 scr_bell (); 2999 scr_bell ();
2856 break; 3000 break;
2857 case C0_BS: /* backspace */ 3001 case C0_BS: /* backspace */
… …
3012 break; 3156 break;
3013 3157
3014 /* 8.3.87: NEXT LINE */ 3158 /* 8.3.87: NEXT LINE */
3015 case C1_NEL: /* ESC E */ 3159 case C1_NEL: /* ESC E */
3016 { 3160 {
3017 unicode_t nlcr[] = { C0_LF, C0_CR }; 3161 wchar_t nlcr[] = { C0_LF, C0_CR };
3018 scr_add_lines (nlcr, 1, 2); 3162 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3019 } 3163 }
3020 break; 3164 break;
3021 3165
3022 /* kidnapped escape sequence: Should be 8.3.48 */ 3166 /* kidnapped escape sequence: Should be 8.3.48 */
3023 case C1_ESA: /* ESC G */ 3167 case C1_ESA: /* ESC G */
… …
3045 process_dcs_seq (); 3189 process_dcs_seq ();
3046 break; 3190 break;
3047 3191
3048 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3192 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3049 case C1_SCI: /* ESC Z */ 3193 case C1_SCI: /* ESC Z */
3050 tt_write ((const unsigned char *)ESCZ_ANSWER, 3194 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3051 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3052 break; /* steal obsolete ESC [ c */ 3195 break; /* steal obsolete ESC [ c */
3053 3196
3054 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3197 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3055 case C1_CSI: /* ESC [ */ 3198 case C1_CSI: /* ESC [ */
3056 process_csi_seq (); 3199 process_csi_seq ();
… …
3181 { 3324 {
3182 switch (priv) 3325 switch (priv)
3183 { 3326 {
3184 case '>': 3327 case '>':
3185 if (ch == CSI_DA) /* secondary device attributes */ 3328 if (ch == CSI_DA) /* secondary device attributes */
3186 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3329 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3187 break; 3330 break;
3188 case '?': 3331 case '?':
3189 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3190 process_terminal_mode (ch, priv, nargs, arg); 3333 process_terminal_mode (ch, priv, nargs, arg);
3191 break; 3334 break;
… …
3296 3439
3297 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3440 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3298 arg[0] = -arg[0]; 3441 arg[0] = -arg[0];
3299 /* FALLTHROUGH */ 3442 /* FALLTHROUGH */
3300 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3443 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3444 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3302 break; 3445 break;
3303 3446
3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3447 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3305 tt_write ((const unsigned char *)VT100_ANS, 3448 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3306 (unsigned int) (sizeof (VT100_ANS) - 1));
3307 break; 3449 break;
3308 3450
3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3451 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3310 process_sgr_mode (nargs, arg); 3452 process_sgr_mode (nargs, arg);
3311 break; 3453 break;
… …
3318 break; 3460 break;
3319 case 6: /* CPR requested */ 3461 case 6: /* CPR requested */
3320 scr_report_position (); 3462 scr_report_position ();
3321 break; 3463 break;
3322 case 7: /* unofficial extension */ 3464 case 7: /* unofficial extension */
3323 if (options & Opt_insecure) 3465 if (OPTION (Opt_insecure))
3324 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3466 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3325 break; 3467 break;
3326 case 8: /* unofficial extension */ 3468 case 8: /* unofficial extension */
3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3328 break; 3470 break;
… …
3420rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3562rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421{ 3563{
3422 int x, y; 3564 int x, y;
3423 XWindowAttributes wattr; 3565 XWindowAttributes wattr;
3424 Window wdummy; 3566 Window wdummy;
3567 dDisp;
3425 3568
3426 if (nargs == 0) 3569 if (nargs == 0)
3427 return; 3570 return;
3428 3571
3429 switch (args[0]) 3572 switch (args[0])
3430 { 3573 {
3431 /* 3574 /*
3432 * commands 3575 * commands
3433 */ 3576 */
3434 case 1: /* deiconify window */ 3577 case 1: /* deiconify window */
3435 XMapWindow (display->display, TermWin.parent[0]); 3578 XMapWindow (disp, parent[0]);
3436 break; 3579 break;
3437 case 2: /* iconify window */ 3580 case 2: /* iconify window */
3438 XIconifyWindow (display->display, TermWin.parent[0], 3581 XIconifyWindow (disp, parent[0], display->screen);
3439 DefaultScreen (display->display));
3440 break; 3582 break;
3441 case 3: /* set position (pixels) */ 3583 case 3: /* set position (pixels) */
3442 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3584 XMoveWindow (disp, parent[0], args[1], args[2]);
3443 break; 3585 break;
3444 case 4: /* set size (pixels) */ 3586 case 4: /* set size (pixels) */
3445 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446 break; 3588 break;
3447 case 5: /* raise window */ 3589 case 5: /* raise window */
3448 XRaiseWindow (display->display, TermWin.parent[0]); 3590 XRaiseWindow (disp, parent[0]);
3449 break; 3591 break;
3450 case 6: /* lower window */ 3592 case 6: /* lower window */
3451 XLowerWindow (display->display, TermWin.parent[0]); 3593 XLowerWindow (disp, parent[0]);
3452 break; 3594 break;
3453 case 7: /* refresh window */ 3595 case 7: /* refresh window */
3454 scr_touch (true); 3596 scr_touch (true);
3455 break; 3597 break;
3456 case 8: /* set size (chars) */ 3598 case 8: /* set size (chars) */
3457 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3599 set_widthheight ((unsigned int) (args[2] * fwidth),
3458 (unsigned int) (args[1] * TermWin.fheight)); 3600 (unsigned int) (args[1] * fheight));
3459 break; 3601 break;
3460 3602
3461 //case 9: NYI, TODO, restore maximized window or maximize window 3603 //case 9: NYI, TODO, restore maximized window or maximize window
3462 default: 3604 default:
3463 if (args[0] >= 24) /* set height (chars) */ 3605 if (args[0] >= 24) /* set height (chars) */
3464 set_widthheight ((unsigned int)TermWin.width, 3606 set_widthheight ((unsigned int)width,
3465 (unsigned int) (args[1] * TermWin.fheight)); 3607 (unsigned int) (args[1] * fheight));
3466 break; 3608 break;
3467 3609
3468 3610
3469 /* 3611 /*
3470 * reports - some output format copied from XTerm 3612 * reports - some output format copied from XTerm
3471 */ 3613 */
3472 case 11: /* report window state */ 3614 case 11: /* report window state */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3615 XGetWindowAttributes (disp, parent[0], &wattr);
3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475 break; 3617 break;
3476 case 13: /* report window position */ 3618 case 13: /* report window position */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3619 XGetWindowAttributes (disp, parent[0], &wattr);
3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3620 XTranslateCoordinates (disp, parent[0], wattr.root,
3479 -wattr.border_width, -wattr.border_width, 3621 -wattr.border_width, -wattr.border_width,
3480 &x, &y, &wdummy); 3622 &x, &y, &wdummy);
3481 tt_printf ("\033[3;%d;%dt", x, y); 3623 tt_printf ("\033[3;%d;%dt", x, y);
3482 break; 3624 break;
3483 case 14: /* report window size (pixels) */ 3625 case 14: /* report window size (pixels) */
3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3626 XGetWindowAttributes (disp, parent[0], &wattr);
3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486 break; 3628 break;
3487 case 18: /* report text area size (chars) */ 3629 case 18: /* report text area size (chars) */
3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3630 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3489 break; 3631 break;
3490 case 19: /* report window size (chars) */ 3632 case 19: /* report window size (chars) */
3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3633 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3492 break; 3634 break;
3493 case 20: /* report icon label */ 3635 case 20: /* report icon label */
3494 { 3636 {
3495 char *s; 3637 char *s;
3496 XGetIconName (display->display, TermWin.parent[0], &s); 3638 XGetIconName (disp, parent[0], &s);
3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3639 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3498 XFree (s); 3640 XFree (s);
3499 } 3641 }
3500 break; 3642 break;
3501 case 21: /* report window title */ 3643 case 21: /* report window title */
3502 { 3644 {
3503 char *s; 3645 char *s;
3504 XFetchName (display->display, TermWin.parent[0], &s); 3646 XFetchName (disp, parent[0], &s);
3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3647 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3506 XFree (s); 3648 XFree (s);
3507 } 3649 }
3508 break; 3650 break;
3509 } 3651 }
3510} 3652}
… …
3513/*----------------------------------------------------------------------*/ 3655/*----------------------------------------------------------------------*/
3514/* 3656/*
3515 * get input up until STRING TERMINATOR (or BEL) 3657 * get input up until STRING TERMINATOR (or BEL)
3516 * ends_how is terminator used. returned input must be free()'d 3658 * ends_how is terminator used. returned input must be free()'d
3517 */ 3659 */
3518unsigned char * 3660char *
3519rxvt_term::get_to_st (unicode_t &ends_how) 3661rxvt_term::get_to_st (unicode_t &ends_how)
3520{ 3662{
3521 unicode_t ch; 3663 unicode_t ch;
3522 bool seen_esc = false; 3664 bool seen_esc = false;
3523 unsigned int n = 0; 3665 unsigned int n = 0;
… …
3542 else if (ch < 0x20) 3684 else if (ch < 0x20)
3543 return NULL; /* other control character - exit */ 3685 return NULL; /* other control character - exit */
3544 3686
3545 seen_esc = false; 3687 seen_esc = false;
3546 3688
3547 if (n >= sizeof (string) - 1) 3689 if (n >= STRING_MAX - 1)
3548 // stop at some sane length 3690 // stop at some sane length
3549 return NULL; 3691 return NULL;
3550 3692
3551 if (ch == C0_SYN) 3693 if (ch == C0_SYN)
3552 string[n++] = cmd_get8 (); 3694 string[n++] = cmd_get8 ();
… …
3556 3698
3557 string[n++] = '\0'; 3699 string[n++] = '\0';
3558 3700
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 3702
3561 return (unsigned char *)rxvt_wcstombs (string); 3703 return rxvt_wcstombs (string);
3562} 3704}
3563 3705
3564/*----------------------------------------------------------------------*/ 3706/*----------------------------------------------------------------------*/
3565/* 3707/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3708 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3567 */ 3709 */
3568void 3710void
3569rxvt_term::process_dcs_seq () 3711rxvt_term::process_dcs_seq ()
3570{ 3712{
3571 unsigned char *s; 3713 char *s;
3572 unicode_t eh; 3714 unicode_t eh;
3573 3715
3574 /* 3716 /*
3575 * Not handled yet 3717 * Not handled yet
3576 */ 3718 */
… …
3595 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3737 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3596 arg = arg * 10 + (ch - '0'); 3738 arg = arg * 10 + (ch - '0');
3597 3739
3598 if (ch == ';') 3740 if (ch == ';')
3599 { 3741 {
3600 unsigned char *s = get_to_st (eh); 3742 char *s = get_to_st (eh);
3601 3743
3602 if (s) 3744 if (s)
3603 { 3745 {
3604 process_xterm_seq (arg, (char *)s, eh); 3746 process_xterm_seq (arg, s, eh);
3605 free (s); 3747 free (s);
3606 } 3748 }
3607 } 3749 }
3608} 3750}
3609 3751
3610void 3752void
3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3612{ 3754{
3613 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3614 { 3756 {
3615 unsigned short r, g, b; 3757 unsigned short r, g, b;
3616 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (display, r, g, b);
… …
3620 set_window_color (color, str); 3762 set_window_color (color, str);
3621} 3763}
3622 3764
3623/* 3765/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * 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 */ 3767 */
3648void 3768void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3650{ 3770{
3651 int changed = 0;
3652 int color; 3771 int color;
3653 char *buf, *name; 3772 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3774 int saveop = op;
3775 dDisp;
3656 3776
3657 assert (str != NULL); 3777 assert (str != NULL);
3658 switch (op) 3778 switch (op)
3659 { 3779 {
3660 case XTerm_name: 3780 case XTerm_name:
… …
3676 unsigned long bytes_after; 3796 unsigned long bytes_after;
3677 unsigned char *value = 0; 3797 unsigned char *value = 0;
3678 const char *str = ""; 3798 const char *str = "";
3679 3799
3680 if (prop 3800 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3801 && XGetWindowProperty (disp, parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3802 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3803 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3804 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3805 && actual_type != None
3686 && actual_format == 8) 3806 && actual_format == 8)
… …
3698 { 3818 {
3699 *eq = 0; 3819 *eq = 0;
3700 set_utf8_property (display->atom (str), eq + 1); 3820 set_utf8_property (display->atom (str), eq + 1);
3701 } 3821 }
3702 else 3822 else
3703 XDeleteProperty (display->display, TermWin.parent[0], 3823 XDeleteProperty (disp, parent[0],
3704 display->atom (str)); 3824 display->atom (str));
3705 } 3825 }
3706 break; 3826 break;
3707 3827
3708 case XTerm_Color: 3828 case XTerm_Color:
… …
3710 { 3830 {
3711 if ((name = strchr (buf, ';')) == NULL) 3831 if ((name = strchr (buf, ';')) == NULL)
3712 break; 3832 break;
3713 3833
3714 *name++ = '\0'; 3834 *name++ = '\0';
3715 color = atoi (buf); 3835 color = atoi (buf) + minCOLOR;
3716 3836
3717 if (color < 0 || color >= TOTAL_COLORS) 3837 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3718 break; 3838 break;
3719 3839
3720 if ((buf = strchr (name, ';')) != NULL) 3840 if ((buf = strchr (name, ';')) != NULL)
3721 *buf++ = '\0'; 3841 *buf++ = '\0';
3722 3842
3723 if (name[0] == '?' && !name[1]) 3843 if (name[0] == '?' && !name[1])
3724 { 3844 {
3725 unsigned short r, g, b; 3845 unsigned short r, g, b;
3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3846 pix_colors_focused[color].get (display, r, g, b);
3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3728 } 3848 }
3729 else 3849 else
3730 set_window_color (color + minCOLOR, name); 3850 set_window_color (color, name);
3731 } 3851 }
3732 break; 3852 break;
3733 case XTerm_Color00: 3853 case XTerm_Color00:
3734 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3735 break; 3855 break;
3736 case XTerm_Color01: 3856 case XTerm_Color01:
3737 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3738 break; 3858 break;
3739#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3740 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3741 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3742 break; 3862 break;
… …
3746 break; 3866 break;
3747 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3748 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3749 break; 3869 break;
3750#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3751 case XTerm_Color_BD:
3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3757 case XTerm_Color_UL:
3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3759 break;
3760 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762 break; 3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3881 break;
3882 case URxvt_Color_IT:
3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3884 break;
3763#endif 3885#endif
3764#if TRANSPARENT && TINTING 3886#if TRANSPARENT && TINTING
3765 case XTerm_Color_tint: 3887 case URxvt_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3888 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3767 check_our_parents (); 3889 check_our_parents ();
3768 if (am_transparent) 3890 if (am_transparent)
3769 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3770 break; 3892 break;
3771#endif 3893#endif
3772 3894
3773 case XTerm_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3774 if (*str != ';') 3897 if (*str != ';')
3775 { 3898 {
3776#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3777 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3778 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3779#endif
3780 scr_touch (true); 3902 scr_touch (true);
3903#endif
3781 } 3904 }
3905
3906 int changed = 0;
3907
3782 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3783 { 3909 {
3784 str++; 3910 str++;
3785#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3786 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3787#endif 3913#endif
3788
3789 } 3914 }
3915
3790 if (changed) 3916 if (changed)
3791 { 3917 {
3792#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3793 resize_pixmap (); 3919 resize_pixmap ();
3794#endif
3795 scr_touch (true); 3920 scr_touch (true);
3921#endif
3796 } 3922 }
3923 }
3797 break; 3924 break;
3798 3925
3799 case XTerm_restoreFG: 3926 case Rxvt_restoreFG:
3800 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3801 break; 3928 break;
3802 case XTerm_restoreBG: 3929 case Rxvt_restoreBG:
3803 set_window_color (Color_bg, str); 3930 set_window_color (Color_bg, str);
3804 break; 3931 break;
3805 3932
3806 case XTerm_logfile: 3933 case XTerm_logfile:
3807 // TODO, when secure mode? 3934 // TODO, when secure mode?
3808 break; 3935 break;
3809 3936
3937#if 0
3938 case Rxvt_dumpscreen: /* no error notices */
3939 {
3940 int fd;
3941 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3942 {
3943 scr_dump (fd);
3944 close (fd);
3945 }
3946 }
3947 break;
3948#endif
3810 case XTerm_font: 3949 case XTerm_font:
3811 op = URxvt_font; 3950 op = URxvt_font;
3812 case URxvt_font: 3951 case URxvt_font:
3813#if ENABLE_STYLES 3952#if ENABLE_STYLES
3814 case URxvt_boldFont: 3953 case URxvt_boldFont:
3815 case URxvt_italicFont: 3954 case URxvt_italicFont:
3816 case URxvt_boldItalicFont: 3955 case URxvt_boldItalicFont:
3817#endif 3956#endif
3818 if (query) 3957 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop, 3958 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3959 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3960 ? fontset[op - URxvt_font]->fontdesc : "",
3822 resp); 3961 resp);
3823 else 3962 else
3824 { 3963 {
3825 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3964 const char *&res = rs[Rs_font + (op - URxvt_font)];
3826 3965
… …
3829 set_fonts (); 3968 set_fonts ();
3830 } 3969 }
3831 break; 3970 break;
3832 3971
3833#if ENABLE_FRILLS 3972#if ENABLE_FRILLS
3834 case XTerm_locale: 3973 case URxvt_locale:
3835 if (query) 3974 if (query)
3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3837 else 3976 else
3838 { 3977 {
3839 set_locale (str); 3978 set_locale (str);
3840# ifdef USE_XIM 3979 pty->set_utf8_mode (enc_utf8);
3841 im_cb (); 3980 init_xlocale ();
3842# endif
3843 } 3981 }
3844 break; 3982 break;
3845#endif
3846 3983
3847#ifdef MENUBAR 3984 case URxvt_view_up:
3848 case XTerm_Menu: 3985 case URxvt_view_down:
3849 if (options & Opt_insecure) 3986 {
3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3987 int lines = atoi (str);
3988
3989 if (lines)
3990 scr_page (op == URxvt_view_up ? UP : DN, lines);
3991 else
3992 scr_erase_savelines ();
3993 }
3994
3851 break; 3995 break;
3852#endif 3996#endif
3853#if 0 3997
3854 case XTerm_dumpscreen: /* no error notices */ 3998#if ENABLE_PERL
3855 { 3999 case URxvt_perl:
3856 int fd; 4000 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3857 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4001 ; // no responses yet
3858 {
3859 scr_dump (fd);
3860 close (fd);
3861 }
3862 }
3863 break; 4002 break;
3864#endif 4003#endif
3865 } 4004 }
3866} 4005}
3867/*----------------------------------------------------------------------*/ 4006/*----------------------------------------------------------------------*/
… …
3919 { 5, PrivMode_rVideo }, 4058 { 5, PrivMode_rVideo },
3920 { 6, PrivMode_relOrigin }, 4059 { 6, PrivMode_relOrigin },
3921 { 7, PrivMode_Autowrap }, 4060 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode 4061 // 8, bi-directional support mode
3923 { 9, PrivMode_MouseX10 }, 4062 { 9, PrivMode_MouseX10 },
3924#ifdef menuBar_esc
3925 { menuBar_esc, PrivMode_menuBar },
3926#endif
3927 // 18, 19 printing-related 4063 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor }, 4064 { 25, PrivMode_VisibleCursor },
3929#ifdef scrollBar_esc 4065#ifdef scrollBar_esc
3930 { scrollBar_esc, PrivMode_scrollBar }, 4066 { scrollBar_esc, PrivMode_scrollBar },
3931#endif 4067#endif
… …
3976 } 4112 }
3977 4113
3978 /* extra handling for values with state unkept */ 4114 /* extra handling for values with state unkept */
3979 switch (arg[i]) 4115 switch (arg[i])
3980 { 4116 {
4117#if ENABLE_STYLES
4118 case 1021:
4119 set_option (Opt_intensityStyles, mode);
4120
4121 scr_touch (true);
4122 break;
4123#endif
3981 case 1048: /* alternative cursor save */ 4124 case 1048: /* alternative cursor save */
3982 case 1049: 4125 case 1049:
3983 if (options & Opt_secondaryScreen) 4126 if (OPTION (Opt_secondaryScreen))
3984 if (mode == 0) 4127 if (mode == 0)
3985 scr_cursor (RESTORE); 4128 scr_cursor (RESTORE);
3986 else if (mode == 1) 4129 else if (mode == 1)
3987 scr_cursor (SAVE); 4130 scr_cursor (SAVE);
3988 break; 4131 break;
… …
4000 */ 4143 */
4001 PrivMode (1, PrivMode_vt52); 4144 PrivMode (1, PrivMode_vt52);
4002 break; 4145 break;
4003 case 3: /* 80/132 */ 4146 case 3: /* 80/132 */
4004 if (priv_modes & PrivMode_132OK) 4147 if (priv_modes & PrivMode_132OK)
4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4148 set_widthheight (((state ? 132 : 80) * fwidth), height);
4006 break; 4149 break;
4007 case 4: /* smooth scrolling */ 4150 case 4: /* smooth scrolling */
4008 if (state)
4009 options &= ~Opt_jumpScroll;
4010 else
4011 options |= Opt_jumpScroll; 4151 set_option (Opt_jumpScroll, !state);
4012 break; 4152 break;
4013 case 5: /* reverse video */ 4153 case 5: /* reverse video */
4014 scr_rvideo_mode (state); 4154 scr_rvideo_mode (state);
4015 break; 4155 break;
4016 case 6: /* relative/absolute origins */ 4156 case 6: /* relative/absolute origins */
… …
4022 /* case 8: - auto repeat, can't do on a per window basis */ 4162 /* case 8: - auto repeat, can't do on a per window basis */
4023 case 9: /* X10 mouse reporting */ 4163 case 9: /* X10 mouse reporting */
4024 if (state) /* orthogonal */ 4164 if (state) /* orthogonal */
4025 priv_modes &= ~PrivMode_MouseX11; 4165 priv_modes &= ~PrivMode_MouseX11;
4026 break; 4166 break;
4027#ifdef menuBar_esc
4028 case menuBar_esc:
4029#ifdef MENUBAR
4030 map_menuBar (state);
4031#endif
4032 break;
4033#endif
4034#ifdef scrollBar_esc 4167#ifdef scrollBar_esc
4035 case scrollBar_esc: 4168 case scrollBar_esc:
4036 if (scrollbar_mapping (state)) 4169 if (scrollbar_mapping (state))
4037 { 4170 {
4038 resize_all_windows (0, 0, 0); 4171 resize_all_windows (0, 0, 0);
… …
4057#if 0 4190#if 0
4058 case 1001: 4191 case 1001:
4059 break; /* X11 mouse highlighting */ 4192 break; /* X11 mouse highlighting */
4060#endif 4193#endif
4061 case 1010: /* scroll to bottom on TTY output inhibit */ 4194 case 1010: /* scroll to bottom on TTY output inhibit */
4062 if (state)
4063 options &= ~Opt_scrollTtyOutput;
4064 else
4065 options |= Opt_scrollTtyOutput; 4195 set_option (Opt_scrollTtyOutput, !state);
4066 break; 4196 break;
4067 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4068 if (state)
4069 options |= Opt_scrollTtyKeypress; 4198 set_option (Opt_scrollTtyKeypress, state);
4070 else
4071 options &= ~Opt_scrollTtyKeypress;
4072 break; 4199 break;
4073 case 1047: /* secondary screen w/ clearing last */ 4200 case 1047: /* secondary screen w/ clearing last */
4074 if (options & Opt_secondaryScreen) 4201 if (OPTION (Opt_secondaryScreen))
4075 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
4076 scr_erase_screen (2); 4203 scr_erase_screen (2);
4077 scr_change_screen (state); 4204 scr_change_screen (state);
4078 break; 4205 break;
4079 case 1049: /* secondary screen w/ clearing first */ 4206 case 1049: /* secondary screen w/ clearing first */
4080 scr_change_screen (state); 4207 scr_change_screen (state);
4081 if (options & Opt_secondaryScreen) 4208 if (OPTION (Opt_secondaryScreen))
4082 if (current_screen != PRIMARY) 4209 if (current_screen != PRIMARY)
4083 scr_erase_screen (2); 4210 scr_erase_screen (2);
4084 break; 4211 break;
4085 default: 4212 default:
4086 break; 4213 break;
… …
4214 scr_color (Color_bg, Color_bg); 4341 scr_color (Color_bg, Color_bg);
4215 break; 4342 break;
4216 4343
4217 //case 50: // not variable spacing 4344 //case 50: // not variable spacing
4218 4345
4219#ifndef NO_BRIGHTCOLOR 4346#if ENABLE_FRILLS
4220 case 90: 4347 case 90:
4221 case 91: /* set bright fg color */ 4348 case 91: /* set bright fg color */
4222 case 92: 4349 case 92:
4223 case 93: 4350 case 93:
4224 case 94: 4351 case 94:
… …
4236 case 106: 4363 case 106:
4237 case 107: 4364 case 107:
4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4365 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4239 break; 4366 break;
4240#endif 4367#endif
4241
4242 } 4368 }
4243 } 4369 }
4244} 4370}
4245/*}}} */ 4371/*}}} */
4246 4372
… …
4270 */ 4396 */
4271void 4397void
4272rxvt_term::tt_printf (const char *fmt,...) 4398rxvt_term::tt_printf (const char *fmt,...)
4273{ 4399{
4274 va_list arg_ptr; 4400 va_list arg_ptr;
4275 unsigned char buf[256]; 4401 char buf[256];
4276 4402
4277 va_start (arg_ptr, fmt); 4403 va_start (arg_ptr, fmt);
4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4404 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4279 va_end (arg_ptr); 4405 va_end (arg_ptr);
4280 tt_write (buf, strlen (buf)); 4406 tt_write (buf, strlen (buf));
… …
4282 4408
4283/* ---------------------------------------------------------------------- */ 4409/* ---------------------------------------------------------------------- */
4284/* Write data to the pty as typed by the user, pasted with the mouse, 4410/* Write data to the pty as typed by the user, pasted with the mouse,
4285 * or generated by us in response to a query ESC sequence. 4411 * or generated by us in response to a query ESC sequence.
4286 */ 4412 */
4413const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4414
4287void 4415void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4289{ 4417{
4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4419 return;
4291 4420
4292 if (len) 4421 if (pty->pty < 0)
4422 return;
4423
4424 if (v_buflen == 0)
4425 {
4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4427
4428 if ((unsigned int)written == len)
4429 return;
4430
4431 data += written;
4432 len -= written;
4293 { 4433 }
4434
4435 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4436
4437 memcpy (v_buffer + v_buflen, data, len);
4438 v_buflen += len;
4439
4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4441}
4442
4443void rxvt_term::pty_write ()
4444{
4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4446
4447 if (written > 0)
4448 {
4449 v_buflen -= written;
4450
4294 if (v_buflen == 0) 4451 if (v_buflen == 0)
4295 { 4452 {
4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298 if ((unsigned int)written == len)
4299 return;
4300
4301 data += written;
4302 len -= written;
4303 }
4304
4305
4306 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308 memcpy (v_buffer + v_buflen, data, len);
4309 v_buflen += len;
4310 }
4311
4312 for (;;)
4313 {
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4320 if (v_buflen == 0)
4321 {
4322 free (v_buffer); 4453 free (v_buffer);
4323 v_buffer = 0; 4454 v_buffer = 0;
4324 v_buflen = 0; 4455 v_buflen = 0;
4325 4456
4326 pty_ev.set (EVENT_READ); 4457 pty_ev.set (EVENT_READ);
4327 return;
4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4335 else
4336 {
4337 pty_ev.set (EVENT_READ | EVENT_WRITE);
4338 return; 4458 return;
4339 } 4459 }
4460
4461 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4462 }
4463 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4464 pty_ev.set (EVENT_READ);
4341} 4465}
4342 4466
4343/*----------------------- end-of-file (C source) -----------------------*/ 4467/*----------------------- end-of-file (C source) -----------------------*/
4344 4468

Diff Legend

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