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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 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
53#include <cwchar> 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <csignal> 63#include <csignal>
55 64
56/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
57 66
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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:
… …
785 case XK_F35: /* "\033[49~" */ 822 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 823 FKEY (31, XK_F17);
787 break; 824 break;
788#undef FKEY 825#undef FKEY
789 default: 826 default:
790 if (len == 0 827 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 828 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 829 }
796 830
797 if (newlen) 831 if (newlen)
798 len = strlen (kbuf); 832 len = strlen (kbuf);
799 } 833 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 849 else if (keysym == XK_ISO_Left_Tab)
816 { 850 {
817 strcpy (kbuf, "\033[Z"); 851 strcpy (kbuf, "\033[Z");
818 len = 3; 852 len = 3;
819 } 853 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
827 else 854 else
828 { 855 {
829#ifdef META8_OPTION 856#ifdef META8_OPTION
830 /* set 8-bit on */ 857 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
832 { 859 {
833 unsigned char *ch; 860 char *ch;
834 861
835 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 863 *ch |= 0x80;
837 864
838 meta = 0; 865 meta = 0;
… …
840#endif 867#endif
841 /* nil */ ; 868 /* nil */ ;
842 } 869 }
843 } 870 }
844 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
845 if (len <= 0) 875 if (len <= 0)
846 return; /* not mapped */ 876 return; /* not mapped */
847 877
848 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 879 if (view_start)
850 { 880 {
851 TermWin.view_start = 0; 881 view_start = 0;
852 want_refresh = 1; 882 want_refresh = 1;
853 } 883 }
854 884
855 /* 885 /*
856 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 901#ifdef META8_OPTION
872 && meta_char == C0_ESC 902 && meta_char == C0_ESC
873#endif 903#endif
874 ) 904 )
875 { 905 {
876 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
877 tt_write (&ch, 1); 907 tt_write (&ch, 1);
878 } 908 }
879 909
880#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
889#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
891} 921}
892/*}}} */ 922/*}}} */
893 923
894#if (MENUBAR_MAX) 924#if defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */
897unsigned int 925unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 927{
900 unsigned int n, s; 928 unsigned int n, s;
901 929
902 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 950
923 cmd_parse (); 951 cmd_parse ();
924 952
925 return 0; 953 return 0;
926} 954}
927#endif /* MENUBAR_MAX */ 955#endif
928 956
929void 957void
930rxvt_term::flush () 958rxvt_term::flush ()
931{ 959{
932 flush_ev.stop (); 960 flush_ev.stop ();
… …
940 } 968 }
941#endif 969#endif
942 970
943 if (want_refresh) 971 if (want_refresh)
944 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
945 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
946 scrollbar_show (1); 1012 scrollbar_show (1);
947#ifdef USE_XIM 1013#ifdef USE_XIM
948 IMSendSpot (); 1014 IMSendSpot ();
949#endif 1015#endif
… …
953} 1019}
954 1020
955void 1021void
956rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
957{ 1023{
958 SET_R (this); 1024 make_current ();
959 SET_LOCALE (locale);
960 1025
961 display->flush (); 1026 display->flush ();
962 1027
963 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1030}
966 1031
967void 1032void
968rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
969{ 1034{
970 SET_R (this); 1035 make_current ();
971 SET_LOCALE (locale);
972 1036
973 refresh_limit = 1; 1037 refresh_limit = 1;
974 refresh_count = 0; 1038 refresh_count = 0;
975 flush (); 1039 flush ();
976} 1040}
… …
1033{ 1097{
1034 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1101 {
1102 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0;
1104
1038 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1; 1106 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1108 }
1042} 1109}
1043#endif 1110#endif
1044 1111
1112#if HAVE_SCHED_YIELD
1113static struct event_handler
1114{
1115 check_watcher cw_yield;
1116
1117 void yield (check_watcher &w)
1118 {
1119 sched_yield ();
1120 w.stop ();
1121 }
1122
1123 event_handler ()
1124 : cw_yield (this, &event_handler::yield)
1125 {
1126 }
1127} event_handler;
1128#endif
1129
1045bool 1130bool
1046rxvt_term::pty_fill () 1131rxvt_term::pty_fill ()
1047{ 1132{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1133 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1134
1050 if (CBUFSIZ == n) 1135 if (CBUFSIZ == n)
1051 { 1136 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1137 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0; 1138 n = 0;
1054 } 1139 }
1055 1140
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1141 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1142 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1143 cmdbuf_endp = cmdbuf_ptr + n;
1059 1144
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1061 1146
1062 if (n > 0) 1147 if (r > 0)
1063 { 1148 {
1064 cmdbuf_endp += n; 1149 cmdbuf_endp += r;
1065 return true; 1150 return true;
1066 } 1151 }
1067 else if (n < 0 && errno != EAGAIN) 1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 {
1154#if HAVE_SCHED_YIELD
1155 if (display->is_local)
1156 event_handler.cw_yield.start ();
1157#endif
1158 }
1159 else
1160 {
1161 pty_ev.stop ();
1162
1163 if (!OPTION (Opt_hold))
1068 destroy (); 1164 destroy ();
1165 }
1069 1166
1070 return false; 1167 return false;
1071} 1168}
1072 1169
1073void 1170void
1074rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1075{ 1172{
1076 SET_R (this); 1173 make_current ();
1077 SET_LOCALE (locale);
1078 1174
1079 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ()) 1177 while (pty_fill ())
1082 if (cmd_parse ()) 1178 if (cmd_parse ())
… …
1087} 1183}
1088 1184
1089void 1185void
1090rxvt_term::pointer_unblank () 1186rxvt_term::pointer_unblank ()
1091{ 1187{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1188 XDefineCursor (display->display, vt, TermWin_cursor);
1093 recolour_cursor (); 1189 recolour_cursor ();
1094 1190
1095#ifdef POINTER_BLANK 1191#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1192 hidden_pointer = 0;
1097 1193
1098 if (options & Opt_pointerBlank) 1194 if (OPTION (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1195 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1196#endif
1101} 1197}
1102 1198
1103#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1104void 1200void
1105rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1106{ 1202{
1107 if (! (options & Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1108 return; 1204 return;
1109 1205
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1111 XFlush (display->display); 1207 XFlush (display->display);
1112 1208
1113 hidden_pointer = 1; 1209 hidden_pointer = 1;
1114} 1210}
1115 1211
1116void 1212void
1117rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1118{ 1214{
1119 SET_R (this); 1215 make_current ();
1120 SET_LOCALE (locale);
1121 1216
1122 pointer_blank (); 1217 pointer_blank ();
1123} 1218}
1124#endif 1219#endif
1125 1220
… …
1204 1299
1205/*{{{ process an X event */ 1300/*{{{ process an X event */
1206void 1301void
1207rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1208{ 1303{
1209 SET_R (this); 1304 make_current ();
1210 SET_LOCALE (locale);
1211 1305
1212#if defined(CURSOR_BLINK) 1306 dDisp;
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220 1307
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1308 if (ev.xany.window == vt
1222 } 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1223#endif 1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1224 1312
1225#if defined(POINTER_BLANK) 1313 // for XQueryPointer
1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1227 {
1228 if (ev.type == MotionNotify
1229 || ev.type == ButtonPress
1230 || ev.type == ButtonRelease)
1231 if (hidden_pointer)
1232 pointer_unblank ();
1233
1234 if (ev.type == KeyPress && hidden_pointer == 0)
1235 pointer_blank ();
1236 }
1237#endif
1238
1239 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1316 unsigned int unused_mask;
1242 1317
1243 switch (ev.type) 1318 switch (ev.type)
… …
1250 1325
1251 break; 1326 break;
1252 1327
1253 case KeyRelease: 1328 case KeyRelease:
1254 { 1329 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1256 KeySym ks; 1331 KeySym keysym;
1257 1332
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif 1334#endif
1260 1335
1261#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support 1337 // ISO 14755 support
1263 if (iso14755buf) 1338 if (iso14755buf)
… …
1268# endif 1343# endif
1269# if ISO_14755 1344# if ISO_14755
1270 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1271 // first: controls 1346 // first: controls
1272 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1275 { 1350 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1277 commit_iso14755 (); 1352 commit_iso14755 ();
1278 return; // case-break; 1353 goto skip_switch;
1279 } 1354 }
1280 1355
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks) 1357 if (i[0] == keysym)
1283 { 1358 {
1284 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 (); 1360 commit_iso14755 ();
1286 return; // case-break; 1361 goto skip_switch;
1287 } 1362 }
1288 1363
1289 scr_bell (); 1364 scr_bell ();
1290# endif 1365# endif
1291 iso14755buf = 0; 1366 iso14755buf = 0;
… …
1310 else 1385 else
1311 iso14755buf = 0; 1386 iso14755buf = 0;
1312 } 1387 }
1313#endif 1388#endif
1314 1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1319 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1320#endif 1399#endif
1321 break; 1400 break;
1322 } 1401 }
1323 1402
… …
1329 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
1330 break; 1409 break;
1331 1410
1332 case ClientMessage: 1411 case ClientMessage:
1333 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1414 {
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 destroy (); 1416 destroy ();
1417#if ENABLE_EWMH
1418 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419 XSendEvent (disp, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &ev);
1422#endif
1423 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1336#ifdef OFFIX_DND 1433#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */ 1434 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile 1436 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir 1437 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink)) 1438 || ev.xclient.data.l[0] == DndLink))
1342 { 1439 {
1343 /* Get Dnd data */ 1440 /* Get Dnd data */
1344 Atom ActualType; 1441 Atom ActualType;
1345 int ActualFormat; 1442 int ActualFormat;
1346 unsigned char *data; 1443 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1444 unsigned long Size, RemainingBytes;
1348 1445
1349 XGetWindowProperty (display->display, display->root, 1446 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1447 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1448 0L, 1000000L,
1352 False, AnyPropertyType, 1449 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1450 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1451 &Size, &RemainingBytes,
1355 &data); 1452 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1453 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1454 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1457 }
1361#endif /* OFFIX_DND */ 1458#endif /* OFFIX_DND */
1362 break; 1459 break;
1363 1460
1364 case MappingNotify: 1461 case MappingNotify:
… …
1389 break; 1486 break;
1390 } 1487 }
1391 break; 1488 break;
1392 1489
1393 case FocusIn: 1490 case FocusIn:
1394 if (!TermWin.focus) 1491 focus_in ();
1492 break;
1493
1494 case FocusOut:
1495 focus_out ();
1496 break;
1497
1498 case ConfigureNotify:
1499 if (ev.xconfigure.window == parent[0])
1395 { 1500 {
1396 TermWin.focus = 1;
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416
1417 }
1418 break;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1502 ;
1463 1503
1464 if (szHint.width != width || szHint.height != height) 1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1505 {
1466 seen_resize = 1; 1506 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1508 }
1469 1509
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1511 if (OPTION (Opt_transparent))
1472 check_our_parents (); 1512 check_our_parents ();
1473#endif 1513#endif
1474 } 1514 }
1475 break; 1515 break;
1476 1516
… …
1492 1532
1493 case SelectionRequest: 1533 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1495 break; 1535 break;
1496 1536
1537 case MapNotify:
1538 mapped = 1;
1539#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1541#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break;
1544
1497 case UnmapNotify: 1545 case UnmapNotify:
1498 TermWin.mapped = 0; 1546 mapped = 0;
1499#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1501#endif 1549#endif
1502 break; 1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504 case MapNotify:
1505 TermWin.mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 break; 1551 break;
1510 1552
1511#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1512 case ReparentNotify: 1554 case ReparentNotify:
1513 rootwin_cb (ev); 1555 rootwin_cb (ev);
1514 break; 1556 break;
1515#endif /* TRANSPARENT */ 1557#endif /* TRANSPARENT */
1516 1558
1517 case GraphicsExpose: 1559 case GraphicsExpose:
1518 case Expose: 1560 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1561 if (ev.xany.window == vt)
1520 { 1562 {
1521 do 1563 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525 1567
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1569
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1531 1573
1532 scr_refresh (refresh_type); 1574 want_refresh = 1;
1533 } 1575 }
1534 else 1576 else
1535 { 1577 {
1536 XEvent unused_event; 1578 XEvent unused_event;
1537 1579
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1581 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1583 ;
1542 1584
1543 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1544 { 1586 {
1545 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1546 scrollbar_show (0); 1588 scrollbar_show (0);
1547 } 1589 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552 1590
1553#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1556#endif 1594#endif
1557 } 1595 }
1558 break; 1596 break;
1559 1597
1560 case MotionNotify: 1598 case MotionNotify:
1561#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1600 if (hidden_pointer)
1563 pointer_unblank (); 1601 pointer_unblank ();
1564#endif 1602#endif
1565#if MENUBAR
1566 if (isMenuBarWindow (ev.xany.window))
1567 {
1568 menubar_control (ev.xbutton);
1569 break;
1570 }
1571#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1604 break;
1574 1605
1575 if (ev.xany.window == TermWin.vt) 1606 if (ev.xany.window == vt)
1576 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1612 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580 ; 1614 ;
1581 1615
1582 XQueryPointer (display->display, TermWin.vt, 1616 XQueryPointer (disp, vt,
1583 &unused_root, &unused_child, 1617 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1618 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1619 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1620 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
… …
1599#endif 1633#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1634 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1635 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1636
1603#ifdef SELECTION_SCROLLING 1637#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1638 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1639 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1640 {
1607 int dist; 1641 int dist;
1608 1642
1609 /* don't clobber the current delay if we are 1643 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1644 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1652 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1653 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1654 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1655
1622 /* calc number of lines to scroll */ 1656 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1657 if (ev.xbutton.y < int_bwidth)
1624 { 1658 {
1625 scroll_selection_dir = UP; 1659 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1660 dist = int_bwidth - ev.xbutton.y;
1627 } 1661 }
1628 else 1662 else
1629 { 1663 {
1630 scroll_selection_dir = DN; 1664 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1665 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1666 }
1633 1667
1634 scroll_selection_lines = Pixel2Height (dist) 1668 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1669 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1670 + 1;
1637 MIN_IT (scroll_selection_lines, 1671 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1672 SELECTION_SCROLL_MAX_LINES);
1639 } 1673 }
1640 else 1674 else
1641 { 1675 {
1642 /* we are within the text window, so we 1676 /* we are within the text window, so we
… …
1651#endif 1685#endif
1652 } 1686 }
1653 } 1687 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1689 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1690 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1691 MotionNotify, &ev))
1658 ; 1692 ;
1659 1693
1660 XQueryPointer (display->display, scrollBar.win, 1694 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1695 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1698 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1700 scrollbar_size ());
1667 scr_refresh (refresh_type); 1701 want_refresh = 1;
1668 refresh_limit = 0; 1702 refresh_limit = 0;
1669 scrollbar_show (1); 1703 scrollbar_show (1);
1670 } 1704 }
1671 break; 1705 break;
1672 } 1706 }
1707
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 {
1713 if (hidden_cursor)
1714 {
1715 hidden_cursor = 0;
1716 want_refresh = 1;
1717 }
1718
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1720 }
1721#endif
1722
1723#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 {
1726 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease)
1729 if (hidden_pointer)
1730 pointer_unblank ();
1731
1732 if (ev.type == KeyPress && hidden_pointer == 0)
1733 pointer_blank ();
1734 }
1735#endif
1736}
1737
1738void
1739rxvt_term::focus_in ()
1740{
1741 if (!focus)
1742 {
1743 focus = 1;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 {
1751 IMSetStatusPosition ();
1752 XSetICFocus (Input_Context);
1753 }
1754#endif
1755#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1758#endif
1759#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade])
1761 {
1762 pix_colors = pix_colors_focused;
1763 scr_recolour ();
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1673} 1805}
1674 1806
1675#if TRANSPARENT 1807#if TRANSPARENT
1676void 1808void
1677rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1810{
1679 SET_R (this); 1811 make_current ();
1680 SET_LOCALE (locale);
1681 1812
1682 switch (ev.type) 1813 switch (ev.type)
1683 { 1814 {
1684 case PropertyNotify: 1815 case PropertyNotify:
1685 /* 1816 /*
… …
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691 return; 1822 return;
1692 1823
1693 /* FALLTHROUGH */ 1824 /* FALLTHROUGH */
1694 case ReparentNotify: 1825 case ReparentNotify:
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1; 1827 want_refresh = want_full_refresh = 1;
1697 break; 1828 break;
1698 } 1829 }
1699} 1830}
1700#endif 1831#endif
… …
1703rxvt_term::button_press (XButtonEvent &ev) 1834rxvt_term::button_press (XButtonEvent &ev)
1704{ 1835{
1705 int reportmode = 0, clickintime; 1836 int reportmode = 0, clickintime;
1706 1837
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1838 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1839
1708 if (!bypass_keystate) 1840 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1841 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1842
1711 /* 1843 /*
1712 * VT window processing of button press 1844 * VT window processing of button press
1713 */ 1845 */
1714 if (ev.window == TermWin.vt) 1846 if (ev.window == vt)
1715 { 1847 {
1716#if ISO_14755 1848#if ISO_14755
1717 // 5.4 1849 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1851 {
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1734 { 1866 {
1735 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1736 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1737 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1738 { 1871 {
1739 /* only report double clicks */ 1872 /* only report double clicks */
1740 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1741 mouse_report (ev); 1874 mouse_report (ev);
… …
1761 else 1894 else
1762 { 1895 {
1763 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1764 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1765 1898
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1766 switch (ev.button) 1900 switch (ev.button)
1767 { 1901 {
1768 case Button1: 1902 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1907#else
1774 selection.rect = false; 1908 selection.rect = false;
1775#endif 1909#endif
1776 1910
1777 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1913 {
1780 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1782 else 1916 else
1783 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1784 } 1918 }
1785 else 1919 else
1786 { 1920 {
1787 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1788 MEvent.clicks++; 1922 MEvent.clicks++;
1789 else 1923 else
1790 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1791 1925
1792 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1793 } 1927 }
1794 1928
1795 MEvent.button = Button1; 1929 MEvent.button = Button1;
1796 break; 1930 break;
1797 1931
1798 case Button3: 1932 case Button3:
1799 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1800 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1801 else 1935 else
1802 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1803 1937
1804 MEvent.button = Button3; 1938 MEvent.button = Button3;
1805 break; 1939 break;
1806 } 1940 }
1807 } 1941 }
1808 1942
1809 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1810 return; 1944 return;
1811 } 1945 }
1812 1946
… …
1924 case Button3: 2058 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1926 { 2060 {
1927 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1930# else 2064# else
1931 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1932# endif 2066# endif
1933 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1936# else 2070# else
1937 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1938# endif 2072# endif
1939 else 2073 else
1940 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1941 } 2075 }
1942 else 2076 else
1943 { 2077 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2079 (nrow
1946 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2081 / scrollbar_size ()));
1948 } 2082 }
1949 2083
1950 break; 2084 break;
1951 } 2085 }
1952 } 2086 }
2087
1953 return; 2088 return;
1954 } 2089 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2090}
1963 2091
1964void 2092void
1965rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
1966{ 2094{
… …
1982#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2111 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
1985#endif 2113#endif
1986 2114
1987 if (ev.window == TermWin.vt) 2115 if (ev.window == vt)
1988 { 2116 {
1989#if ISO_14755 2117#if ISO_14755
1990 // 5.4 2118 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2120 return;
… …
2022 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2023 && bypass_keystate 2151 && bypass_keystate
2024 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2025 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2026 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2027 switch (ev.button) 2158 switch (ev.button)
2028 { 2159 {
2029 case Button1: 2160 case Button1:
2030 case Button3: 2161 case Button3:
2031 selection_make (ev.time); 2162 selection_make (ev.time);
… …
2042 2173
2043 v = ev.button == Button4 ? UP : DN; 2174 v = ev.button == Button4 ? UP : DN;
2044 2175
2045 if (ev.state & ShiftMask) 2176 if (ev.state & ShiftMask)
2046 i = 1; 2177 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2178 else if (OPTION (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2179 i = nrow - 1;
2049 else 2180 else
2050 i = 5; 2181 i = 5;
2051 2182
2052# ifdef MOUSE_SLIP_WHEELING 2183# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2184 if (ev.state & ControlMask)
2054 { 2185 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2186 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2187 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2188 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2189
2059 if (slip_wheel_ev.at < NOW) 2190 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2191 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2192
2062 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2063 } 2194 }
2064 else 2195 else
2065 { 2196 {
2066# endif 2197# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2198 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2199 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2080 } 2201 }
2081#endif 2202# endif
2082 } 2203 }
2083 break; 2204 break;
2084#endif 2205#endif
2085 } 2206 }
2086 } 2207 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2208}
2092 2209
2093#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2094#if TINTING 2211#if TINTING
2095/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2223 int i;
2107 2224
2108 Visual* visual = display->visual; 2225 Visual *visual = display->visual;
2109 2226
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2228
2112 /* for convenience */ 2229 /* for convenience */
2113 mask_r = visual->red_mask; 2230 mask_r = visual->red_mask;
… …
2334 Atom atype; 2451 Atom atype;
2335 unsigned char *prop = NULL; 2452 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2453 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2454 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2455 XWindowAttributes wattr, wrootattr;
2456 dDisp;
2339 2457
2340 pchanged = 0; 2458 pchanged = 0;
2341 2459
2342 if (!(options & Opt_transparent)) 2460 if (!OPTION (Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2344 2462
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2463 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2347 2465
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2466 XGetWindowAttributes (disp, parent[0], &wattr);
2349 2467
2350 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2351 { 2469 {
2352 if (am_transparent) 2470 if (am_transparent)
2353 { 2471 {
2354 pchanged = 1; 2472 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2357 } 2475 }
2358 2476
2359 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2360 } 2478 }
2361 2479
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2481 XSync (disp, False);
2364 2482
2365 /* 2483 /*
2366 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2369 */ 2487 */
2370 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2374 2492
2375 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2380 2498
2381 if (!i || prop == NULL 2499 if (!i || prop == NULL
2382#if TINTING 2500#if TINTING
… …
2401 Window cr; 2519 Window cr;
2402 XImage *image; 2520 XImage *image;
2403 GC gc; 2521 GC gc;
2404 XGCValues gcvalue; 2522 XGCValues gcvalue;
2405 2523
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2524 XTranslateCoordinates (disp, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2528 nx = ny = 0;
2411 2529
… …
2421 nh += sy; 2539 nh += sy;
2422 ny = -sy; 2540 ny = -sy;
2423 sy = 0; 2541 sy = 0;
2424 } 2542 }
2425 2543
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2546
2429 XSync (display->display, False); 2547 XSync (disp, False);
2430 allowedxerror = -1; 2548 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2550
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2553 allowedxerror = 0;
2436 2554
2437 if (image == NULL) 2555 if (image == NULL)
2438 { 2556 {
2439 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2440 { 2558 {
2441 pchanged = 1; 2559 pchanged = 1;
2442 if (TermWin.pixmap != None) 2560 if (pixmap != None)
2443 { 2561 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2562 XFreePixmap (disp, pixmap);
2445 TermWin.pixmap = None; 2563 pixmap = None;
2446 } 2564 }
2447 } 2565 }
2448 2566
2449 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2450 } 2568 }
2451 else 2569 else
2452 { 2570 {
2453 if (TermWin.pixmap != None) 2571 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2572 XFreePixmap (disp, pixmap);
2455 2573
2456#if TINTING 2574#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2576 {
2459 unsigned short rm, gm, bm; 2577 unsigned short rm, gm, bm;
… …
2463 2581
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2583 }
2466#endif 2584#endif
2467 2585
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2586 pixmap = XCreatePixmap (disp, vt,
2469 szHint.width, szHint.height, image->depth); 2587 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2589 XPutImage (disp, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2590 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2591 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2592 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2594 XClearWindow (disp, parent[0]);
2477 2595
2478 if (!am_transparent || !am_pixmap_trans) 2596 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2597 pchanged = 1;
2480 2598
2481 am_transparent = am_pixmap_trans = 1; 2599 am_transparent = am_pixmap_trans = 1;
2482 } 2600 }
2483 } 2601 }
2484 2602
2485 if (am_pixmap_trans) 2603 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487 else 2605 else
2488 { 2606 {
2489 unsigned int n; 2607 unsigned int n;
2490 /* 2608 /*
2491 * InheritPixmap transparency 2609 * InheritPixmap transparency
2492 */ 2610 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2612 {
2495 oldp = TermWin.parent[i]; 2613 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2614 XQueryTree (disp, parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2615 &parent[i], &list, &n);
2498 XFree (list); 2616 XFree (list);
2499 2617
2500 if (TermWin.parent[i] == display->root) 2618 if (parent[i] == display->root)
2501 { 2619 {
2502 if (oldp != None) 2620 if (oldp != None)
2503 pchanged = 1; 2621 pchanged = 1;
2504 2622
2505 break; 2623 break;
2506 } 2624 }
2507 2625
2508 if (oldp != TermWin.parent[i]) 2626 if (oldp != parent[i])
2509 pchanged = 1; 2627 pchanged = 1;
2510 } 2628 }
2511 2629
2512 n = 0; 2630 n = 0;
2513 2631
2514 if (pchanged) 2632 if (pchanged)
2515 { 2633 {
2516 for (; n < (unsigned int)i; n++) 2634 for (; n < (unsigned int)i; n++)
2517 { 2635 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2636 XGetWindowAttributes (disp, parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2638 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2640 break;
2523 } 2641 }
2524 } 2642 }
2525 } 2643 }
2526 2644
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2645 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528 { 2646 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2649 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2650 /* XXX: also turn off Opt_transparent? */
2533 } 2651 }
2534 else 2652 else
2535 { 2653 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2656 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2657 sleep (1);
2540#endif 2658#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2659 for (n = 0; n < (unsigned int)i; n++)
2542 { 2660 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2662 XClearWindow (disp, parent[n]);
2545 } 2663 }
2546 2664
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548 am_transparent = 1; 2666 am_transparent = 1;
2549 } 2667 }
2550 2668
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2670 parent[i] = None;
2553 } 2671 }
2554 2672
2555 if (scrollBar.win) 2673 if (scrollBar.win)
2556 { 2674 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2676 scrollBar.setIdle ();
2559 scrollbar_show (0); 2677 scrollbar_show (0);
2560 } 2678 }
2561 2679
2562 if (am_transparent) 2680 if (am_transparent)
… …
2574 2692
2575bool 2693bool
2576rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2577{ 2695{
2578 bool flag = false; 2696 bool flag = false;
2579 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2581 2699
2582 for (;;) 2700 for (;;)
2583 { 2701 {
2584 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2585 { 2703 {
2586 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2705 ch = next_char ();
2588 }
2589 2706
2590 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2591 break; 2708 break;
2709 }
2592 2710
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2711 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2712 {
2595 if (!seen_input) 2713 if (!seen_input)
2596 { 2714 {
… …
2600 // some window managers resize the window early, and these programs 2718 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2719 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2720 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2721 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2722 // resized.
2605 if (seen_resize) 2723 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2607 } 2725 }
2608 2726
2609 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2729 bool refreshnow = false;
2612 int nlines = 0; 2730 int nlines = 0;
2613 unicode_t *str = buf; 2731 wchar_t *str = buf;
2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2733
2615 for (;;) 2734 for (;;)
2616 { 2735 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2736 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2737 break;
2619 2738
2620 *str++ = ch; 2739 *str++ = ch;
2621 2740
2622 if (ch == C0_LF) 2741 if (ch == C0_LF || str >= eol)
2623 { 2742 {
2743 if (ch == C0_LF)
2624 nlines++; 2744 nlines++;
2745
2625 refresh_count++; 2746 refresh_count++;
2626 2747
2627 if (!(options & Opt_jumpScroll) 2748 if (!OPTION (Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2750 {
2630 refreshnow = true; 2751 refreshnow = true;
2752 refresh_count = 0;
2631 ch = NOCHAR; 2753 ch = NOCHAR;
2632 break; 2754 break;
2633 } 2755 }
2634 2756
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2758 if (nlines >= nrow - 1)
2637 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2763
2639 nlines = 0; 2764 nlines = 0;
2640 str = buf; 2765 str = buf;
2766 eol = str + min (ncol, UBUFSIZ);
2641 } 2767 }
2642 }
2643 2768
2644 if (str >= buf + UBUFSIZ) 2769 if (str >= eol)
2645 { 2770 {
2771 if (eol >= buf + UBUFSIZ)
2772 {
2646 ch = NOCHAR; 2773 ch = NOCHAR;
2647 break; 2774 break;
2775 }
2776 else
2777 eol = min (eol + ncol, buf + UBUFSIZ);
2778 }
2779
2648 } 2780 }
2649 2781
2650 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2783 ch = next_char ();
2652 } 2784 }
2653 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2655 2789
2656 /* 2790 /*
2657 * If there have been a lot of new lines, then update the screen 2791 * If there have been a lot of new lines, then update the screen
2658 * What the heck I'll cheat and only refresh less than every page-full. 2792 * What the heck I'll cheat and only refresh less than every page-full.
2659 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling. 2794 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2795 */
2662 if (refreshnow) 2796 if (refreshnow)
2663 { 2797 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++; 2799 refresh_limit++;
2666 else 2800 else
2667 { 2801 {
2668 flag = true; 2802 flag = true;
2669 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2804 want_refresh = 1;
2670 } 2805 }
2671 } 2806 }
2672 2807
2673 } 2808 }
2674 else 2809 else
… …
2689 } 2824 }
2690 2825
2691 return flag; 2826 return flag;
2692} 2827}
2693 2828
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character 2829// read the next character
2704unicode_t 2830wchar_t
2705rxvt_term::next_char () 2831rxvt_term::next_char ()
2706{ 2832{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2834 {
2709 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2837 return *cmdbuf_ptr++;
2712 2838
2713 wchar_t wc; 2839 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2840 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2841
2716 if (len == (size_t)-2) 2842 if (len == (size_t)-2)
2717 { 2843 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2844 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2846 break;
2721 } 2847 }
2722 2848
2723 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2850 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2851
2726 // assume wchar == unicode 2852 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2729 } 2855 }
2730 2856
2731 return NOCHAR; 2857 return NOCHAR;
2858}
2859
2860// read the next octet
2861uint32_t
2862rxvt_term::next_octet ()
2863{
2864 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR;
2732} 2867}
2733 2868
2734/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2735/* 2870/*
2736 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2737 * to the command. 2872 * to the command.
2738 */ 2873 */
2739unicode_t 2874wchar_t
2740rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2741{ 2876{
2742 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2743 2878
2744 if (c == NOCHAR) 2879 if (c == NOCHAR)
2745 throw out_of_input; 2880 throw out_of_input;
2746 2881
2747 return c; 2882 return c;
2748} 2883}
2749 2884
2750unicode_t 2885uint32_t
2751rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2752{ 2887{
2753 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2754 2889
2755 if (c == NOCHAR) 2890 if (c == NOCHAR)
2756 throw out_of_input; 2891 throw out_of_input;
2757 2892
2758 return c; 2893 return c;
… …
2858 case C0_ESC: 2993 case C0_ESC:
2859 process_escape_seq (); 2994 process_escape_seq ();
2860 break; 2995 break;
2861 case C0_ENQ: /* terminal Status */ 2996 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2997 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2998 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2999 else
2866 tt_write ((unsigned char *)VT100_ANS, 3000 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 3001 break;
2869 case C0_BEL: /* bell */ 3002 case C0_BEL: /* bell */
2870 scr_bell (); 3003 scr_bell ();
2871 break; 3004 break;
2872 case C0_BS: /* backspace */ 3005 case C0_BS: /* backspace */
… …
3027 break; 3160 break;
3028 3161
3029 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3031 { 3164 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 3167 }
3035 break; 3168 break;
3036 3169
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 3193 process_dcs_seq ();
3061 break; 3194 break;
3062 3195
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3196 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 3197 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 3198 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 3199 break; /* steal obsolete ESC [ c */
3068 3200
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3201 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 3202 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 3203 process_csi_seq ();
… …
3196 { 3328 {
3197 switch (priv) 3329 switch (priv)
3198 { 3330 {
3199 case '>': 3331 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3332 if (ch == CSI_DA) /* secondary device attributes */
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202 break; 3334 break;
3203 case '?': 3335 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3337 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3338 break;
… …
3311 3443
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3444 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3445 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3446 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3447 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3448 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3449 break;
3318 3450
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3451 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3452 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 3453 break;
3323 3454
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3455 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 3456 process_sgr_mode (nargs, arg);
3326 break; 3457 break;
… …
3333 break; 3464 break;
3334 case 6: /* CPR requested */ 3465 case 6: /* CPR requested */
3335 scr_report_position (); 3466 scr_report_position ();
3336 break; 3467 break;
3337 case 7: /* unofficial extension */ 3468 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3469 if (OPTION (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3470 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3471 break;
3341 case 8: /* unofficial extension */ 3472 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3473 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3474 break;
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3566rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3567{
3437 int x, y; 3568 int x, y;
3438 XWindowAttributes wattr; 3569 XWindowAttributes wattr;
3439 Window wdummy; 3570 Window wdummy;
3571 dDisp;
3440 3572
3441 if (nargs == 0) 3573 if (nargs == 0)
3442 return; 3574 return;
3443 3575
3444 switch (args[0]) 3576 switch (args[0])
3445 { 3577 {
3446 /* 3578 /*
3447 * commands 3579 * commands
3448 */ 3580 */
3449 case 1: /* deiconify window */ 3581 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3582 XMapWindow (disp, parent[0]);
3451 break; 3583 break;
3452 case 2: /* iconify window */ 3584 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3585 XIconifyWindow (disp, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3586 break;
3456 case 3: /* set position (pixels) */ 3587 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3588 XMoveWindow (disp, parent[0], args[1], args[2]);
3458 break; 3589 break;
3459 case 4: /* set size (pixels) */ 3590 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3592 break;
3462 case 5: /* raise window */ 3593 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3594 XRaiseWindow (disp, parent[0]);
3464 break; 3595 break;
3465 case 6: /* lower window */ 3596 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3597 XLowerWindow (disp, parent[0]);
3467 break; 3598 break;
3468 case 7: /* refresh window */ 3599 case 7: /* refresh window */
3469 scr_touch (true); 3600 scr_touch (true);
3470 break; 3601 break;
3471 case 8: /* set size (chars) */ 3602 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3603 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3604 (unsigned int) (args[1] * fheight));
3474 break; 3605 break;
3475 3606
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3607 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3608 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3609 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3610 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3611 (unsigned int) (args[1] * fheight));
3481 break; 3612 break;
3482 3613
3483 3614
3484 /* 3615 /*
3485 * reports - some output format copied from XTerm 3616 * reports - some output format copied from XTerm
3486 */ 3617 */
3487 case 11: /* report window state */ 3618 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3619 XGetWindowAttributes (disp, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3621 break;
3491 case 13: /* report window position */ 3622 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (disp, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3624 XTranslateCoordinates (disp, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3625 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3626 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3627 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3628 break;
3498 case 14: /* report window size (pixels) */ 3629 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3630 XGetWindowAttributes (disp, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3632 break;
3502 case 18: /* report text area size (chars) */ 3633 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3634 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3635 break;
3505 case 19: /* report window size (chars) */ 3636 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3637 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3638 break;
3508 case 20: /* report icon label */ 3639 case 20: /* report icon label */
3509 { 3640 {
3510 char *s; 3641 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3642 XGetIconName (disp, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3644 XFree (s);
3514 } 3645 }
3515 break; 3646 break;
3516 case 21: /* report window title */ 3647 case 21: /* report window title */
3517 { 3648 {
3518 char *s; 3649 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3650 XFetchName (disp, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3652 XFree (s);
3522 } 3653 }
3523 break; 3654 break;
3524 } 3655 }
3525} 3656}
… …
3528/*----------------------------------------------------------------------*/ 3659/*----------------------------------------------------------------------*/
3529/* 3660/*
3530 * get input up until STRING TERMINATOR (or BEL) 3661 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3662 * ends_how is terminator used. returned input must be free()'d
3532 */ 3663 */
3533unsigned char * 3664char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3665rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3666{
3536 unicode_t ch; 3667 unicode_t ch;
3537 bool seen_esc = false; 3668 bool seen_esc = false;
3538 unsigned int n = 0; 3669 unsigned int n = 0;
… …
3557 else if (ch < 0x20) 3688 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3689 return NULL; /* other control character - exit */
3559 3690
3560 seen_esc = false; 3691 seen_esc = false;
3561 3692
3562 if (n >= sizeof (string) - 1) 3693 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3694 // stop at some sane length
3564 return NULL; 3695 return NULL;
3565 3696
3566 if (ch == C0_SYN) 3697 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3698 string[n++] = cmd_get8 ();
… …
3571 3702
3572 string[n++] = '\0'; 3703 string[n++] = '\0';
3573 3704
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3705 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3706
3576 return (unsigned char *)rxvt_wcstombs (string); 3707 return rxvt_wcstombs (string);
3577} 3708}
3578 3709
3579/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3580/* 3711/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3712 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3713 */
3583void 3714void
3584rxvt_term::process_dcs_seq () 3715rxvt_term::process_dcs_seq ()
3585{ 3716{
3586 unsigned char *s; 3717 char *s;
3587 unicode_t eh; 3718 unicode_t eh;
3588 3719
3589 /* 3720 /*
3590 * Not handled yet 3721 * Not handled yet
3591 */ 3722 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3741 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3742 arg = arg * 10 + (ch - '0');
3612 3743
3613 if (ch == ';') 3744 if (ch == ';')
3614 { 3745 {
3615 unsigned char *s = get_to_st (eh); 3746 char *s = get_to_st (eh);
3616 3747
3617 if (s) 3748 if (s)
3618 { 3749 {
3619 process_xterm_seq (arg, (char *)s, eh); 3750 process_xterm_seq (arg, s, eh);
3620 free (s); 3751 free (s);
3621 } 3752 }
3622 } 3753 }
3623} 3754}
3624 3755
3625void 3756void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3758{
3628 if (str[0] == '?' && !str[1]) 3759 if (str[0] == '?' && !str[1])
3629 { 3760 {
3630 unsigned short r, g, b; 3761 unsigned short r, g, b;
3631 pix_colors_focused[color].get (display, r, g, b); 3762 pix_colors_focused[color].get (display, r, g, b);
… …
3635 set_window_color (color, str); 3766 set_window_color (color, str);
3636} 3767}
3637 3768
3638/* 3769/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3771 */
3663void 3772void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3774{
3666 int changed = 0; 3775 int changed = 0;
3667 int color; 3776 int color;
3668 char *buf, *name; 3777 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3779 int saveop = op;
3780 dDisp;
3671 3781
3672 assert (str != NULL); 3782 assert (str != NULL);
3673 switch (op) 3783 switch (op)
3674 { 3784 {
3675 case XTerm_name: 3785 case XTerm_name:
… …
3691 unsigned long bytes_after; 3801 unsigned long bytes_after;
3692 unsigned char *value = 0; 3802 unsigned char *value = 0;
3693 const char *str = ""; 3803 const char *str = "";
3694 3804
3695 if (prop 3805 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3806 && XGetWindowProperty (disp, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3807 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3808 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3809 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3810 && actual_type != None
3701 && actual_format == 8) 3811 && actual_format == 8)
… …
3713 { 3823 {
3714 *eq = 0; 3824 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3825 set_utf8_property (display->atom (str), eq + 1);
3716 } 3826 }
3717 else 3827 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3828 XDeleteProperty (disp, parent[0],
3719 display->atom (str)); 3829 display->atom (str));
3720 } 3830 }
3721 break; 3831 break;
3722 3832
3723 case XTerm_Color: 3833 case XTerm_Color:
… …
3725 { 3835 {
3726 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3837 break;
3728 3838
3729 *name++ = '\0'; 3839 *name++ = '\0';
3730 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3731 3841
3732 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3843 break;
3734 3844
3735 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3846 *buf++ = '\0';
3737 3847
3738 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3739 { 3849 {
3740 unsigned short r, g, b; 3850 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 } 3853 }
3744 else 3854 else
3745 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3746 } 3856 }
3747 break; 3857 break;
3748 case XTerm_Color00: 3858 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3750 break; 3860 break;
3751 case XTerm_Color01: 3861 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3753 break; 3863 break;
3754#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3755 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3757 break; 3867 break;
… …
3761 break; 3871 break;
3762 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3764 break; 3874 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break;
3775 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break; 3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3886 break;
3887 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3889 break;
3778#endif 3890#endif
3779#if TRANSPARENT && TINTING 3891#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3892 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782 check_our_parents (); 3894 check_our_parents ();
3783 if (am_transparent) 3895 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3785 break; 3897 break;
3786#endif 3898#endif
3787 3899
3788 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3789 if (*str != ';') 3901 if (*str != ';')
3790 { 3902 {
3791#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3792 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3793 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3794#endif
3795 scr_touch (true); 3906 scr_touch (true);
3907#endif
3796 } 3908 }
3909
3797 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3798 { 3911 {
3799 str++; 3912 str++;
3800#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3802#endif 3915#endif
3803
3804 } 3916 }
3917
3805 if (changed) 3918 if (changed)
3806 { 3919 {
3807#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3921 resize_pixmap ();
3809#endif
3810 scr_touch (true); 3922 scr_touch (true);
3923#endif
3811 } 3924 }
3812 break; 3925 break;
3813 3926
3814 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3816 break; 3929 break;
3817 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3819 break; 3932 break;
3820 3933
3821 case XTerm_logfile: 3934 case XTerm_logfile:
3822 // TODO, when secure mode? 3935 // TODO, when secure mode?
3823 break; 3936 break;
3824 3937
3938#if 0
3939 case Rxvt_dumpscreen: /* no error notices */
3940 {
3941 int fd;
3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3943 {
3944 scr_dump (fd);
3945 close (fd);
3946 }
3947 }
3948 break;
3949#endif
3825 case XTerm_font: 3950 case XTerm_font:
3826 op = URxvt_font; 3951 op = URxvt_font;
3827 case URxvt_font: 3952 case URxvt_font:
3828#if ENABLE_STYLES 3953#if ENABLE_STYLES
3829 case URxvt_boldFont: 3954 case URxvt_boldFont:
3830 case URxvt_italicFont: 3955 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3956 case URxvt_boldItalicFont:
3832#endif 3957#endif
3833 if (query) 3958 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3959 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3961 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3962 resp);
3838 else 3963 else
3839 { 3964 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3965 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3966
… …
3844 set_fonts (); 3969 set_fonts ();
3845 } 3970 }
3846 break; 3971 break;
3847 3972
3848#if ENABLE_FRILLS 3973#if ENABLE_FRILLS
3849 case XTerm_locale: 3974 case URxvt_locale:
3850 if (query) 3975 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3852 else 3977 else
3853 { 3978 {
3854 set_locale (str); 3979 set_locale (str);
3855# ifdef USE_XIM 3980 pty.set_utf8_mode (enc_utf8);
3856 im_cb (); 3981 init_xlocale ();
3857# endif
3858 } 3982 }
3859 break; 3983 break;
3860#endif
3861 3984
3862#ifdef MENUBAR 3985 case URxvt_view_up:
3863 case XTerm_Menu: 3986 case URxvt_view_down:
3864 if (options & Opt_insecure) 3987 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3988 int lines = atoi (str);
3989
3990 if (lines)
3991 scr_page (op == URxvt_view_up ? UP : DN, lines);
3992 else
3993 scr_erase_savelines ();
3994 }
3995
3866 break; 3996 break;
3867#endif 3997#endif
3868#if 0 3998
3869 case XTerm_dumpscreen: /* no error notices */ 3999#if ENABLE_PERL
3870 { 4000 case URxvt_perl:
3871 int fd; 4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4002 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 4003 break;
3879#endif 4004#endif
3880 } 4005 }
3881} 4006}
3882/*----------------------------------------------------------------------*/ 4007/*----------------------------------------------------------------------*/
… …
3934 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 4064 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 4068#endif
… …
3991 } 4113 }
3992 4114
3993 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
3994 switch (arg[i]) 4116 switch (arg[i])
3995 { 4117 {
4118#if ENABLE_STYLES
4119 case 1021:
4120 set_option (Opt_intensityStyles, mode);
4121
4122 scr_touch (true);
4123 break;
4124#endif
3996 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
3997 case 1049: 4126 case 1049:
3998 if (options & Opt_secondaryScreen) 4127 if (OPTION (Opt_secondaryScreen))
3999 if (mode == 0) 4128 if (mode == 0)
4000 scr_cursor (RESTORE); 4129 scr_cursor (RESTORE);
4001 else if (mode == 1) 4130 else if (mode == 1)
4002 scr_cursor (SAVE); 4131 scr_cursor (SAVE);
4003 break; 4132 break;
… …
4015 */ 4144 */
4016 PrivMode (1, PrivMode_vt52); 4145 PrivMode (1, PrivMode_vt52);
4017 break; 4146 break;
4018 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4150 break;
4022 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 4152 set_option (Opt_jumpScroll, !state);
4027 break; 4153 break;
4028 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4030 break; 4156 break;
4031 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
… …
4037 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4041 break; 4167 break;
4042#ifdef menuBar_esc
4043 case menuBar_esc:
4044#ifdef MENUBAR
4045 map_menuBar (state);
4046#endif
4047 break;
4048#endif
4049#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4050 case scrollBar_esc: 4169 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4052 { 4171 {
4053 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
… …
4072#if 0 4191#if 0
4073 case 1001: 4192 case 1001:
4074 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4075#endif 4194#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 4196 set_option (Opt_scrollTtyOutput, !state);
4081 break; 4197 break;
4082 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 4199 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 4200 break;
4088 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 4202 if (OPTION (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 4204 scr_erase_screen (2);
4092 scr_change_screen (state); 4205 scr_change_screen (state);
4093 break; 4206 break;
4094 case 1049: /* secondary screen w/ clearing first */ 4207 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 4208 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 4209 if (OPTION (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 4210 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 4211 scr_erase_screen (2);
4099 break; 4212 break;
4100 default: 4213 default:
4101 break; 4214 break;
… …
4229 scr_color (Color_bg, Color_bg); 4342 scr_color (Color_bg, Color_bg);
4230 break; 4343 break;
4231 4344
4232 //case 50: // not variable spacing 4345 //case 50: // not variable spacing
4233 4346
4234#ifndef NO_BRIGHTCOLOR 4347#if ENABLE_FRILLS
4235 case 90: 4348 case 90:
4236 case 91: /* set bright fg color */ 4349 case 91: /* set bright fg color */
4237 case 92: 4350 case 92:
4238 case 93: 4351 case 93:
4239 case 94: 4352 case 94:
… …
4251 case 106: 4364 case 106:
4252 case 107: 4365 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 4367 break;
4255#endif 4368#endif
4256
4257 } 4369 }
4258 } 4370 }
4259} 4371}
4260/*}}} */ 4372/*}}} */
4261 4373
… …
4285 */ 4397 */
4286void 4398void
4287rxvt_term::tt_printf (const char *fmt,...) 4399rxvt_term::tt_printf (const char *fmt,...)
4288{ 4400{
4289 va_list arg_ptr; 4401 va_list arg_ptr;
4290 unsigned char buf[256]; 4402 char buf[256];
4291 4403
4292 va_start (arg_ptr, fmt); 4404 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4405 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 4406 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 4407 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 4412 * or generated by us in response to a query ESC sequence.
4301 */ 4413 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 4415
4304void 4416void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 4418{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return;
4421
4422 if (pty.pty < 0)
4423 return;
4424
4307 if (v_buflen == 0) 4425 if (v_buflen == 0)
4308 { 4426 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4310 4428
4311 if ((unsigned int)written == len) 4429 if ((unsigned int)written == len)
… …
4313 4431
4314 data += written; 4432 data += written;
4315 len -= written; 4433 len -= written;
4316 } 4434 }
4317 4435
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4436 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4437
4320 memcpy (v_buffer + v_buflen, data, len); 4438 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4439 v_buflen += len;
4322 4440
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4441 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4342 } 4460 }
4343 4461
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4462 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4463 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4464 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4465 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4466}
4350 4467
4351/*----------------------- end-of-file (C source) -----------------------*/ 4468/*----------------------- end-of-file (C source) -----------------------*/
4352 4469

Diff Legend

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