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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC

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

Diff Legend

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