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

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

Diff Legend

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