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

Diff Legend

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