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

Diff Legend

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