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.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.264 by root, Mon Jan 16 06:37:51 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 MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
881unsigned int 927unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 929{
884 unsigned int n, s; 930 unsigned int n, s;
885 931
886 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 952
907 cmd_parse (); 953 cmd_parse ();
908 954
909 return 0; 955 return 0;
910} 956}
911#endif /* MENUBAR_MAX */ 957#endif
912 958
913void 959void
914rxvt_term::flush () 960rxvt_term::flush ()
915{ 961{
916 flush_ev.stop (); 962 flush_ev.stop ();
… …
924 } 970 }
925#endif 971#endif
926 972
927 if (want_refresh) 973 if (want_refresh)
928 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = view_start;
978 int end_row = row + nrow;
979
980 while (row > top_row && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
929 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
930 scrollbar_show (1); 1014 scrollbar_show (1);
931#ifdef USE_XIM 1015#ifdef USE_XIM
932 IMSendSpot (); 1016 IMSendSpot ();
933#endif 1017#endif
… …
937} 1021}
938 1022
939void 1023void
940rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
941{ 1025{
942 SET_R (this); 1026 make_current ();
943 SET_LOCALE (locale);
944 1027
945 display->flush (); 1028 display->flush ();
946 1029
947 if (want_refresh && !flush_ev.active) 1030 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 1032}
950 1033
951void 1034void
952rxvt_term::flush_cb (time_watcher &w) 1035rxvt_term::flush_cb (time_watcher &w)
953{ 1036{
954 SET_R (this); 1037 make_current ();
955 SET_LOCALE (locale);
956 1038
957 refresh_limit = 1; 1039 refresh_limit = 1;
958 refresh_count = 0; 1040 refresh_count = 0;
959 flush (); 1041 flush ();
960} 1042}
… …
1017{ 1099{
1018 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1103 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1022 refresh_type |= SMOOTH_REFRESH; 1107 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1108 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1110 }
1026} 1111}
1027#endif 1112#endif
1028 1113
1114#if HAVE_SCHED_YIELD
1115static struct event_handler
1116{
1117 check_watcher cw_yield;
1118
1119 void yield (check_watcher &w)
1120 {
1121 sched_yield ();
1122 w.stop ();
1123 }
1124
1125 event_handler ()
1126 : cw_yield (this, &event_handler::yield)
1127 {
1128 }
1129} event_handler;
1130#endif
1131
1029bool 1132bool
1030rxvt_term::pty_fill () 1133rxvt_term::pty_fill ()
1031{ 1134{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1136
1034 if (CBUFSIZ == n) 1137 if (CBUFSIZ == n)
1035 { 1138 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1140 n = 0;
1038 } 1141 }
1039 1142
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1144 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1145 cmdbuf_endp = cmdbuf_ptr + n;
1043 1146
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1045 1148
1046 if (n > 0) 1149 if (r > 0)
1047 { 1150 {
1048 cmdbuf_endp += n; 1151 cmdbuf_endp += r;
1049 return true; 1152 return true;
1050 } 1153 }
1051 else if (n < 0 && errno != EAGAIN) 1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 {
1156#if HAVE_SCHED_YIELD
1157 if (display->is_local)
1158 event_handler.cw_yield.start ();
1159#endif
1160 }
1161 else
1162 {
1163 pty_ev.stop ();
1164
1165 if (!OPTION (Opt_hold))
1052 destroy (); 1166 destroy ();
1167 }
1053 1168
1054 return false; 1169 return false;
1055} 1170}
1056 1171
1057void 1172void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1174{
1060 SET_R (this); 1175 make_current ();
1061 SET_LOCALE (locale);
1062 1176
1063 if (revents & EVENT_READ) 1177 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us 1178 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ()) 1179 while (pty_fill ())
1066 if (cmd_parse ()) 1180 if (cmd_parse ())
… …
1071} 1185}
1072 1186
1073void 1187void
1074rxvt_term::pointer_unblank () 1188rxvt_term::pointer_unblank ()
1075{ 1189{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1190 XDefineCursor (display->display, vt, TermWin_cursor);
1077 recolour_cursor (); 1191 recolour_cursor ();
1078 1192
1079#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1194 hidden_pointer = 0;
1081 1195
1082 if (options & Opt_pointerBlank) 1196 if (OPTION (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1197 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif 1198#endif
1085} 1199}
1086 1200
1087#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
1088void 1202void
1089rxvt_term::pointer_blank () 1203rxvt_term::pointer_blank ()
1090{ 1204{
1091 if (! (options & Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
1092 return; 1206 return;
1093 1207
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
1095 XFlush (display->display); 1209 XFlush (display->display);
1096 1210
1097 hidden_pointer = 1; 1211 hidden_pointer = 1;
1098} 1212}
1099 1213
1100void 1214void
1101rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1102{ 1216{
1103 SET_R (this); 1217 make_current ();
1104 SET_LOCALE (locale);
1105 1218
1106 pointer_blank (); 1219 pointer_blank ();
1107} 1220}
1108#endif 1221#endif
1109 1222
… …
1188 1301
1189/*{{{ process an X event */ 1302/*{{{ process an X event */
1190void 1303void
1191rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1192{ 1305{
1193 SET_R (this); 1306 make_current ();
1194 SET_LOCALE (locale);
1195 1307
1196#if defined(CURSOR_BLINK) 1308 dDisp;
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1198 {
1199 if (hidden_cursor)
1200 {
1201 hidden_cursor = 0;
1202 want_refresh = 1;
1203 }
1204 1309
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1310 if (ev.xany.window == vt
1206 } 1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1207#endif 1312 return;
1208 1313
1209#if defined(POINTER_BLANK) 1314 // for XQueryPointer
1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1211 {
1212 if (ev.type == MotionNotify
1213 || ev.type == ButtonPress
1214 || ev.type == ButtonRelease)
1215 if (hidden_pointer)
1216 pointer_unblank ();
1217
1218 if (ev.type == KeyPress && hidden_pointer == 0)
1219 pointer_blank ();
1220 }
1221#endif
1222
1223 Window unused_root, unused_child; 1315 Window unused_root, unused_child;
1224 int unused_root_x, unused_root_y; 1316 int unused_root_x, unused_root_y;
1225 unsigned int unused_mask; 1317 unsigned int unused_mask;
1226 1318
1227 switch (ev.type) 1319 switch (ev.type)
… …
1234 1326
1235 break; 1327 break;
1236 1328
1237 case KeyRelease: 1329 case KeyRelease:
1238 { 1330 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1240 KeySym ks; 1332 KeySym keysym;
1241 1333
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif 1335#endif
1244 1336
1245#if ENABLE_FRILLS || ISO_14755 1337#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support 1338 // ISO 14755 support
1247 if (iso14755buf) 1339 if (iso14755buf)
… …
1252# endif 1344# endif
1253# if ISO_14755 1345# if ISO_14755
1254 // iso14755 part 5.2 handling: release time 1346 // iso14755 part 5.2 handling: release time
1255 // first: controls 1347 // first: controls
1256 if ((ev.xkey.state & ControlMask) 1348 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f) 1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f))) 1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1259 { 1351 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1261 commit_iso14755 (); 1353 commit_iso14755 ();
1262 return; // case-break; 1354 goto skip_switch;
1263 } 1355 }
1264 1356
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks) 1358 if (i[0] == keysym)
1267 { 1359 {
1268 iso14755buf = ISO_14755_51 | i[1]; 1360 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 (); 1361 commit_iso14755 ();
1270 return; // case-break; 1362 goto skip_switch;
1271 } 1363 }
1272 1364
1273 scr_bell (); 1365 scr_bell ();
1274# endif 1366# endif
1275 iso14755buf = 0; 1367 iso14755buf = 0;
… …
1294 else 1386 else
1295 iso14755buf = 0; 1387 iso14755buf = 0;
1296 } 1388 }
1297#endif 1389#endif
1298 1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393 break;
1394
1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1300 if (!(ev.xkey.state & ControlMask)) 1396 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop (); 1397 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R) 1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1303 mouse_slip_wheel_speed = 0; 1399 mouse_slip_wheel_speed = 0;
1304#endif 1400#endif
1305 break; 1401 break;
1306 } 1402 }
1307 1403
… …
1313 button_release (ev.xbutton); 1409 button_release (ev.xbutton);
1314 break; 1410 break;
1315 1411
1316 case ClientMessage: 1412 case ClientMessage:
1317 if (ev.xclient.format == 32 1413 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1415 {
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319 destroy (); 1417 destroy ();
1418#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev);
1423#endif
1424 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1320#ifdef OFFIX_DND 1434#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */ 1435 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile 1437 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir 1438 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink)) 1439 || ev.xclient.data.l[0] == DndLink))
1326 { 1440 {
1327 /* Get Dnd data */ 1441 /* Get Dnd data */
1328 Atom ActualType; 1442 Atom ActualType;
1329 int ActualFormat; 1443 int ActualFormat;
1330 unsigned char *data; 1444 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1445 unsigned long Size, RemainingBytes;
1332 1446
1333 XGetWindowProperty (display->display, display->root, 1447 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1448 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1449 0L, 1000000L,
1336 False, AnyPropertyType, 1450 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1451 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1452 &Size, &RemainingBytes,
1339 &data); 1453 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1454 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1455 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1458 }
1345#endif /* OFFIX_DND */ 1459#endif /* OFFIX_DND */
1346 break; 1460 break;
1347 1461
1348 case MappingNotify: 1462 case MappingNotify:
… …
1373 break; 1487 break;
1374 } 1488 }
1375 break; 1489 break;
1376 1490
1377 case FocusIn: 1491 case FocusIn:
1378 if (!TermWin.focus) 1492 focus_in ();
1493 break;
1494
1495 case FocusOut:
1496 focus_out ();
1497 break;
1498
1499 case ConfigureNotify:
1500 if (ev.xconfigure.window == parent[0])
1379 { 1501 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1503 ;
1447 1504
1448 if (szHint.width != width || szHint.height != height) 1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1506 {
1450 seen_resize = 1; 1507 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1509 }
1453 1510
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1512 if (OPTION (Opt_transparent))
1456 check_our_parents (); 1513 check_our_parents ();
1457#endif 1514#endif
1458 } 1515 }
1459 break; 1516 break;
1460 1517
… …
1476 1533
1477 case SelectionRequest: 1534 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1535 selection_send (ev.xselectionrequest);
1479 break; 1536 break;
1480 1537
1538 case MapNotify:
1539 mapped = 1;
1540#ifdef TEXT_BLINK
1541 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1542#endif
1543 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 break;
1545
1481 case UnmapNotify: 1546 case UnmapNotify:
1482 TermWin.mapped = 0; 1547 mapped = 0;
1483#ifdef TEXT_BLINK 1548#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1549 text_blink_ev.stop ();
1485#endif 1550#endif
1486 break; 1551 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1487
1488 case MapNotify:
1489 TermWin.mapped = 1;
1490#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif
1493 break; 1552 break;
1494 1553
1495#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1496 case ReparentNotify: 1555 case ReparentNotify:
1497 rootwin_cb (ev); 1556 rootwin_cb (ev);
1498 break; 1557 break;
1499#endif /* TRANSPARENT */ 1558#endif /* TRANSPARENT */
1500 1559
1501 case GraphicsExpose: 1560 case GraphicsExpose:
1502 case Expose: 1561 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1562 if (ev.xany.window == vt)
1504 { 1563 {
1505 do 1564 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1568
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1570
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1572 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1573 ev.xexpose.width, ev.xexpose.height, False);
1515 1574
1516 scr_refresh (refresh_type); 1575 want_refresh = 1;
1517 } 1576 }
1518 else 1577 else
1519 { 1578 {
1520 XEvent unused_event; 1579 XEvent unused_event;
1521 1580
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1582 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1584 ;
1526 1585
1527 if (isScrollbarWindow (ev.xany.window)) 1586 if (isScrollbarWindow (ev.xany.window))
1528 { 1587 {
1529 scrollBar.setIdle (); 1588 scrollBar.setIdle ();
… …
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose (); 1593 menubar_expose ();
1535#endif 1594#endif
1536 1595
1537#ifdef TRANSPARENT 1596#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1597 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1598 XClearWindow (disp, ev.xany.window);
1540#endif 1599#endif
1541 } 1600 }
1542 break; 1601 break;
1543 1602
1544 case MotionNotify: 1603 case MotionNotify:
… …
1554 } 1613 }
1555#endif 1614#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1616 break;
1558 1617
1559 if (ev.xany.window == TermWin.vt) 1618 if (ev.xany.window == vt)
1560 { 1619 {
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1623 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1625 ;
1565 1626
1566 XQueryPointer (display->display, TermWin.vt, 1627 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1628 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1629 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1630 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1631 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
… …
1583#endif 1644#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1645 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1646 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1647
1587#ifdef SELECTION_SCROLLING 1648#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1649 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1650 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1651 {
1591 int dist; 1652 int dist;
1592 1653
1593 /* don't clobber the current delay if we are 1654 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1655 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1663 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1664 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1665 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1666
1606 /* calc number of lines to scroll */ 1667 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1668 if (ev.xbutton.y < int_bwidth)
1608 { 1669 {
1609 scroll_selection_dir = UP; 1670 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1671 dist = int_bwidth - ev.xbutton.y;
1611 } 1672 }
1612 else 1673 else
1613 { 1674 {
1614 scroll_selection_dir = DN; 1675 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1676 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1677 }
1617 1678
1618 scroll_selection_lines = Pixel2Height (dist) 1679 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1680 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1681 + 1;
1621 MIN_IT (scroll_selection_lines, 1682 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1683 SELECTION_SCROLL_MAX_LINES);
1623 } 1684 }
1624 else 1685 else
1625 { 1686 {
1626 /* we are within the text window, so we 1687 /* we are within the text window, so we
… …
1635#endif 1696#endif
1636 } 1697 }
1637 } 1698 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1700 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1701 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1702 MotionNotify, &ev))
1642 ; 1703 ;
1643 1704
1644 XQueryPointer (display->display, scrollBar.win, 1705 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1706 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1707 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1708 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1709 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1711 scrollbar_size ());
1651 scr_refresh (refresh_type); 1712 want_refresh = 1;
1652 refresh_limit = 0; 1713 refresh_limit = 0;
1653 scrollbar_show (1); 1714 scrollbar_show (1);
1654 } 1715 }
1655 break; 1716 break;
1656 } 1717 }
1718
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1723 {
1724 if (hidden_cursor)
1725 {
1726 hidden_cursor = 0;
1727 want_refresh = 1;
1728 }
1729
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1731 }
1732#endif
1733
1734#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 {
1737 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease)
1740 if (hidden_pointer)
1741 pointer_unblank ();
1742
1743 if (ev.type == KeyPress && hidden_pointer == 0)
1744 pointer_blank ();
1745 }
1746#endif
1747}
1748
1749void
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 {
1762 IMSetStatusPosition ();
1763 XSetICFocus (Input_Context);
1764 }
1765#endif
1766#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_focused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1778}
1779
1780void
1781rxvt_term::focus_out ()
1782{
1783 if (focus)
1784 {
1785 focus = 0;
1786 want_refresh = 1;
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1793 iso14755buf = 0;
1794# if ENABLE_OVERLAY
1795 scr_overlay_off ();
1796# endif
1797 }
1798#endif
1799#if USE_XIM
1800 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context);
1802#endif
1803#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink))
1805 cursor_blink_ev.stop ();
1806 hidden_cursor = 0;
1807#endif
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1810 {
1811 pix_colors = pix_colors_unfocused;
1812 scr_recolour ();
1813 }
1814#endif
1815 }
1657} 1816}
1658 1817
1659#if TRANSPARENT 1818#if TRANSPARENT
1660void 1819void
1661rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1821{
1663 SET_R (this); 1822 make_current ();
1664 SET_LOCALE (locale);
1665 1823
1666 switch (ev.type) 1824 switch (ev.type)
1667 { 1825 {
1668 case PropertyNotify: 1826 case PropertyNotify:
1669 /* 1827 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1828 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1829 * use the property to determine the pixmap. We use it later on.
1672 */ 1830 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1831 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1832 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1833 return;
1678 1834
1679 /* FALLTHROUGH */ 1835 /* FALLTHROUGH */
1680 case ReparentNotify: 1836 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1682 want_refresh = want_full_refresh = 1; 1838 want_refresh = want_full_refresh = 1;
1683 break; 1839 break;
1684 } 1840 }
1685} 1841}
1686#endif 1842#endif
… …
1689rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
1690{ 1846{
1691 int reportmode = 0, clickintime; 1847 int reportmode = 0, clickintime;
1692 1848
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1849 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1850
1694 if (!bypass_keystate) 1851 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1852 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1853
1697 /* 1854 /*
1698 * VT window processing of button press 1855 * VT window processing of button press
1699 */ 1856 */
1700 if (ev.window == TermWin.vt) 1857 if (ev.window == vt)
1701 { 1858 {
1702#if ISO_14755 1859#if ISO_14755
1703 // 5.4 1860 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1862 {
… …
1718#ifdef MOUSE_REPORT_DOUBLECLICK 1875#ifdef MOUSE_REPORT_DOUBLECLICK
1719 if (ev.button == MEvent.button && clickintime) 1876 if (ev.button == MEvent.button && clickintime)
1720 { 1877 {
1721 /* same button, within alloted time */ 1878 /* same button, within alloted time */
1722 MEvent.clicks++; 1879 MEvent.clicks++;
1880
1723 if (MEvent.clicks > 1) 1881 if (MEvent.clicks > 1)
1724 { 1882 {
1725 /* only report double clicks */ 1883 /* only report double clicks */
1726 MEvent.clicks = 2; 1884 MEvent.clicks = 2;
1727 mouse_report (ev); 1885 mouse_report (ev);
… …
1747 else 1905 else
1748 { 1906 {
1749 if (ev.button != MEvent.button) 1907 if (ev.button != MEvent.button)
1750 MEvent.clicks = 0; 1908 MEvent.clicks = 0;
1751 1909
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1752 switch (ev.button) 1911 switch (ev.button)
1753 { 1912 {
1754 case Button1: 1913 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1914 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1915 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1916#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1917 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1918#else
1760 selection.rect = false; 1919 selection.rect = false;
1761#endif 1920#endif
1762 1921
1763 /* allow shift+left click to extend selection */ 1922 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1765 { 1924 {
1766 if (MEvent.button == Button1 && clickintime) 1925 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1926 selection_rotate (ev.x, ev.y);
1768 else 1927 else
1769 selection_extend (ev.x, ev.y, 1); 1928 selection_extend (ev.x, ev.y, 1);
1770 } 1929 }
1771 else 1930 else
1772 { 1931 {
1773 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1774 MEvent.clicks++; 1933 MEvent.clicks++;
1775 else 1934 else
1776 MEvent.clicks = 1; 1935 MEvent.clicks = 1;
1777 1936
1778 selection_click (MEvent.clicks, ev.x, ev.y); 1937 selection_click (MEvent.clicks, ev.x, ev.y);
1779 } 1938 }
1780 1939
1781 MEvent.button = Button1; 1940 MEvent.button = Button1;
1782 break; 1941 break;
1783 1942
1784 case Button3: 1943 case Button3:
1785 if (MEvent.button == Button3 && clickintime) 1944 if (MEvent.button == Button3 && clickintime)
1786 selection_rotate (ev.x, ev.y); 1945 selection_rotate (ev.x, ev.y);
1787 else 1946 else
1788 selection_extend (ev.x, ev.y, 1); 1947 selection_extend (ev.x, ev.y, 1);
1789 1948
1790 MEvent.button = Button3; 1949 MEvent.button = Button3;
1791 break; 1950 break;
1792 } 1951 }
1793 } 1952 }
1794 1953
1795 MEvent.time = ev.time; 1954 MEvent.time = ev.time;
1796 return; 1955 return;
1797 } 1956 }
1798 1957
… …
1910 case Button3: 2069 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
1912 { 2071 {
1913 if (scrollbar_above_slider (ev.y)) 2072 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2074 scr_page (UP, nrow - 1);
1916# else 2075# else
1917 scr_page (UP, TermWin.nrow / 4); 2076 scr_page (UP, nrow / 4);
1918# endif 2077# endif
1919 else if (scrollbar_below_slider (ev.y)) 2078 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2080 scr_page (DN, nrow - 1);
1922# else 2081# else
1923 scr_page (DN, TermWin.nrow / 4); 2082 scr_page (DN, nrow / 4);
1924# endif 2083# endif
1925 else 2084 else
1926 scrollBar.setMotion (); 2085 scrollBar.setMotion ();
1927 } 2086 }
1928 else 2087 else
1929 { 2088 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2090 (nrow
1932 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2092 / scrollbar_size ()));
1934 } 2093 }
1935 2094
1936 break; 2095 break;
1937 } 2096 }
1938 } 2097 }
2098
1939 return; 2099 return;
1940 } 2100 }
2101
1941#if MENUBAR 2102#if MENUBAR
1942 /* 2103 /*
1943 * Menubar window processing of button press 2104 * Menubar window processing of button press
1944 */ 2105 */
1945 if (isMenuBarWindow (ev.window)) 2106 if (isMenuBarWindow (ev.window))
… …
1968#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2130 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
1971#endif 2132#endif
1972 2133
1973 if (ev.window == TermWin.vt) 2134 if (ev.window == vt)
1974 { 2135 {
1975#if ISO_14755 2136#if ISO_14755
1976 // 5.4 2137 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2139 return;
… …
2008 if (priv_modes & PrivMode_mouse_report 2169 if (priv_modes & PrivMode_mouse_report
2009 && bypass_keystate 2170 && bypass_keystate
2010 && ev.button == Button1 && MEvent.clicks <= 1) 2171 && ev.button == Button1 && MEvent.clicks <= 1)
2011 selection_extend (ev.x, ev.y, 0); 2172 selection_extend (ev.x, ev.y, 0);
2012 2173
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2013 switch (ev.button) 2177 switch (ev.button)
2014 { 2178 {
2015 case Button1: 2179 case Button1:
2016 case Button3: 2180 case Button3:
2017 selection_make (ev.time); 2181 selection_make (ev.time);
… …
2028 2192
2029 v = ev.button == Button4 ? UP : DN; 2193 v = ev.button == Button4 ? UP : DN;
2030 2194
2031 if (ev.state & ShiftMask) 2195 if (ev.state & ShiftMask)
2032 i = 1; 2196 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2197 else if (OPTION (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2198 i = nrow - 1;
2035 else 2199 else
2036 i = 5; 2200 i = 5;
2037 2201
2038# ifdef MOUSE_SLIP_WHEELING 2202# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2203 if (ev.state & ControlMask)
2040 { 2204 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2205 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2206 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2207 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2044 2208
2045 if (slip_wheel_ev.at < NOW) 2209 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2210 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2211
2048 slip_wheel_ev.start (); 2212 slip_wheel_ev.start ();
2049 } 2213 }
2050 else 2214 else
2051 { 2215 {
2052# endif 2216# endif
2053# ifdef JUMP_MOUSE_WHEEL
2054 scr_page (v, i); 2217 scr_page (v, i);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1); 2218 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING 2219# ifdef MOUSE_SLIP_WHEELING
2066 } 2220 }
2067#endif 2221# endif
2068 } 2222 }
2069 break; 2223 break;
2070#endif 2224#endif
2071 } 2225 }
2072 } 2226 }
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2246 int i;
2093 2247
2094 Visual* visual = display->visual; 2248 Visual *visual = display->visual;
2095 2249
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2251
2098 /* for convenience */ 2252 /* for convenience */
2099 mask_r = visual->red_mask; 2253 mask_r = visual->red_mask;
… …
2320 Atom atype; 2474 Atom atype;
2321 unsigned char *prop = NULL; 2475 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2476 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2477 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2478 XWindowAttributes wattr, wrootattr;
2479 dDisp;
2325 2480
2326 pchanged = 0; 2481 pchanged = 0;
2327 2482
2328 if (!(options & Opt_transparent)) 2483 if (!OPTION (Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2484 return pchanged; /* Don't try any more */
2330 2485
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2486 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2487 rootdepth = wrootattr.depth;
2333 2488
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2489 XGetWindowAttributes (disp, parent[0], &wattr);
2335 2490
2336 if (rootdepth != wattr.depth) 2491 if (rootdepth != wattr.depth)
2337 { 2492 {
2338 if (am_transparent) 2493 if (am_transparent)
2339 { 2494 {
2340 pchanged = 1; 2495 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2497 am_transparent = am_pixmap_trans = 0;
2343 } 2498 }
2344 2499
2345 return pchanged; /* Don't try any more */ 2500 return pchanged; /* Don't try any more */
2346 } 2501 }
2347 2502
2348 /* Get all X ops out of the queue so that our information is up-to-date. */ 2503 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False); 2504 XSync (disp, False);
2350 2505
2351 /* 2506 /*
2352 * Make the frame window set by the window manager have 2507 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2508 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2509 * windows for each client, so we have to take care about that.
2355 */ 2510 */
2356 i = (xa[XA_XROOTPMAPID] 2511 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2514 &nitems, &bytes_after, &prop) == Success);
2360 2515
2361 if (!i || prop == NULL) 2516 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2517 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2520 &nitems, &bytes_after, &prop) == Success);
2366 2521
2367 if (!i || prop == NULL 2522 if (!i || prop == NULL
2368#if TINTING 2523#if TINTING
… …
2387 Window cr; 2542 Window cr;
2388 XImage *image; 2543 XImage *image;
2389 GC gc; 2544 GC gc;
2390 XGCValues gcvalue; 2545 XGCValues gcvalue;
2391 2546
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2547 XTranslateCoordinates (disp, parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2548 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2549 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2550 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2551 nx = ny = 0;
2397 2552
… …
2407 nh += sy; 2562 nh += sy;
2408 ny = -sy; 2563 ny = -sy;
2409 sy = 0; 2564 sy = 0;
2410 } 2565 }
2411 2566
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2567 min_it (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2568 min_it (nh, (unsigned int) (wrootattr.height - sy));
2414 2569
2415 XSync (display->display, False); 2570 XSync (disp, False);
2416 allowedxerror = -1; 2571 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2573
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2575 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2576 allowedxerror = 0;
2422 2577
2423 if (image == NULL) 2578 if (image == NULL)
2424 { 2579 {
2425 if (am_transparent && am_pixmap_trans) 2580 if (am_transparent && am_pixmap_trans)
2426 { 2581 {
2427 pchanged = 1; 2582 pchanged = 1;
2428 if (TermWin.pixmap != None) 2583 if (pixmap != None)
2429 { 2584 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2585 XFreePixmap (disp, pixmap);
2431 TermWin.pixmap = None; 2586 pixmap = None;
2432 } 2587 }
2433 } 2588 }
2434 2589
2435 am_pixmap_trans = 0; 2590 am_pixmap_trans = 0;
2436 } 2591 }
2437 else 2592 else
2438 { 2593 {
2439 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2595 XFreePixmap (disp, pixmap);
2441 2596
2442#if TINTING 2597#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2598 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2599 {
2445 unsigned short rm, gm, bm; 2600 unsigned short rm, gm, bm;
… …
2449 2604
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2605 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2606 }
2452#endif 2607#endif
2453 2608
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2609 pixmap = XCreatePixmap (disp, vt,
2455 szHint.width, szHint.height, image->depth); 2610 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2612 XPutImage (disp, pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2613 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2614 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2615 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2617 XClearWindow (disp, parent[0]);
2463 2618
2464 if (!am_transparent || !am_pixmap_trans) 2619 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2620 pchanged = 1;
2466 2621
2467 am_transparent = am_pixmap_trans = 1; 2622 am_transparent = am_pixmap_trans = 1;
2468 } 2623 }
2469 } 2624 }
2470 2625
2471 if (am_pixmap_trans) 2626 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2473 else 2628 else
2474 { 2629 {
2475 unsigned int n; 2630 unsigned int n;
2476 /* 2631 /*
2477 * InheritPixmap transparency 2632 * InheritPixmap transparency
2478 */ 2633 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2480 { 2635 {
2481 oldp = TermWin.parent[i]; 2636 oldp = parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2637 XQueryTree (disp, parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2638 &parent[i], &list, &n);
2484 XFree (list); 2639 XFree (list);
2485 2640
2486 if (TermWin.parent[i] == display->root) 2641 if (parent[i] == display->root)
2487 { 2642 {
2488 if (oldp != None) 2643 if (oldp != None)
2489 pchanged = 1; 2644 pchanged = 1;
2490 2645
2491 break; 2646 break;
2492 } 2647 }
2493 2648
2494 if (oldp != TermWin.parent[i]) 2649 if (oldp != parent[i])
2495 pchanged = 1; 2650 pchanged = 1;
2496 } 2651 }
2497 2652
2498 n = 0; 2653 n = 0;
2499 2654
2500 if (pchanged) 2655 if (pchanged)
2501 { 2656 {
2502 for (; n < (unsigned int)i; n++) 2657 for (; n < (unsigned int)i; n++)
2503 { 2658 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2659 XGetWindowAttributes (disp, parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2661 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2508 break; 2663 break;
2509 } 2664 }
2510 } 2665 }
2511 } 2666 }
2512 2667
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2668 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2514 { 2669 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2672 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2673 /* XXX: also turn off Opt_transparent? */
2519 } 2674 }
2520 else 2675 else
2521 { 2676 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2679 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2680 sleep (1);
2526#endif 2681#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2682 for (n = 0; n < (unsigned int)i; n++)
2528 { 2683 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2685 XClearWindow (disp, parent[n]);
2531 } 2686 }
2532 2687
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2534 am_transparent = 1; 2689 am_transparent = 1;
2535 } 2690 }
2536 2691
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2693 parent[i] = None;
2539 } 2694 }
2540 2695
2541 if (scrollBar.win) 2696 if (scrollBar.win)
2542 { 2697 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2699 scrollBar.setIdle ();
2545 scrollbar_show (0); 2700 scrollbar_show (0);
2546 } 2701 }
2547 2702
2548 if (am_transparent) 2703 if (am_transparent)
… …
2560 2715
2561bool 2716bool
2562rxvt_term::cmd_parse () 2717rxvt_term::cmd_parse ()
2563{ 2718{
2564 bool flag = false; 2719 bool flag = false;
2565 unicode_t ch = NOCHAR; 2720 wchar_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2721 char *seq_begin; // remember start of esc-sequence here
2567 2722
2568 for (;;) 2723 for (;;)
2569 { 2724 {
2570 if (ch == NOCHAR) 2725 if (ch == NOCHAR)
2571 { 2726 {
2572 seq_begin = cmdbuf_ptr; 2727 seq_begin = cmdbuf_ptr;
2573 ch = next_char (); 2728 ch = next_char ();
2574 }
2575 2729
2576 if (ch == NOCHAR) // TODO: improve 2730 if (ch == NOCHAR)
2577 break; 2731 break;
2732 }
2578 2733
2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2734 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 { 2735 {
2581 if (!seen_input) 2736 if (!seen_input)
2582 { 2737 {
… …
2586 // some window managers resize the window early, and these programs 2741 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2742 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2743 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2744 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2745 // resized.
2591 if (seen_resize) 2746 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2747 kill (-cmd_pid, SIGWINCH);
2593 } 2748 }
2594 2749
2595 /* Read a text string from the input buffer */ 2750 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2751 wchar_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2752 bool refreshnow = false;
2598 int nlines = 0; 2753 int nlines = 0;
2599 unicode_t *str = buf; 2754 wchar_t *str = buf;
2755 wchar_t *eol = str + min (ncol, UBUFSIZ);
2600 2756
2601 for (;;) 2757 for (;;)
2602 { 2758 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2759 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break; 2760 break;
2605 2761
2606 *str++ = ch; 2762 *str++ = ch;
2607 2763
2608 if (ch == C0_LF) 2764 if (ch == C0_LF || str >= eol)
2609 { 2765 {
2766 if (ch == C0_LF)
2610 nlines++; 2767 nlines++;
2768
2611 refresh_count++; 2769 refresh_count++;
2612 2770
2613 if (!(options & Opt_jumpScroll) 2771 if (!OPTION (Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2772 || (refresh_count >= refresh_limit * (nrow - 1)))
2615 { 2773 {
2616 refreshnow = true; 2774 refreshnow = true;
2775 refresh_count = 0;
2617 ch = NOCHAR; 2776 ch = NOCHAR;
2618 break; 2777 break;
2619 } 2778 }
2620 2779
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2780 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2781 if (nlines >= nrow - 1)
2623 { 2782 {
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2624 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2785
2625 nlines = 0; 2786 nlines = 0;
2626 str = buf; 2787 str = buf;
2788 eol = str + min (ncol, UBUFSIZ);
2627 } 2789 }
2628 }
2629 2790
2630 if (str >= buf + UBUFSIZ) 2791 if (str >= eol)
2631 { 2792 {
2793 if (eol >= buf + UBUFSIZ)
2794 {
2632 ch = NOCHAR; 2795 ch = NOCHAR;
2633 break; 2796 break;
2797 }
2798 else
2799 eol = min (eol + ncol, buf + UBUFSIZ);
2800 }
2801
2634 } 2802 }
2635 2803
2636 seq_begin = cmdbuf_ptr; 2804 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2805 ch = next_char ();
2638 } 2806 }
2639 2807
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2640 scr_add_lines (buf, nlines, str - buf); 2809 scr_add_lines (buf, str - buf, nlines);
2641 2810
2642 /* 2811 /*
2643 * If there have been a lot of new lines, then update the screen 2812 * If there have been a lot of new lines, then update the screen
2644 * What the heck I'll cheat and only refresh less than every page-full. 2813 * What the heck I'll cheat and only refresh less than every page-full.
2645 * the number of pages between refreshes is refresh_limit, which 2814 * the number of pages between refreshes is refresh_limit, which
2646 * is incremented here because we must be doing flat-out scrolling. 2815 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2816 */
2648 if (refreshnow) 2817 if (refreshnow)
2649 { 2818 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++; 2820 refresh_limit++;
2652 else 2821 else
2653 { 2822 {
2654 flag = true; 2823 flag = true;
2655 scr_refresh (refresh_type); 2824 scr_refresh (refresh_type);
2825 want_refresh = 1;
2656 } 2826 }
2657 } 2827 }
2658 2828
2659 } 2829 }
2660 else 2830 else
… …
2675 } 2845 }
2676 2846
2677 return flag; 2847 return flag;
2678} 2848}
2679 2849
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2689// read the next character 2850// read the next character
2690unicode_t 2851wchar_t
2691rxvt_term::next_char () 2852rxvt_term::next_char ()
2692{ 2853{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2854 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2855 {
2695 // assume 7-bit to be ascii ALWAYS 2856 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++; 2858 return *cmdbuf_ptr++;
2698 2859
2699 wchar_t wc; 2860 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2861 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701 2862
2702 if (len == (size_t)-2) 2863 if (len == (size_t)-2)
2703 { 2864 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2865 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2866 cmdbuf_ptr = cmdbuf_endp;
2706 break; 2867 break;
2707 } 2868 }
2708 2869
2709 if (len == (size_t)-1) 2870 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2871 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2872
2712 // assume wchar == unicode 2873 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2874 cmdbuf_ptr += len;
2714 return wc; 2875 return wc & UNICODE_MASK;
2715 } 2876 }
2716 2877
2717 return NOCHAR; 2878 return NOCHAR;
2879}
2880
2881// read the next octet
2882uint32_t
2883rxvt_term::next_octet ()
2884{
2885 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR;
2718} 2888}
2719 2889
2720/* rxvt_cmd_getc () - Return next input character */ 2890/* rxvt_cmd_getc () - Return next input character */
2721/* 2891/*
2722 * Return the next input character after first passing any keyboard input 2892 * Return the next input character after first passing any keyboard input
2723 * to the command. 2893 * to the command.
2724 */ 2894 */
2725unicode_t 2895wchar_t
2726rxvt_term::cmd_getc () 2896rxvt_term::cmd_getc ()
2727{ 2897{
2728 unicode_t c = next_char (); 2898 wchar_t c = next_char ();
2729 2899
2730 if (c == NOCHAR) 2900 if (c == NOCHAR)
2731 throw out_of_input; 2901 throw out_of_input;
2732 2902
2733 return c; 2903 return c;
2734} 2904}
2735 2905
2736unicode_t 2906uint32_t
2737rxvt_term::cmd_get8 () 2907rxvt_term::cmd_get8 ()
2738{ 2908{
2739 unicode_t c = next_octet (); 2909 uint32_t c = next_octet ();
2740 2910
2741 if (c == NOCHAR) 2911 if (c == NOCHAR)
2742 throw out_of_input; 2912 throw out_of_input;
2743 2913
2744 return c; 2914 return c;
… …
2844 case C0_ESC: 3014 case C0_ESC:
2845 process_escape_seq (); 3015 process_escape_seq ();
2846 break; 3016 break;
2847 case C0_ENQ: /* terminal Status */ 3017 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 3018 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3019 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 3020 else
2852 tt_write ((unsigned char *)VT100_ANS, 3021 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 3022 break;
2855 case C0_BEL: /* bell */ 3023 case C0_BEL: /* bell */
2856 scr_bell (); 3024 scr_bell ();
2857 break; 3025 break;
2858 case C0_BS: /* backspace */ 3026 case C0_BS: /* backspace */
… …
3013 break; 3181 break;
3014 3182
3015 /* 8.3.87: NEXT LINE */ 3183 /* 8.3.87: NEXT LINE */
3016 case C1_NEL: /* ESC E */ 3184 case C1_NEL: /* ESC E */
3017 { 3185 {
3018 unicode_t nlcr[] = { C0_LF, C0_CR }; 3186 wchar_t nlcr[] = { C0_LF, C0_CR };
3019 scr_add_lines (nlcr, 1, 2); 3187 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3020 } 3188 }
3021 break; 3189 break;
3022 3190
3023 /* kidnapped escape sequence: Should be 8.3.48 */ 3191 /* kidnapped escape sequence: Should be 8.3.48 */
3024 case C1_ESA: /* ESC G */ 3192 case C1_ESA: /* ESC G */
… …
3046 process_dcs_seq (); 3214 process_dcs_seq ();
3047 break; 3215 break;
3048 3216
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3217 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 3218 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 3219 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 3220 break; /* steal obsolete ESC [ c */
3054 3221
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3222 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3056 case C1_CSI: /* ESC [ */ 3223 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 3224 process_csi_seq ();
… …
3182 { 3349 {
3183 switch (priv) 3350 switch (priv)
3184 { 3351 {
3185 case '>': 3352 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3353 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3354 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3355 break;
3189 case '?': 3356 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3358 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3359 break;
… …
3297 3464
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3465 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 3466 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 3467 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3468 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3469 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 3470 break;
3304 3471
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3472 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 3473 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 3474 break;
3309 3475
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3476 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 3477 process_sgr_mode (nargs, arg);
3312 break; 3478 break;
… …
3319 break; 3485 break;
3320 case 6: /* CPR requested */ 3486 case 6: /* CPR requested */
3321 scr_report_position (); 3487 scr_report_position ();
3322 break; 3488 break;
3323 case 7: /* unofficial extension */ 3489 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 3490 if (OPTION (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3491 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 3492 break;
3327 case 8: /* unofficial extension */ 3493 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3494 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 3495 break;
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3587rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3588{
3423 int x, y; 3589 int x, y;
3424 XWindowAttributes wattr; 3590 XWindowAttributes wattr;
3425 Window wdummy; 3591 Window wdummy;
3592 dDisp;
3426 3593
3427 if (nargs == 0) 3594 if (nargs == 0)
3428 return; 3595 return;
3429 3596
3430 switch (args[0]) 3597 switch (args[0])
3431 { 3598 {
3432 /* 3599 /*
3433 * commands 3600 * commands
3434 */ 3601 */
3435 case 1: /* deiconify window */ 3602 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3603 XMapWindow (disp, parent[0]);
3437 break; 3604 break;
3438 case 2: /* iconify window */ 3605 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3606 XIconifyWindow (disp, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3607 break;
3442 case 3: /* set position (pixels) */ 3608 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3609 XMoveWindow (disp, parent[0], args[1], args[2]);
3444 break; 3610 break;
3445 case 4: /* set size (pixels) */ 3611 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3613 break;
3448 case 5: /* raise window */ 3614 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3615 XRaiseWindow (disp, parent[0]);
3450 break; 3616 break;
3451 case 6: /* lower window */ 3617 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3618 XLowerWindow (disp, parent[0]);
3453 break; 3619 break;
3454 case 7: /* refresh window */ 3620 case 7: /* refresh window */
3455 scr_touch (true); 3621 scr_touch (true);
3456 break; 3622 break;
3457 case 8: /* set size (chars) */ 3623 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3624 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3625 (unsigned int) (args[1] * fheight));
3460 break; 3626 break;
3461 3627
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3628 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3629 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3630 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3631 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3632 (unsigned int) (args[1] * fheight));
3467 break; 3633 break;
3468 3634
3469 3635
3470 /* 3636 /*
3471 * reports - some output format copied from XTerm 3637 * reports - some output format copied from XTerm
3472 */ 3638 */
3473 case 11: /* report window state */ 3639 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3640 XGetWindowAttributes (disp, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3642 break;
3477 case 13: /* report window position */ 3643 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3644 XGetWindowAttributes (disp, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3645 XTranslateCoordinates (disp, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3646 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3647 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3648 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3649 break;
3484 case 14: /* report window size (pixels) */ 3650 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3653 break;
3488 case 18: /* report text area size (chars) */ 3654 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3655 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3656 break;
3491 case 19: /* report window size (chars) */ 3657 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3658 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3659 break;
3494 case 20: /* report icon label */ 3660 case 20: /* report icon label */
3495 { 3661 {
3496 char *s; 3662 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3663 XGetIconName (disp, parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3664 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3665 XFree (s);
3500 } 3666 }
3501 break; 3667 break;
3502 case 21: /* report window title */ 3668 case 21: /* report window title */
3503 { 3669 {
3504 char *s; 3670 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3671 XFetchName (disp, parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3672 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3673 XFree (s);
3508 } 3674 }
3509 break; 3675 break;
3510 } 3676 }
3511} 3677}
… …
3514/*----------------------------------------------------------------------*/ 3680/*----------------------------------------------------------------------*/
3515/* 3681/*
3516 * get input up until STRING TERMINATOR (or BEL) 3682 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3683 * ends_how is terminator used. returned input must be free()'d
3518 */ 3684 */
3519unsigned char * 3685char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3686rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3687{
3522 unicode_t ch; 3688 unicode_t ch;
3523 bool seen_esc = false; 3689 bool seen_esc = false;
3524 unsigned int n = 0; 3690 unsigned int n = 0;
… …
3543 else if (ch < 0x20) 3709 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3710 return NULL; /* other control character - exit */
3545 3711
3546 seen_esc = false; 3712 seen_esc = false;
3547 3713
3548 if (n >= sizeof (string) - 1) 3714 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3715 // stop at some sane length
3550 return NULL; 3716 return NULL;
3551 3717
3552 if (ch == C0_SYN) 3718 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 (); 3719 string[n++] = cmd_get8 ();
… …
3557 3723
3558 string[n++] = '\0'; 3724 string[n++] = '\0';
3559 3725
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3726 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3727
3562 return (unsigned char *)rxvt_wcstombs (string); 3728 return rxvt_wcstombs (string);
3563} 3729}
3564 3730
3565/*----------------------------------------------------------------------*/ 3731/*----------------------------------------------------------------------*/
3566/* 3732/*
3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3733 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3568 */ 3734 */
3569void 3735void
3570rxvt_term::process_dcs_seq () 3736rxvt_term::process_dcs_seq ()
3571{ 3737{
3572 unsigned char *s; 3738 char *s;
3573 unicode_t eh; 3739 unicode_t eh;
3574 3740
3575 /* 3741 /*
3576 * Not handled yet 3742 * Not handled yet
3577 */ 3743 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3762 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3763 arg = arg * 10 + (ch - '0');
3598 3764
3599 if (ch == ';') 3765 if (ch == ';')
3600 { 3766 {
3601 unsigned char *s = get_to_st (eh); 3767 char *s = get_to_st (eh);
3602 3768
3603 if (s) 3769 if (s)
3604 { 3770 {
3605 process_xterm_seq (arg, (char *)s, eh); 3771 process_xterm_seq (arg, s, eh);
3606 free (s); 3772 free (s);
3607 } 3773 }
3608 } 3774 }
3609} 3775}
3610 3776
3611void 3777void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3778rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3613{ 3779{
3614 if (str[0] == '?' && !str[1]) 3780 if (str[0] == '?' && !str[1])
3615 { 3781 {
3616 unsigned short r, g, b; 3782 unsigned short r, g, b;
3617 pix_colors_focused[color].get (display, r, g, b); 3783 pix_colors_focused[color].get (display, r, g, b);
… …
3621 set_window_color (color, str); 3787 set_window_color (color, str);
3622} 3788}
3623 3789
3624/* 3790/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3792 */
3649void 3793void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3794rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3651{ 3795{
3652 int changed = 0; 3796 int changed = 0;
3653 int color; 3797 int color;
3654 char *buf, *name; 3798 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3799 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3800 int saveop = op;
3801 dDisp;
3657 3802
3658 assert (str != NULL); 3803 assert (str != NULL);
3659 switch (op) 3804 switch (op)
3660 { 3805 {
3661 case XTerm_name: 3806 case XTerm_name:
… …
3677 unsigned long bytes_after; 3822 unsigned long bytes_after;
3678 unsigned char *value = 0; 3823 unsigned char *value = 0;
3679 const char *str = ""; 3824 const char *str = "";
3680 3825
3681 if (prop 3826 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3827 && XGetWindowProperty (disp, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3828 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3829 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3830 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3831 && actual_type != None
3687 && actual_format == 8) 3832 && actual_format == 8)
… …
3699 { 3844 {
3700 *eq = 0; 3845 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3846 set_utf8_property (display->atom (str), eq + 1);
3702 } 3847 }
3703 else 3848 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3849 XDeleteProperty (disp, parent[0],
3705 display->atom (str)); 3850 display->atom (str));
3706 } 3851 }
3707 break; 3852 break;
3708 3853
3709 case XTerm_Color: 3854 case XTerm_Color:
… …
3711 { 3856 {
3712 if ((name = strchr (buf, ';')) == NULL) 3857 if ((name = strchr (buf, ';')) == NULL)
3713 break; 3858 break;
3714 3859
3715 *name++ = '\0'; 3860 *name++ = '\0';
3716 color = atoi (buf); 3861 color = atoi (buf) + minCOLOR;
3717 3862
3718 if (color < 0 || color >= TOTAL_COLORS) 3863 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3719 break; 3864 break;
3720 3865
3721 if ((buf = strchr (name, ';')) != NULL) 3866 if ((buf = strchr (name, ';')) != NULL)
3722 *buf++ = '\0'; 3867 *buf++ = '\0';
3723 3868
3724 if (name[0] == '?' && !name[1]) 3869 if (name[0] == '?' && !name[1])
3725 { 3870 {
3726 unsigned short r, g, b; 3871 unsigned short r, g, b;
3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3872 pix_colors_focused[color].get (display, r, g, b);
3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3729 } 3874 }
3730 else 3875 else
3731 set_window_color (color + minCOLOR, name); 3876 set_window_color (color, name);
3732 } 3877 }
3733 break; 3878 break;
3734 case XTerm_Color00: 3879 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3880 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3736 break; 3881 break;
3737 case XTerm_Color01: 3882 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3883 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3739 break; 3884 break;
3740#ifndef NO_CURSORCOLOR 3885#ifndef NO_CURSORCOLOR
3741 case XTerm_Color_cursor: 3886 case XTerm_Color_cursor:
3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3743 break; 3888 break;
… …
3747 break; 3892 break;
3748 case XTerm_Color_pointer_bg: 3893 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3750 break; 3895 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3896#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break;
3761 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break; 3899 break;
3900 case Rxvt_Color_BD:
3901 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp);
3903 break;
3904 case Rxvt_Color_UL:
3905 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp);
3907 break;
3908 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break;
3764#endif 3911#endif
3765#if TRANSPARENT && TINTING 3912#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3913 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3768 check_our_parents (); 3915 check_our_parents ();
3769 if (am_transparent) 3916 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3917 want_full_refresh = want_refresh = 1;
3771 break; 3918 break;
3772#endif 3919#endif
3773 3920
3774 case XTerm_Pixmap: 3921 case Rxvt_Pixmap:
3775 if (*str != ';') 3922 if (*str != ';')
3776 { 3923 {
3777#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3778 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3779 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3780#endif
3781 scr_touch (true); 3927 scr_touch (true);
3928#endif
3782 } 3929 }
3930
3783 while ((str = strchr (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3784 { 3932 {
3785 str++; 3933 str++;
3786#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
3788#endif 3936#endif
3789
3790 } 3937 }
3938
3791 if (changed) 3939 if (changed)
3792 { 3940 {
3793#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3942 resize_pixmap ();
3795#endif
3796 scr_touch (true); 3943 scr_touch (true);
3944#endif
3797 } 3945 }
3798 break; 3946 break;
3799 3947
3800 case XTerm_restoreFG: 3948 case Rxvt_restoreFG:
3801 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);
3802 break; 3950 break;
3803 case XTerm_restoreBG: 3951 case Rxvt_restoreBG:
3804 set_window_color (Color_bg, str); 3952 set_window_color (Color_bg, str);
3805 break; 3953 break;
3806 3954
3807 case XTerm_logfile: 3955 case XTerm_logfile:
3808 // TODO, when secure mode? 3956 // TODO, when secure mode?
3809 break; 3957 break;
3810 3958
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0
3966 case Rxvt_dumpscreen: /* no error notices */
3967 {
3968 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3970 {
3971 scr_dump (fd);
3972 close (fd);
3973 }
3974 }
3975 break;
3976#endif
3811 case XTerm_font: 3977 case XTerm_font:
3812 op = URxvt_font; 3978 op = URxvt_font;
3813 case URxvt_font: 3979 case URxvt_font:
3814#if ENABLE_STYLES 3980#if ENABLE_STYLES
3815 case URxvt_boldFont: 3981 case URxvt_boldFont:
3816 case URxvt_italicFont: 3982 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3818#endif 3984#endif
3819 if (query) 3985 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3989 resp);
3824 else 3990 else
3825 { 3991 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3993
… …
3830 set_fonts (); 3996 set_fonts ();
3831 } 3997 }
3832 break; 3998 break;
3833 3999
3834#if ENABLE_FRILLS 4000#if ENABLE_FRILLS
3835 case XTerm_locale: 4001 case URxvt_locale:
3836 if (query) 4002 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3838 else 4004 else
3839 { 4005 {
3840 set_locale (str); 4006 set_locale (str);
3841# ifdef USE_XIM 4007 pty.set_utf8_mode (enc_utf8);
3842 im_cb (); 4008 init_xlocale ();
3843# endif
3844 } 4009 }
3845 break; 4010 break;
3846#endif
3847 4011
3848#ifdef MENUBAR 4012 case URxvt_view_up:
3849 case XTerm_Menu: 4013 case URxvt_view_down:
3850 if (options & Opt_insecure) 4014 {
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4015 int lines = atoi (str);
4016
4017 if (lines)
4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
4019 else
4020 scr_erase_savelines ();
4021 }
4022
3852 break; 4023 break;
3853#endif 4024#endif
3854#if 0 4025
3855 case XTerm_dumpscreen: /* no error notices */ 4026#if ENABLE_PERL
3856 { 4027 case URxvt_perl:
3857 int fd; 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4029 ; // no responses yet
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 4030 break;
3865#endif 4031#endif
3866 } 4032 }
3867} 4033}
3868/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
3977 } 4143 }
3978 4144
3979 /* extra handling for values with state unkept */ 4145 /* extra handling for values with state unkept */
3980 switch (arg[i]) 4146 switch (arg[i])
3981 { 4147 {
4148#if ENABLE_STYLES
4149 case 1021:
4150 set_option (Opt_intensityStyles, mode);
4151
4152 scr_touch (true);
4153 break;
4154#endif
3982 case 1048: /* alternative cursor save */ 4155 case 1048: /* alternative cursor save */
3983 case 1049: 4156 case 1049:
3984 if (options & Opt_secondaryScreen) 4157 if (OPTION (Opt_secondaryScreen))
3985 if (mode == 0) 4158 if (mode == 0)
3986 scr_cursor (RESTORE); 4159 scr_cursor (RESTORE);
3987 else if (mode == 1) 4160 else if (mode == 1)
3988 scr_cursor (SAVE); 4161 scr_cursor (SAVE);
3989 break; 4162 break;
… …
4001 */ 4174 */
4002 PrivMode (1, PrivMode_vt52); 4175 PrivMode (1, PrivMode_vt52);
4003 break; 4176 break;
4004 case 3: /* 80/132 */ 4177 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 4178 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4179 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 4180 break;
4008 case 4: /* smooth scrolling */ 4181 case 4: /* smooth scrolling */
4009 if (state)
4010 options &= ~Opt_jumpScroll;
4011 else
4012 options |= Opt_jumpScroll; 4182 set_option (Opt_jumpScroll, !state);
4013 break; 4183 break;
4014 case 5: /* reverse video */ 4184 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 4185 scr_rvideo_mode (state);
4016 break; 4186 break;
4017 case 6: /* relative/absolute origins */ 4187 case 6: /* relative/absolute origins */
… …
4058#if 0 4228#if 0
4059 case 1001: 4229 case 1001:
4060 break; /* X11 mouse highlighting */ 4230 break; /* X11 mouse highlighting */
4061#endif 4231#endif
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 4232 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state)
4064 options &= ~Opt_scrollTtyOutput;
4065 else
4066 options |= Opt_scrollTtyOutput; 4233 set_option (Opt_scrollTtyOutput, !state);
4067 break; 4234 break;
4068 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4069 if (state)
4070 options |= Opt_scrollTtyKeypress; 4236 set_option (Opt_scrollTtyKeypress, state);
4071 else
4072 options &= ~Opt_scrollTtyKeypress;
4073 break; 4237 break;
4074 case 1047: /* secondary screen w/ clearing last */ 4238 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 4239 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4240 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4241 scr_erase_screen (2);
4078 scr_change_screen (state); 4242 scr_change_screen (state);
4079 break; 4243 break;
4080 case 1049: /* secondary screen w/ clearing first */ 4244 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state); 4245 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen) 4246 if (OPTION (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4084 scr_erase_screen (2); 4248 scr_erase_screen (2);
4085 break; 4249 break;
4086 default: 4250 default:
4087 break; 4251 break;
… …
4215 scr_color (Color_bg, Color_bg); 4379 scr_color (Color_bg, Color_bg);
4216 break; 4380 break;
4217 4381
4218 //case 50: // not variable spacing 4382 //case 50: // not variable spacing
4219 4383
4220#ifndef NO_BRIGHTCOLOR 4384#if ENABLE_FRILLS
4221 case 90: 4385 case 90:
4222 case 91: /* set bright fg color */ 4386 case 91: /* set bright fg color */
4223 case 92: 4387 case 92:
4224 case 93: 4388 case 93:
4225 case 94: 4389 case 94:
… …
4237 case 106: 4401 case 106:
4238 case 107: 4402 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 4404 break;
4241#endif 4405#endif
4242
4243 } 4406 }
4244 } 4407 }
4245} 4408}
4246/*}}} */ 4409/*}}} */
4247 4410
… …
4271 */ 4434 */
4272void 4435void
4273rxvt_term::tt_printf (const char *fmt,...) 4436rxvt_term::tt_printf (const char *fmt,...)
4274{ 4437{
4275 va_list arg_ptr; 4438 va_list arg_ptr;
4276 unsigned char buf[256]; 4439 char buf[256];
4277 4440
4278 va_start (arg_ptr, fmt); 4441 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4442 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 4443 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 4444 tt_write (buf, strlen (buf));
… …
4286 * or generated by us in response to a query ESC sequence. 4449 * or generated by us in response to a query ESC sequence.
4287 */ 4450 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4451const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289 4452
4290void 4453void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4454rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 4455{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return;
4458
4459 if (pty.pty < 0)
4460 return;
4461
4293 if (v_buflen == 0) 4462 if (v_buflen == 0)
4294 { 4463 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4296 4465
4297 if ((unsigned int)written == len) 4466 if ((unsigned int)written == len)
… …
4299 4468
4300 data += written; 4469 data += written;
4301 len -= written; 4470 len -= written;
4302 } 4471 }
4303 4472
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4305 4474
4306 memcpy (v_buffer + v_buflen, data, len); 4475 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len; 4476 v_buflen += len;
4308 4477
4309 pty_ev.set (EVENT_READ | EVENT_WRITE); 4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4328 } 4497 }
4329 4498
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4499 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4500 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4502 pty_ev.set (EVENT_READ);
4334 destroy ();
4335} 4503}
4336 4504
4337/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
4338 4506

Diff Legend

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