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.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.239 by root, Fri Jan 6 03:02:22 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;
… …
827 } 870 }
828 871
829 if (len <= 0) 872 if (len <= 0)
830 return; /* not mapped */ 873 return; /* not mapped */
831 874
832 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 876 if (view_start)
834 { 877 {
835 TermWin.view_start = 0; 878 view_start = 0;
836 want_refresh = 1; 879 want_refresh = 1;
837 } 880 }
838 881
839 /* 882 /*
840 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 898#ifdef META8_OPTION
856 && meta_char == C0_ESC 899 && meta_char == C0_ESC
857#endif 900#endif
858 ) 901 )
859 { 902 {
860 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
861 tt_write (&ch, 1); 904 tt_write (&ch, 1);
862 } 905 }
863 906
864#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
873#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
875} 918}
876/*}}} */ 919/*}}} */
877 920
878#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
881unsigned int 924unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 926{
884 unsigned int n, s; 927 unsigned int n, s;
885 928
886 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 949
907 cmd_parse (); 950 cmd_parse ();
908 951
909 return 0; 952 return 0;
910} 953}
911#endif /* MENUBAR_MAX */ 954#endif
912 955
913void 956void
914rxvt_term::flush () 957rxvt_term::flush ()
915{ 958{
916 flush_ev.stop (); 959 flush_ev.stop ();
… …
924 } 967 }
925#endif 968#endif
926 969
927 if (want_refresh) 970 if (want_refresh)
928 { 971 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
929 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
930 scrollbar_show (1); 1012 scrollbar_show (1);
931#ifdef USE_XIM 1013#ifdef USE_XIM
932 IMSendSpot (); 1014 IMSendSpot ();
933#endif 1015#endif
… …
943 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
944 1026
945 display->flush (); 1027 display->flush ();
946 1028
947 if (want_refresh && !flush_ev.active) 1029 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 1031}
950 1032
951void 1033void
952rxvt_term::flush_cb (time_watcher &w) 1034rxvt_term::flush_cb (time_watcher &w)
953{ 1035{
… …
1017{ 1099{
1018 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1103 {
1104 if (view_start == nsaved ||
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0;
1107
1022 refresh_type |= SMOOTH_REFRESH; 1108 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1109 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1111 }
1026} 1112}
1027#endif 1113#endif
1028 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
1029bool 1133bool
1030rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
1031{ 1135{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1137
1034 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
1035 { 1139 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1141 n = 0;
1038 } 1142 }
1039 1143
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1146 cmdbuf_endp = cmdbuf_ptr + n;
1043 1147
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1045 1149
1046 if (n > 0) 1150 if (r > 0)
1047 { 1151 {
1048 cmdbuf_endp += n; 1152 cmdbuf_endp += r;
1049 return true; 1153 return true;
1050 } 1154 }
1051 else if (n < 0 && errno != EAGAIN) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 {
1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1160#endif
1161 }
1162 else
1163 {
1164 pty_ev.stop ();
1165
1166 if (!OPTION (Opt_hold))
1052 destroy (); 1167 destroy ();
1168 }
1053 1169
1054 return false; 1170 return false;
1055} 1171}
1056 1172
1057void 1173void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1174rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1175{
1060 SET_R (this); 1176 SET_R (this);
1061 SET_LOCALE (locale); 1177 SET_LOCALE (locale);
1062 1178
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1179 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1180 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1181 while (pty_fill ())
1068 if (cmd_parse ()) 1182 if (cmd_parse ())
1069 break; 1183 break;
1184
1185 if (revents & EVENT_WRITE)
1186 pty_write ();
1070} 1187}
1071 1188
1072void 1189void
1073rxvt_term::pointer_unblank () 1190rxvt_term::pointer_unblank ()
1074{ 1191{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1192 XDefineCursor (display->display, vt, TermWin_cursor);
1076 recolour_cursor (); 1193 recolour_cursor ();
1077 1194
1078#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1196 hidden_pointer = 0;
1080 1197
1081 if (options & Opt_pointerBlank) 1198 if (OPTION (Opt_pointerBlank))
1082 pointer_ev.start (NOW + pointerBlankDelay); 1199 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif 1200#endif
1084} 1201}
1085 1202
1086#ifdef POINTER_BLANK 1203#ifdef POINTER_BLANK
1087void 1204void
1088rxvt_term::pointer_blank () 1205rxvt_term::pointer_blank ()
1089{ 1206{
1090 if (! (options & Opt_pointerBlank)) 1207 if (! OPTION (Opt_pointerBlank))
1091 return; 1208 return;
1092 1209
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1210 XDefineCursor (display->display, vt, display->blank_cursor);
1094 XFlush (display->display); 1211 XFlush (display->display);
1095 1212
1096 hidden_pointer = 1; 1213 hidden_pointer = 1;
1097} 1214}
1098 1215
… …
1187 1304
1188/*{{{ process an X event */ 1305/*{{{ process an X event */
1189void 1306void
1190rxvt_term::x_cb (XEvent &ev) 1307rxvt_term::x_cb (XEvent &ev)
1191{ 1308{
1309 dDisp;
1310
1192 SET_R (this); 1311 SET_R (this);
1193 SET_LOCALE (locale); 1312 SET_LOCALE (locale);
1194 1313
1195#if defined(CURSOR_BLINK) 1314#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1197 { 1316 {
1198 if (hidden_cursor) 1317 if (hidden_cursor)
1199 { 1318 {
1200 hidden_cursor = 0; 1319 hidden_cursor = 0;
1201 want_refresh = 1; 1320 want_refresh = 1;
… …
1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1205 } 1324 }
1206#endif 1325#endif
1207 1326
1208#if defined(POINTER_BLANK) 1327#if defined(POINTER_BLANK)
1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1210 { 1329 {
1211 if (ev.type == MotionNotify 1330 if (ev.type == MotionNotify
1212 || ev.type == ButtonPress 1331 || ev.type == ButtonPress
1213 || ev.type == ButtonRelease) 1332 || ev.type == ButtonRelease)
1214 if (hidden_pointer) 1333 if (hidden_pointer)
… …
1217 if (ev.type == KeyPress && hidden_pointer == 0) 1336 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank (); 1337 pointer_blank ();
1219 } 1338 }
1220#endif 1339#endif
1221 1340
1222 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1343 unsigned int unused_mask;
1225 1344
1226 switch (ev.type) 1345 switch (ev.type)
1227 { 1346 {
1228 case KeyPress: 1347 case KeyPress:
1229#if ISO_14755 1348#if ISO_14755
… …
1312 button_release (ev.xbutton); 1431 button_release (ev.xbutton);
1313 break; 1432 break;
1314 1433
1315 case ClientMessage: 1434 case ClientMessage:
1316 if (ev.xclient.format == 32 1435 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1437 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1438 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1439 destroy ();
1440#if ENABLE_EWMH
1441 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442 XSendEvent (disp, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &ev);
1445#endif
1446 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1319#ifdef OFFIX_DND 1456#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1457 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1459 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1460 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1461 || ev.xclient.data.l[0] == DndLink))
1325 { 1462 {
1326 /* Get Dnd data */ 1463 /* Get Dnd data */
1327 Atom ActualType; 1464 Atom ActualType;
1328 int ActualFormat; 1465 int ActualFormat;
1329 unsigned char *data; 1466 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1467 unsigned long Size, RemainingBytes;
1331 1468
1332 XGetWindowProperty (display->display, display->root, 1469 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1470 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1471 0L, 1000000L,
1335 False, AnyPropertyType, 1472 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1473 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1474 &Size, &RemainingBytes,
1338 &data); 1475 &data);
1339 XChangeProperty (display->display, display->root, 1476 set_string_property (XA_CUT_BUFFER0, data);
1340 XA_CUT_BUFFER0, XA_STRING,
1341 8, PropModeReplace,
1342 data, strlen (data));
1343 XFree (data); 1477 XFree (data);
1344 selection_paste (display->root, XA_CUT_BUFFER0, True); 1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346 } 1480 }
1347#endif /* OFFIX_DND */ 1481#endif /* OFFIX_DND */
1348 break; 1482 break;
1349 1483
1350 case MappingNotify: 1484 case MappingNotify:
… …
1375 break; 1509 break;
1376 } 1510 }
1377 break; 1511 break;
1378 1512
1379 case FocusIn: 1513 case FocusIn:
1380 if (!TermWin.focus) 1514 focus_in ();
1515 break;
1516
1517 case FocusOut:
1518 focus_out ();
1519 break;
1520
1521 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0])
1381 { 1523 {
1382 TermWin.focus = 1;
1383 want_refresh = 1;
1384#ifdef USE_XIM
1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1388 XSetICFocus (Input_Context);
1389 }
1390#endif
1391#ifdef CURSOR_BLINK
1392 if (options & Opt_cursorBlink)
1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1401#endif
1402
1403 }
1404 break;
1405
1406 case FocusOut:
1407 if (TermWin.focus)
1408 {
1409 TermWin.focus = 0;
1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1418#ifdef USE_XIM
1419 if (Input_Context != NULL)
1420 XUnsetICFocus (Input_Context);
1421#endif
1422#ifdef CURSOR_BLINK
1423 if (options & Opt_cursorBlink)
1424 cursor_blink_ev.stop ();
1425 hidden_cursor = 0;
1426#endif
1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1434 }
1435 break;
1436
1437 case ConfigureNotify:
1438 if (ev.xconfigure.window == TermWin.parent[0])
1439 {
1440 int height, width;
1441
1442 do
1443 { /* Wrap lots of configures into one */
1444 width = ev.xconfigure.width;
1445 height = ev.xconfigure.height;
1446 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447 }
1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ;
1449 1526
1450 if (szHint.width != width || szHint.height != height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451 { 1528 {
1452 seen_resize = 1; 1529 seen_resize = 1;
1453 resize_all_windows (width, height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454 } 1531 }
1455 1532
1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457 if (options & Opt_transparent) 1534 if (OPTION (Opt_transparent))
1458 {
1459 check_our_parents (); 1535 check_our_parents ();
1460 if (am_transparent)
1461 want_refresh = want_full_refresh = 1;
1462 }
1463#endif 1536#endif
1464 } 1537 }
1465 break; 1538 break;
1466 1539
1467 case PropertyNotify: 1540 case PropertyNotify:
… …
1475 selection_clear (); 1548 selection_clear ();
1476 break; 1549 break;
1477 1550
1478 case SelectionNotify: 1551 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1552 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, 1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 ev.xselection.property, True);
1482 break; 1554 break;
1483 1555
1484 case SelectionRequest: 1556 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1486 break; 1558 break;
1487 1559
1488 case UnmapNotify: 1560 case UnmapNotify:
1489 TermWin.mapped = 0; 1561 mapped = 0;
1490#ifdef TEXT_BLINK 1562#ifdef TEXT_BLINK
1491 text_blink_ev.stop (); 1563 text_blink_ev.stop ();
1492#endif 1564#endif
1493 break; 1565 break;
1494 1566
1495 case MapNotify: 1567 case MapNotify:
1496 TermWin.mapped = 1; 1568 mapped = 1;
1497#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1498 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1499#endif 1571#endif
1500 break; 1572 break;
1501 1573
… …
1505 break; 1577 break;
1506#endif /* TRANSPARENT */ 1578#endif /* TRANSPARENT */
1507 1579
1508 case GraphicsExpose: 1580 case GraphicsExpose:
1509 case Expose: 1581 case Expose:
1510 if (ev.xany.window == TermWin.vt) 1582 if (ev.xany.window == vt)
1511 { 1583 {
1512 do 1584 do
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1585 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1586 ev.xexpose.width, ev.xexpose.height, False);
1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1516 1588
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518 1590
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1520 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1521 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1522 1594
1523 scr_refresh (refresh_type); 1595 scr_refresh (refresh_type);
1524 } 1596 }
1525 else 1597 else
1526 { 1598 {
1527 XEvent unused_event; 1599 XEvent unused_event;
1528 1600
1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530 ; 1602 ;
1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1604 ;
1533 1605
1534 if (isScrollbarWindow (ev.xany.window)) 1606 if (isScrollbarWindow (ev.xany.window))
1535 { 1607 {
1536 scrollBar.setIdle (); 1608 scrollBar.setIdle ();
… …
1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1541 menubar_expose (); 1613 menubar_expose ();
1542#endif 1614#endif
1543 1615
1544#ifdef TRANSPARENT 1616#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1617 if (am_transparent && ev.xany.window == parent[0])
1546 XClearWindow (display->display, ev.xany.window); 1618 XClearWindow (disp, ev.xany.window);
1547#endif 1619#endif
1548 } 1620 }
1549 break; 1621 break;
1550 1622
1551 case MotionNotify: 1623 case MotionNotify:
… …
1561 } 1633 }
1562#endif 1634#endif
1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1564 break; 1636 break;
1565 1637
1566 if (ev.xany.window == TermWin.vt) 1638 if (ev.xany.window == vt)
1567 { 1639 {
1568 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1640 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1641 {
1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1571 ; 1643 ;
1572 1644
1573 XQueryPointer (display->display, TermWin.vt, 1645 XQueryPointer (disp, vt,
1574 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1649 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
… …
1590#endif 1662#endif
1591 selection_extend (ev.xbutton.x, ev.xbutton.y, 1663 selection_extend (ev.xbutton.x, ev.xbutton.y,
1592 ev.xbutton.state & Button3Mask ? 2 : 0); 1664 ev.xbutton.state & Button3Mask ? 2 : 0);
1593 1665
1594#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1595 if (ev.xbutton.y < TermWin.int_bwidth 1667 if (ev.xbutton.y < int_bwidth
1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1668 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1597 { 1669 {
1598 int dist; 1670 int dist;
1599 1671
1600 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
… …
1609 selection_save_x = ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
1610 selection_save_y = ev.xbutton.y; 1682 selection_save_y = ev.xbutton.y;
1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1683 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1612 1684
1613 /* calc number of lines to scroll */ 1685 /* calc number of lines to scroll */
1614 if (ev.xbutton.y < TermWin.int_bwidth) 1686 if (ev.xbutton.y < int_bwidth)
1615 { 1687 {
1616 scroll_selection_dir = UP; 1688 scroll_selection_dir = UP;
1617 dist = TermWin.int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1618 } 1690 }
1619 else 1691 else
1620 { 1692 {
1621 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1694 dist = ev.xbutton.y - (int_bwidth + height);
1623 } 1695 }
1624 1696
1625 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1626 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1; 1699 + 1;
1628 MIN_IT (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1629 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1630 } 1702 }
1631 else 1703 else
1632 { 1704 {
1633 /* we are within the text window, so we 1705 /* we are within the text window, so we
… …
1642#endif 1714#endif
1643 } 1715 }
1644 } 1716 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1718 {
1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1719 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648 MotionNotify, &ev)) 1720 MotionNotify, &ev))
1649 ; 1721 ;
1650 1722
1651 XQueryPointer (display->display, scrollBar.win, 1723 XQueryPointer (disp, scrollBar.win,
1652 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1726 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1727 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1661 } 1733 }
1662 break; 1734 break;
1663 } 1735 }
1664} 1736}
1665 1737
1738void
1739rxvt_term::focus_in ()
1740{
1741 if (!focus)
1742 {
1743 focus = 1;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 {
1751 IMSetStatusPosition ();
1752 XSetICFocus (Input_Context);
1753 }
1754#endif
1755#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1758#endif
1759#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade])
1761 {
1762 pix_colors = pix_colors_focused;
1763 scr_recolour ();
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1805}
1806
1666#if TRANSPARENT 1807#if TRANSPARENT
1667void 1808void
1668rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1669{ 1810{
1670 SET_R (this); 1811 SET_R (this);
… …
1675 case PropertyNotify: 1816 case PropertyNotify:
1676 /* 1817 /*
1677 * if user used some Esetroot compatible prog to set the root bg, 1818 * if user used some Esetroot compatible prog to set the root bg,
1678 * use the property to determine the pixmap. We use it later on. 1819 * use the property to determine the pixmap. We use it later on.
1679 */ 1820 */
1680 if (xa[XA_XROOTPMAPID] == 0)
1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1821 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684 return; 1823 return;
1685 1824
1686 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1687 case ReparentNotify: 1826 case ReparentNotify:
1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1689 want_refresh = want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1690 break; 1829 break;
1691 } 1830 }
1692} 1831}
1693#endif 1832#endif
… …
1696rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1697{ 1836{
1698 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1699 1838
1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1701 if (!bypass_keystate) 1841 if (!bypass_keystate)
1702 reportmode = !! (priv_modes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703 1843
1704 /* 1844 /*
1705 * VT window processing of button press 1845 * VT window processing of button press
1706 */ 1846 */
1707 if (ev.window == TermWin.vt) 1847 if (ev.window == vt)
1708 { 1848 {
1709#if ISO_14755 1849#if ISO_14755
1710 // 5.4 1850 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 { 1852 {
… …
1754 else 1894 else
1755 { 1895 {
1756 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1757 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1758 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1759 switch (ev.button) 1900 switch (ev.button)
1760 { 1901 {
1761 case Button1: 1902 case Button1:
1762 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1764#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1766#else 1907#else
1767 selection.rect = false; 1908 selection.rect = false;
1768#endif 1909#endif
1769 1910
1770 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1772 { 1913 {
1773 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1774 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1775 else 1916 else
1776 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1777 } 1918 }
1778 else 1919 else
1779 { 1920 {
1780 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1781 MEvent.clicks++; 1922 MEvent.clicks++;
1782 else 1923 else
1783 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1784 1925
1785 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1786 } 1927 }
1787 1928
1788 MEvent.button = Button1; 1929 MEvent.button = Button1;
1789 break; 1930 break;
1790 1931
1791 case Button3: 1932 case Button3:
1792 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1793 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1794 else 1935 else
1795 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1796 1937
1797 MEvent.button = Button3; 1938 MEvent.button = Button3;
1798 break; 1939 break;
1799 } 1940 }
1800 } 1941 }
1801 1942
1802 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1803 return; 1944 return;
1804 } 1945 }
1805 1946
… …
1917 case Button3: 2058 case Button3:
1918 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1919 { 2060 {
1920 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1921# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1922 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1923# else 2064# else
1924 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1925# endif 2066# endif
1926 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1927# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1928 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1929# else 2070# else
1930 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1931# endif 2072# endif
1932 else 2073 else
1933 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1934 } 2075 }
1935 else 2076 else
1936 { 2077 {
1937 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1938 (TermWin.nrow 2079 (nrow
1939 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1940 / scrollbar_size ())); 2081 / scrollbar_size ()));
1941 } 2082 }
1942 2083
1943 break; 2084 break;
… …
1975#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
1976 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
1978#endif 2119#endif
1979 2120
1980 if (ev.window == TermWin.vt) 2121 if (ev.window == vt)
1981 { 2122 {
1982#if ISO_14755 2123#if ISO_14755
1983 // 5.4 2124 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return; 2126 return;
… …
2035 2176
2036 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2037 2178
2038 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2039 i = 1; 2180 i = 1;
2040 else if (options & Opt_mouseWheelScrollPage) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
2041 i = TermWin.nrow - 1; 2182 i = nrow - 1;
2042 else 2183 else
2043 i = 5; 2184 i = 5;
2044 2185
2045# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
2046 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
2047 { 2188 {
2048 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2051 2192
2052 if (slip_wheel_ev.at < NOW) 2193 if (slip_wheel_ev.at < NOW)
2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054 2195
2055 slip_wheel_ev.start (); 2196 slip_wheel_ev.start ();
… …
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i; 2240 int i;
2100 2241
2101 Visual* visual = display->visual; 2242 Visual *visual = display->visual;
2102 2243
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104 2245
2105 /* for convenience */ 2246 /* for convenience */
2106 mask_r = visual->red_mask; 2247 mask_r = visual->red_mask;
… …
2327 Atom atype; 2468 Atom atype;
2328 unsigned char *prop = NULL; 2469 unsigned char *prop = NULL;
2329 Window root, oldp, *list; 2470 Window root, oldp, *list;
2330 Pixmap rootpixmap = None; 2471 Pixmap rootpixmap = None;
2331 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2332 2474
2333 pchanged = 0; 2475 pchanged = 0;
2334 2476
2335 if (!(options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
2336 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
2337 2479
2338 XGetWindowAttributes (display->display, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
2339 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
2340 2482
2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2483 XGetWindowAttributes (disp, parent[0], &wattr);
2342 2484
2343 if (rootdepth != wattr.depth) 2485 if (rootdepth != wattr.depth)
2344 { 2486 {
2345 if (am_transparent) 2487 if (am_transparent)
2346 { 2488 {
2347 pchanged = 1; 2489 pchanged = 1;
2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2349 am_transparent = am_pixmap_trans = 0; 2491 am_transparent = am_pixmap_trans = 0;
2350 } 2492 }
2351 2493
2352 return pchanged; /* Don't try any more */ 2494 return pchanged; /* Don't try any more */
2353 } 2495 }
2354 2496
2355 /* Get all X ops out of the queue so that our information is up-to-date. */ 2497 /* Get all X ops out of the queue so that our information is up-to-date. */
2356 XSync (display->display, False); 2498 XSync (disp, False);
2357 2499
2358 /* 2500 /*
2359 * Make the frame window set by the window manager have 2501 * Make the frame window set by the window manager have
2360 * the root background. Some window managers put multiple nested frame 2502 * the root background. Some window managers put multiple nested frame
2361 * windows for each client, so we have to take care about that. 2503 * windows for each client, so we have to take care about that.
2362 */ 2504 */
2363 i = (xa[XA_XROOTPMAPID] 2505 i = (xa[XA_XROOTPMAP_ID]
2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366 &nitems, &bytes_after, &prop) == Success); 2508 &nitems, &bytes_after, &prop) == Success);
2367 2509
2368 if (!i || prop == NULL) 2510 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID] 2511 i = (xa[XA_ESETROOT_PMAP_ID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success); 2514 &nitems, &bytes_after, &prop) == Success);
2373 2515
2374 if (!i || prop == NULL 2516 if (!i || prop == NULL
2375#if TINTING 2517#if TINTING
… …
2394 Window cr; 2536 Window cr;
2395 XImage *image; 2537 XImage *image;
2396 GC gc; 2538 GC gc;
2397 XGCValues gcvalue; 2539 XGCValues gcvalue;
2398 2540
2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2541 XTranslateCoordinates (disp, parent[0], display->root,
2400 0, 0, &sx, &sy, &cr); 2542 0, 0, &sx, &sy, &cr);
2401 nw = (unsigned int)szHint.width; 2543 nw = (unsigned int)szHint.width;
2402 nh = (unsigned int)szHint.height; 2544 nh = (unsigned int)szHint.height;
2403 nx = ny = 0; 2545 nx = ny = 0;
2404 2546
… …
2414 nh += sy; 2556 nh += sy;
2415 ny = -sy; 2557 ny = -sy;
2416 sy = 0; 2558 sy = 0;
2417 } 2559 }
2418 2560
2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563
2564 XSync (disp, False);
2421 allowedxerror = -1; 2565 allowedxerror = -1;
2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423 2567
2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2425 /* XXX: may need a delay here? */ 2569 /* XXX: may need a delay here? */
2426 allowedxerror = 0; 2570 allowedxerror = 0;
2427 2571
2428 if (image == NULL) 2572 if (image == NULL)
2429 { 2573 {
2430 if (am_transparent && am_pixmap_trans) 2574 if (am_transparent && am_pixmap_trans)
2431 { 2575 {
2432 pchanged = 1; 2576 pchanged = 1;
2433 if (TermWin.pixmap != None) 2577 if (pixmap != None)
2434 { 2578 {
2435 XFreePixmap (display->display, TermWin.pixmap); 2579 XFreePixmap (disp, pixmap);
2436 TermWin.pixmap = None; 2580 pixmap = None;
2437 } 2581 }
2438 } 2582 }
2439 2583
2440 am_pixmap_trans = 0; 2584 am_pixmap_trans = 0;
2441 } 2585 }
2442 else 2586 else
2443 { 2587 {
2444 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2445 XFreePixmap (display->display, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
2446 2590
2447#if TINTING 2591#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint)) 2592 if (ISSET_PIXCOLOR (Color_tint))
2449 { 2593 {
2450 unsigned short rm, gm, bm; 2594 unsigned short rm, gm, bm;
… …
2454 2598
2455 ShadeXImage (display, image, shade, rm, gm, bm); 2599 ShadeXImage (display, image, shade, rm, gm, bm);
2456 } 2600 }
2457#endif 2601#endif
2458 2602
2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2603 pixmap = XCreatePixmap (disp, vt,
2460 szHint.width, szHint.height, image->depth); 2604 szHint.width, szHint.height, image->depth);
2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2463 nx, ny, image->width, image->height); 2607 nx, ny, image->width, image->height);
2464 XFreeGC (display->display, gc); 2608 XFreeGC (disp, gc);
2465 XDestroyImage (image); 2609 XDestroyImage (image);
2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2467 XClearWindow (display->display, TermWin.parent[0]); 2611 XClearWindow (disp, parent[0]);
2468 2612
2469 if (!am_transparent || !am_pixmap_trans) 2613 if (!am_transparent || !am_pixmap_trans)
2470 pchanged = 1; 2614 pchanged = 1;
2471 2615
2472 am_transparent = am_pixmap_trans = 1; 2616 am_transparent = am_pixmap_trans = 1;
2473 } 2617 }
2474 } 2618 }
2475 2619
2476 if (!am_pixmap_trans) 2620 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2622 else
2477 { 2623 {
2478 unsigned int n; 2624 unsigned int n;
2479 /* 2625 /*
2480 * InheritPixmap transparency 2626 * InheritPixmap transparency
2481 */ 2627 */
2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2483 { 2629 {
2484 oldp = TermWin.parent[i]; 2630 oldp = parent[i];
2485 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2631 XQueryTree (disp, parent[i - 1], &root,
2486 &TermWin.parent[i], &list, &n); 2632 &parent[i], &list, &n);
2487 XFree (list); 2633 XFree (list);
2488 2634
2489 if (TermWin.parent[i] == display->root) 2635 if (parent[i] == display->root)
2490 { 2636 {
2491 if (oldp != None) 2637 if (oldp != None)
2492 pchanged = 1; 2638 pchanged = 1;
2493 2639
2494 break; 2640 break;
2495 } 2641 }
2496 2642
2497 if (oldp != TermWin.parent[i]) 2643 if (oldp != parent[i])
2498 pchanged = 1; 2644 pchanged = 1;
2499 } 2645 }
2500 2646
2501 n = 0; 2647 n = 0;
2502 2648
2503 if (pchanged) 2649 if (pchanged)
2504 { 2650 {
2505 for (; n < (unsigned int)i; n++) 2651 for (; n < (unsigned int)i; n++)
2506 { 2652 {
2507 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2653 XGetWindowAttributes (disp, parent[n], &wattr);
2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2509 { 2655 {
2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2511 break; 2657 break;
2512 } 2658 }
2513 } 2659 }
2514 } 2660 }
2515 2661
2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2517 { 2663 {
2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2520 am_transparent = 0; 2666 am_transparent = 0;
2521 /* XXX: also turn off Opt_transparent? */ 2667 /* XXX: also turn off Opt_transparent? */
2522 } 2668 }
2523 else 2669 else
2524 { 2670 {
… …
2527 * needed for fvwm2.2.2 (and before?) */ 2673 * needed for fvwm2.2.2 (and before?) */
2528 sleep (1); 2674 sleep (1);
2529#endif 2675#endif
2530 for (n = 0; n < (unsigned int)i; n++) 2676 for (n = 0; n < (unsigned int)i; n++)
2531 { 2677 {
2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2533 XClearWindow (display->display, TermWin.parent[n]); 2679 XClearWindow (disp, parent[n]);
2534 } 2680 }
2535 2681
2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2537 am_transparent = 1; 2683 am_transparent = 1;
2538 } 2684 }
2539 2685
2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2541 TermWin.parent[i] = None; 2687 parent[i] = None;
2542 } 2688 }
2543 2689
2544 if (scrollBar.win) 2690 if (scrollBar.win)
2545 { 2691 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle (); 2693 scrollBar.setIdle ();
2548 scrollbar_show (0); 2694 scrollbar_show (0);
2549 } 2695 }
2550 2696
2697 if (am_transparent)
2698 {
2699 want_refresh = want_full_refresh = 1;
2700 if (am_pixmap_trans)
2701 flush ();
2702 }
2703
2551 return pchanged; 2704 return pchanged;
2552} 2705}
2553#endif 2706#endif
2554 2707
2555/*}}} */ 2708/*}}} */
… …
2557bool 2710bool
2558rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2559{ 2712{
2560 bool flag = false; 2713 bool flag = false;
2561 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2562 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2563 2716
2564 for (;;) 2717 for (;;)
2565 { 2718 {
2566 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2567 { 2720 {
2568 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2569 ch = next_char (); 2722 ch = next_char ();
2570 }
2571 2723
2572 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2573 break; 2725 break;
2726 }
2574 2727
2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2576 { 2729 {
2577 if (!seen_input) 2730 if (!seen_input)
2578 { 2731 {
… …
2582 // some window managers resize the window early, and these programs 2735 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong. 2736 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike 2737 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being 2738 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized. 2739 // resized.
2587 if (seen_resize) 2740 if (seen_resize && cmd_pid)
2588 kill (-cmd_pid, SIGWINCH); 2741 kill (-cmd_pid, SIGWINCH);
2589 } 2742 }
2590 2743
2591 /* Read a text string from the input buffer */ 2744 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ]; 2745 unicode_t buf[UBUFSIZ];
2593 bool refreshnow = false; 2746 bool refreshnow = false;
2594 int nlines = 0; 2747 int nlines = 0;
2595 unicode_t *str = buf; 2748 unicode_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ);
2596 2750
2597 for (;;) 2751 for (;;)
2598 { 2752 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break; 2754 break;
2601 2755
2602 *str++ = ch; 2756 *str++ = ch;
2603 2757
2604 if (ch == C0_LF) 2758 if (ch == C0_LF || str >= eol)
2605 { 2759 {
2760 if (ch == C0_LF)
2606 nlines++; 2761 nlines++;
2762
2607 refresh_count++; 2763 refresh_count++;
2608 2764
2609 if (!(options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2611 { 2767 {
2612 refreshnow = true; 2768 refreshnow = true;
2769 refresh_count = 0;
2613 ch = NOCHAR; 2770 ch = NOCHAR;
2614 break; 2771 break;
2615 } 2772 }
2616 2773
2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2618 if (nlines >= TermWin.nrow - 1) 2775 if (nlines >= nrow - 1)
2619 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2620 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2621 nlines = 0; 2780 nlines = 0;
2622 str = buf; 2781 str = buf;
2782 eol = str + min (ncol, UBUFSIZ);
2623 } 2783 }
2624 }
2625 2784
2626 if (str >= buf + UBUFSIZ) 2785 if (str >= eol)
2627 { 2786 {
2787 if (eol >= buf + UBUFSIZ)
2788 {
2628 ch = NOCHAR; 2789 ch = NOCHAR;
2629 break; 2790 break;
2791 }
2792 else
2793 eol = min (eol + ncol, buf + UBUFSIZ);
2794 }
2795
2630 } 2796 }
2631 2797
2632 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2633 ch = next_char (); 2799 ch = next_char ();
2634 } 2800 }
2635 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2636 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2637 2804
2638 /* 2805 /*
2639 * If there have been a lot of new lines, then update the screen 2806 * If there have been a lot of new lines, then update the screen
2640 * What the heck I'll cheat and only refresh less than every page-full. 2807 * What the heck I'll cheat and only refresh less than every page-full.
2641 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2642 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2643 */ 2810 */
2644 if (refreshnow) 2811 if (refreshnow)
2645 { 2812 {
2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2647 refresh_limit++; 2814 refresh_limit++;
2648 else 2815 else
2649 { 2816 {
2650 flag = true; 2817 flag = true;
2651 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2652 } 2820 }
2653 } 2821 }
2654 2822
2655 } 2823 }
2656 else 2824 else
… …
2687rxvt_term::next_char () 2855rxvt_term::next_char ()
2688{ 2856{
2689 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2690 { 2858 {
2691 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2692 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2693 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2694 2862
2695 wchar_t wc; 2863 wchar_t wc;
2696 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2697 2865
2698 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2699 { 2867 {
2700 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2701 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2705 if (len == (size_t)-1) 2873 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707 2875
2708 // assume wchar == unicode 2876 // assume wchar == unicode
2709 cmdbuf_ptr += len; 2877 cmdbuf_ptr += len;
2710 return wc; 2878 return wc & UNICODE_MASK;
2711 } 2879 }
2712 2880
2713 return NOCHAR; 2881 return NOCHAR;
2714} 2882}
2715 2883
… …
2840 case C0_ESC: 3008 case C0_ESC:
2841 process_escape_seq (); 3009 process_escape_seq ();
2842 break; 3010 break;
2843 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2844 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2847 else 3014 else
2848 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2849 (unsigned int)strlen (VT100_ANS));
2850 break; 3016 break;
2851 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2852 scr_bell (); 3018 scr_bell ();
2853 break; 3019 break;
2854 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
3042 process_dcs_seq (); 3208 process_dcs_seq ();
3043 break; 3209 break;
3044 3210
3045 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3046 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
3047 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3048 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3049 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
3050 3215
3051 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3052 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
3053 process_csi_seq (); 3218 process_csi_seq ();
… …
3178 { 3343 {
3179 switch (priv) 3344 switch (priv)
3180 { 3345 {
3181 case '>': 3346 case '>':
3182 if (ch == CSI_DA) /* secondary device attributes */ 3347 if (ch == CSI_DA) /* secondary device attributes */
3183 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3184 break; 3349 break;
3185 case '?': 3350 case '?':
3186 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3187 process_terminal_mode (ch, priv, nargs, arg); 3352 process_terminal_mode (ch, priv, nargs, arg);
3188 break; 3353 break;
… …
3293 3458
3294 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3459 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3295 arg[0] = -arg[0]; 3460 arg[0] = -arg[0];
3296 /* FALLTHROUGH */ 3461 /* FALLTHROUGH */
3297 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3299 break; 3464 break;
3300 3465
3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3302 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3303 (unsigned int) (sizeof (VT100_ANS) - 1));
3304 break; 3468 break;
3305 3469
3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3307 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3308 break; 3472 break;
… …
3315 break; 3479 break;
3316 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
3317 scr_report_position (); 3481 scr_report_position ();
3318 break; 3482 break;
3319 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
3320 if (options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
3321 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3322 break; 3486 break;
3323 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3325 break; 3489 break;
… …
3417rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3581rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418{ 3582{
3419 int x, y; 3583 int x, y;
3420 XWindowAttributes wattr; 3584 XWindowAttributes wattr;
3421 Window wdummy; 3585 Window wdummy;
3586 dDisp;
3422 3587
3423 if (nargs == 0) 3588 if (nargs == 0)
3424 return; 3589 return;
3425 3590
3426 switch (args[0]) 3591 switch (args[0])
3427 { 3592 {
3428 /* 3593 /*
3429 * commands 3594 * commands
3430 */ 3595 */
3431 case 1: /* deiconify window */ 3596 case 1: /* deiconify window */
3432 XMapWindow (display->display, TermWin.parent[0]); 3597 XMapWindow (disp, parent[0]);
3433 break; 3598 break;
3434 case 2: /* iconify window */ 3599 case 2: /* iconify window */
3435 XIconifyWindow (display->display, TermWin.parent[0], 3600 XIconifyWindow (disp, parent[0], display->screen);
3436 DefaultScreen (display->display));
3437 break; 3601 break;
3438 case 3: /* set position (pixels) */ 3602 case 3: /* set position (pixels) */
3439 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3603 XMoveWindow (disp, parent[0], args[1], args[2]);
3440 break; 3604 break;
3441 case 4: /* set size (pixels) */ 3605 case 4: /* set size (pixels) */
3442 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443 break; 3607 break;
3444 case 5: /* raise window */ 3608 case 5: /* raise window */
3445 XRaiseWindow (display->display, TermWin.parent[0]); 3609 XRaiseWindow (disp, parent[0]);
3446 break; 3610 break;
3447 case 6: /* lower window */ 3611 case 6: /* lower window */
3448 XLowerWindow (display->display, TermWin.parent[0]); 3612 XLowerWindow (disp, parent[0]);
3449 break; 3613 break;
3450 case 7: /* refresh window */ 3614 case 7: /* refresh window */
3451 scr_touch (true); 3615 scr_touch (true);
3452 break; 3616 break;
3453 case 8: /* set size (chars) */ 3617 case 8: /* set size (chars) */
3454 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3618 set_widthheight ((unsigned int) (args[2] * fwidth),
3455 (unsigned int) (args[1] * TermWin.fheight)); 3619 (unsigned int) (args[1] * fheight));
3456 break; 3620 break;
3457 3621
3458 //case 9: NYI, TODO, restore maximized window or maximize window 3622 //case 9: NYI, TODO, restore maximized window or maximize window
3459 default: 3623 default:
3460 if (args[0] >= 24) /* set height (chars) */ 3624 if (args[0] >= 24) /* set height (chars) */
3461 set_widthheight ((unsigned int)TermWin.width, 3625 set_widthheight ((unsigned int)width,
3462 (unsigned int) (args[1] * TermWin.fheight)); 3626 (unsigned int) (args[1] * fheight));
3463 break; 3627 break;
3464 3628
3465 3629
3466 /* 3630 /*
3467 * reports - some output format copied from XTerm 3631 * reports - some output format copied from XTerm
3468 */ 3632 */
3469 case 11: /* report window state */ 3633 case 11: /* report window state */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472 break; 3636 break;
3473 case 13: /* report window position */ 3637 case 13: /* report window position */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3638 XGetWindowAttributes (disp, parent[0], &wattr);
3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3639 XTranslateCoordinates (disp, parent[0], wattr.root,
3476 -wattr.border_width, -wattr.border_width, 3640 -wattr.border_width, -wattr.border_width,
3477 &x, &y, &wdummy); 3641 &x, &y, &wdummy);
3478 tt_printf ("\033[3;%d;%dt", x, y); 3642 tt_printf ("\033[3;%d;%dt", x, y);
3479 break; 3643 break;
3480 case 14: /* report window size (pixels) */ 3644 case 14: /* report window size (pixels) */
3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483 break; 3647 break;
3484 case 18: /* report text area size (chars) */ 3648 case 18: /* report text area size (chars) */
3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3649 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3486 break; 3650 break;
3487 case 19: /* report window size (chars) */ 3651 case 19: /* report window size (chars) */
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3489 break; 3653 break;
3490 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3491 { 3655 {
3492 char *s; 3656 char *s;
3493 XGetIconName (display->display, TermWin.parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s); 3659 XFree (s);
3496 } 3660 }
3497 break; 3661 break;
3498 case 21: /* report window title */ 3662 case 21: /* report window title */
3499 { 3663 {
3500 char *s; 3664 char *s;
3501 XFetchName (display->display, TermWin.parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s); 3667 XFree (s);
3504 } 3668 }
3505 break; 3669 break;
3506 } 3670 }
3507} 3671}
… …
3510/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3511/* 3675/*
3512 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3513 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3514 */ 3678 */
3515unsigned char * 3679char *
3516rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3517{ 3681{
3518 unicode_t seen_esc = 0, ch; 3682 unicode_t ch;
3683 bool seen_esc = false;
3519 unsigned int n = 0; 3684 unsigned int n = 0;
3520 unsigned char *s;
3521 unsigned char string[STRING_MAX]; 3685 wchar_t string[STRING_MAX];
3522 3686
3523 while ((ch = cmd_getc ()) != NOCHAR) 3687 while ((ch = cmd_getc ()) != NOCHAR)
3524 { 3688 {
3525 if (seen_esc) 3689 if (seen_esc)
3526 { 3690 {
… …
3529 else 3693 else
3530 return NULL; 3694 return NULL;
3531 } 3695 }
3532 else if (ch == C0_ESC) 3696 else if (ch == C0_ESC)
3533 { 3697 {
3534 seen_esc = 1; 3698 seen_esc = true;
3535 continue; 3699 continue;
3536 } 3700 }
3537 else if (ch == C0_BEL || ch == CHAR_ST) 3701 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break; 3702 break;
3539 else if (ch < 0x20) 3703 else if (ch < 0x20)
3540 return NULL; /* other control character - exit */ 3704 return NULL; /* other control character - exit */
3541 3705
3542 seen_esc = 0; 3706 seen_esc = false;
3543 3707
3544 if (n >= sizeof (string) - 1) 3708 if (n >= STRING_MAX - 1)
3545 // stop at some sane length 3709 // stop at some sane length
3546 return NULL; 3710 return NULL;
3547 3711
3548 if (ch == C0_SYN) 3712 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 (); 3713 string[n++] = cmd_get8 ();
… …
3551 string[n++] = ch; 3715 string[n++] = ch;
3552 } 3716 }
3553 3717
3554 string[n++] = '\0'; 3718 string[n++] = '\0';
3555 3719
3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557 return NULL;
3558
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 strncpy (s, string, n); 3721
3561 return s; 3722 return rxvt_wcstombs (string);
3562} 3723}
3563 3724
3564/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3565/* 3726/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3567 */ 3728 */
3568void 3729void
3569rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3570{ 3731{
3571 unsigned char *s; 3732 char *s;
3572 unicode_t eh; 3733 unicode_t eh;
3573 3734
3574 /* 3735 /*
3575 * Not handled yet 3736 * Not handled yet
3576 */ 3737 */
… …
3595 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3596 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3597 3758
3598 if (ch == ';') 3759 if (ch == ';')
3599 { 3760 {
3600 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3601 3762
3602 if (s) 3763 if (s)
3603 { 3764 {
3604 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3605 free (s); 3766 free (s);
3606 } 3767 }
3607 } 3768 }
3608} 3769}
3609 3770
3610void 3771void
3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3612{ 3773{
3613 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3614 { 3775 {
3615 unsigned short r, g, b; 3776 unsigned short r, g, b;
3616 pix_colors_focused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
… …
3620 set_window_color (color, str); 3781 set_window_color (color, str);
3621} 3782}
3622 3783
3623/* 3784/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * 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 */ 3786 */
3648void 3787void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3650{ 3789{
3651 int changed = 0; 3790 int changed = 0;
3652 int color; 3791 int color;
3653 char *buf, *name; 3792 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3794 int saveop = op;
3795 dDisp;
3656 3796
3657 assert (str != NULL); 3797 assert (str != NULL);
3658 switch (op) 3798 switch (op)
3659 { 3799 {
3660 case XTerm_name: 3800 case XTerm_name:
… …
3667 set_title (str); 3807 set_title (str);
3668 break; 3808 break;
3669 case XTerm_property: 3809 case XTerm_property:
3670 if (str[0] == '?') 3810 if (str[0] == '?')
3671 { 3811 {
3672 Atom prop = XInternAtom (display->display, str + 1, True); 3812 Atom prop = display->atom (str + 1);
3673 Atom actual_type; 3813 Atom actual_type;
3674 int actual_format; 3814 int actual_format;
3675 unsigned long nitems; 3815 unsigned long nitems;
3676 unsigned long bytes_after; 3816 unsigned long bytes_after;
3677 unsigned char *value = 0; 3817 unsigned char *value = 0;
3678 const char *str = ""; 3818 const char *str = "";
3679 3819
3680 if (prop 3820 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3821 && XGetWindowProperty (disp, parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3822 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3823 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3824 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3825 && actual_type != None
3686 && actual_format == 8) 3826 && actual_format == 8)
… …
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3835 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696 3836
3697 if (eq) 3837 if (eq)
3698 { 3838 {
3699 *eq = 0; 3839 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0], 3840 set_utf8_property (display->atom (str), eq + 1);
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 } 3841 }
3705 else 3842 else
3706 XDeleteProperty (display->display, TermWin.parent[0], 3843 XDeleteProperty (disp, parent[0],
3707 display->atom (str)); 3844 display->atom (str));
3708 } 3845 }
3709 break; 3846 break;
3710 3847
3711 case XTerm_Color: 3848 case XTerm_Color:
… …
3752 break; 3889 break;
3753#ifndef NO_BOLD_UNDERLINE_REVERSE 3890#ifndef NO_BOLD_UNDERLINE_REVERSE
3754 case XTerm_Color_BD: 3891 case XTerm_Color_BD:
3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break; 3893 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759 break;
3760 case XTerm_Color_UL: 3894 case XTerm_Color_UL:
3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3762 break; 3896 break;
3763 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3765 break; 3899 break;
3900 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902 break;
3766#endif 3903#endif
3767#if TRANSPARENT && TINTING 3904#if TRANSPARENT && TINTING
3768 case XTerm_Color_tint: 3905 case URxvt_Color_tint:
3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3770 check_our_parents (); 3907 check_our_parents ();
3771 if (am_transparent) 3908 if (am_transparent)
3772 want_full_refresh = want_refresh = 1; 3909 want_full_refresh = want_refresh = 1;
3773 break; 3910 break;
3774#endif 3911#endif
… …
3786 { 3923 {
3787 str++; 3924 str++;
3788#if XPM_BACKGROUND 3925#if XPM_BACKGROUND
3789 changed += scale_pixmap (str); 3926 changed += scale_pixmap (str);
3790#endif 3927#endif
3791
3792 } 3928 }
3929
3793 if (changed) 3930 if (changed)
3794 { 3931 {
3795#ifdef XPM_BACKGROUND 3932#ifdef XPM_BACKGROUND
3796 resize_pixmap (); 3933 resize_pixmap ();
3797#endif 3934#endif
… …
3808 3945
3809 case XTerm_logfile: 3946 case XTerm_logfile:
3810 // TODO, when secure mode? 3947 // TODO, when secure mode?
3811 break; 3948 break;
3812 3949
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0
3957 case XTerm_dumpscreen: /* no error notices */
3958 {
3959 int fd;
3960 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3961 {
3962 scr_dump (fd);
3963 close (fd);
3964 }
3965 }
3966 break;
3967#endif
3813 case XTerm_font: 3968 case XTerm_font:
3814 op = URxvt_font; 3969 op = URxvt_font;
3815 case URxvt_font: 3970 case URxvt_font:
3816#if ENABLE_STYLES 3971#if ENABLE_STYLES
3817 case URxvt_boldFont: 3972 case URxvt_boldFont:
3818 case URxvt_italicFont: 3973 case URxvt_italicFont:
3819 case URxvt_boldItalicFont: 3974 case URxvt_boldItalicFont:
3820#endif 3975#endif
3821 if (query) 3976 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop, 3977 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3979 ? fontset[op - URxvt_font]->fontdesc : "",
3825 resp); 3980 resp);
3826 else 3981 else
3827 { 3982 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3983 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829 3984
… …
3832 set_fonts (); 3987 set_fonts ();
3833 } 3988 }
3834 break; 3989 break;
3835 3990
3836#if ENABLE_FRILLS 3991#if ENABLE_FRILLS
3837 case XTerm_locale: 3992 case URxvt_locale:
3838 if (query) 3993 if (query)
3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3840 else 3995 else
3841 { 3996 {
3842 set_locale (str); 3997 set_locale (str);
3843# ifdef USE_XIM 3998 pty.set_utf8_mode (enc_utf8);
3844 im_cb (); 3999 init_xlocale ();
3845# endif
3846 } 4000 }
3847 break; 4001 break;
3848#endif
3849 4002
3850#ifdef MENUBAR 4003 case URxvt_view_up:
3851 case XTerm_Menu: 4004 case URxvt_view_down:
3852 if (options & Opt_insecure) 4005 {
3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4006 int lines = atoi (str);
4007
4008 if (lines)
4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
4010 else
4011 scr_erase_savelines ();
4012 }
4013
3854 break; 4014 break;
3855#endif 4015#endif
3856#if 0 4016
3857 case XTerm_dumpscreen: /* no error notices */ 4017#if ENABLE_PERL
3858 { 4018 case URxvt_perl:
3859 int fd; 4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4020 ; // no responses yet
3861 {
3862 scr_dump (fd);
3863 close (fd);
3864 }
3865 }
3866 break; 4021 break;
3867#endif 4022#endif
3868 } 4023 }
3869} 4024}
3870/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
3979 } 4134 }
3980 4135
3981 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
3982 switch (arg[i]) 4137 switch (arg[i])
3983 { 4138 {
4139#if ENABLE_STYLES
4140 case 1021:
4141 if (mode)
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145
4146 scr_touch (true);
4147 break;
4148#endif
3984 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
3985 case 1049: 4150 case 1049:
3986 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
3987 if (mode == 0) 4152 if (mode == 0)
3988 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
3989 else if (mode == 1) 4154 else if (mode == 1)
3990 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
3991 break; 4156 break;
… …
4003 */ 4168 */
4004 PrivMode (1, PrivMode_vt52); 4169 PrivMode (1, PrivMode_vt52);
4005 break; 4170 break;
4006 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
4007 if (priv_modes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
4009 break; 4174 break;
4010 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
4011 if (state) 4176 if (!state)
4012 options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
4013 else 4178 else
4014 options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
4015 break; 4180 break;
4016 case 5: /* reverse video */ 4181 case 5: /* reverse video */
4017 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
4018 break; 4183 break;
4019 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
4060#if 0 4225#if 0
4061 case 1001: 4226 case 1001:
4062 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
4063#endif 4228#endif
4064 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
4065 if (state) 4230 if (!state)
4066 options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
4067 else 4232 else
4068 options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
4069 break; 4234 break;
4070 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4071 if (state) 4236 if (state)
4072 options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
4073 else 4238 else
4074 options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
4075 break; 4240 break;
4076 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
4077 if (options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
4078 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
4079 scr_erase_screen (2); 4244 scr_erase_screen (2);
4080 scr_change_screen (state); 4245 scr_change_screen (state);
4081 break; 4246 break;
4082 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state); 4248 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4085 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4086 scr_erase_screen (2); 4251 scr_erase_screen (2);
4087 break; 4252 break;
4088 default: 4253 default:
4089 break; 4254 break;
… …
4217 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4218 break; 4383 break;
4219 4384
4220 //case 50: // not variable spacing 4385 //case 50: // not variable spacing
4221 4386
4222#ifndef NO_BRIGHTCOLOR 4387#if ENABLE_FRILLS
4223 case 90: 4388 case 90:
4224 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4225 case 92: 4390 case 92:
4226 case 93: 4391 case 93:
4227 case 94: 4392 case 94:
… …
4239 case 106: 4404 case 106:
4240 case 107: 4405 case 107:
4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4242 break; 4407 break;
4243#endif 4408#endif
4244
4245 } 4409 }
4246 } 4410 }
4247} 4411}
4248/*}}} */ 4412/*}}} */
4249 4413
… …
4273 */ 4437 */
4274void 4438void
4275rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4276{ 4440{
4277 va_list arg_ptr; 4441 va_list arg_ptr;
4278 unsigned char buf[256]; 4442 char buf[256];
4279 4443
4280 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4282 va_end (arg_ptr); 4446 va_end (arg_ptr);
4283 tt_write (buf, strlen (buf)); 4447 tt_write (buf, strlen (buf));
… …
4285 4449
4286/* ---------------------------------------------------------------------- */ 4450/* ---------------------------------------------------------------------- */
4287/* Write data to the pty as typed by the user, pasted with the mouse, 4451/* Write data to the pty as typed by the user, pasted with the mouse,
4288 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
4289 */ 4453 */
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455
4290void 4456void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 4458{
4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459 if (pty.pty < 0)
4460 return;
4294 4461
4295 if (len) 4462 if (v_buflen == 0)
4463 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4465
4466 if ((unsigned int)written == len)
4467 return;
4468
4469 data += written;
4470 len -= written;
4296 { 4471 }
4472
4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4474
4475 memcpy (v_buffer + v_buflen, data, len);
4476 v_buflen += len;
4477
4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479}
4480
4481void rxvt_term::pty_write ()
4482{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484
4485 if (written > 0)
4486 {
4487 v_buflen -= written;
4488
4297 if (v_buflen == 0) 4489 if (v_buflen == 0)
4298 { 4490 {
4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301 if ((unsigned int)written == len)
4302 return;
4303
4304 data += written;
4305 len -= written;
4306 }
4307
4308
4309 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311 memcpy (v_buffer + v_buflen, data, len);
4312 v_buflen += len;
4313 }
4314
4315 for (;;)
4316 {
4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319 if (written > 0)
4320 {
4321 v_buflen -= written;
4322
4323 if (v_buflen == 0)
4324 {
4325 free (v_buffer); 4491 free (v_buffer);
4326 v_buffer = 0; 4492 v_buffer = 0;
4327 v_buflen = 0; 4493 v_buflen = 0;
4328 4494
4329 pty_ev.set (EVENT_READ); 4495 pty_ev.set (EVENT_READ);
4330 return;
4331 }
4332
4333 memmove (v_buffer, v_buffer + written, v_buflen);
4334 }
4335 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4336 // original code just ignores this...
4337 destroy ();
4338 else
4339 {
4340 pty_ev.set (EVENT_READ | EVENT_WRITE);
4341 return; 4496 return;
4342 } 4497 }
4498
4499 memmove (v_buffer, v_buffer + written, v_buflen);
4343 } 4500 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ);
4344} 4503}
4345 4504
4346/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
4347 4506

Diff Legend

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