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.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <cwchar>
58#include <csignal> 63#include <csignal>
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 125 XK_Print, 0x2399,
121 126
122 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,
123 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
124 0, 137 0,
125}; 138};
126 139
127void 140void
128rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
129{ 142{
130 x = Pixel2Col (x); 143 x = Pixel2Col (x);
131 y = Pixel2Row (y); 144 y = Pixel2Row (y);
132 145
133 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 148 return;
136 149
137 for (;;) 150 for (;;)
138 { 151 {
139 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];
140 155
141 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
142 { 157 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
146 break; 160 break;
147 } 161 }
148 162
149 x--; 163 x--;
150 } 164 }
151
152} 165}
153#endif
154 166
155#if ENABLE_OVERLAY
156void 167void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 169{
159 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 173 int len;
163 174
175 fname = rxvt_utf8towcs (f->name);
176
164#if ENABLE_COMBINING 177# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
166 { 179 {
167 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
170 } 183 }
171 else 184 else
172#endif 185# endif
173 { 186 {
174 ch2 = ch; 187 ch2 = ch;
175 188
176 alloc = 0; 189 alloc = 0;
177 chr = &ch2; 190 chr = &ch2;
178 len = 1; 191 len = 1;
179 } 192 }
180 193
181 int width = strlen (f->name); 194 char attr[80]; // plenty
182 195
183 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);
184 218
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 220
187 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
188 { 222 {
… …
191 ch = *chr++; 225 ch = *chr++;
192 226
193 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
196#if !UNICODE3 230# if !UNICODE3
197 if (ch >= 0x10000) 231 if (ch >= 0x10000)
198 ch = 0xfffd; 232 ch = 0xfffd;
199#endif 233# endif
200 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
202 } 236 }
203 237
238 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
205 240
241 free (fname);
242
206#if ENABLE_COMBINING 243# if ENABLE_COMBINING
207 if (alloc) 244 if (alloc)
208 delete [] alloc; 245 delete [] alloc;
209#endif 246# endif
210} 247}
211#endif 248#endif
212 249
213void 250void
214rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 268 mb[0] = ch[0];
232 len = 1; 269 len = 1;
233 } 270 }
234 271
235 if (len > 0) 272 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
237 else 274 else
238 scr_bell (); 275 scr_bell ();
239 } 276 }
240 277
241 iso14755buf = 0; 278 iso14755buf = 0;
… …
269 KeySym keysym; 306 KeySym keysym;
270#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
272#endif 309#endif
273 int valid_keysym; 310 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
275 312
276 /* 313 /*
277 * 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
278 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
279 * 316 *
280 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
281 */ 318 */
282 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
285 322
286 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
287 { 324 {
288 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 334 Status status_return;
298 335
299#if 0 336#if 0
300#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
301 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
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
304 else 341 else
305#endif 342#endif
306#endif 343#endif
307 { 344 {
… …
309 346
310 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
314 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
317 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 357 SET_LOCALE (locale);
319 358
320 if (status_return == XLookupChars 359 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
343 } 382 }
344 else 383 else
345#endif 384#endif
346 { 385 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
349 } 388 }
350 389
351 if (valid_keysym) 390 if (valid_keysym)
352 { 391 {
353#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 394 return;
356#endif 395#endif
357 396
358 if (TermWin.saveLines) 397 if (saveLines)
359 { 398 {
360#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 400 if (!ctrl && !meta)
362#else 401#else
363 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
364#endif 403#endif
365 { 404 {
366 int lnsppg; 405 int lnsppg;
367 406
368#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 409#else
371 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
372#endif 411#endif
373 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
374 { 413 {
375 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
376 return; 415 return;
… …
404 scr_move_to (0, 1); 443 scr_move_to (0, 1);
405 return; 444 return;
406 } 445 }
407 else if (keysym == XK_End) 446 else if (keysym == XK_End)
408 { 447 {
409 scr_move_to (1, 0); 448 scr_move_to (1, 1);
410 return; 449 return;
411 } 450 }
412 } 451 }
413#endif 452#endif
414 } 453 }
… …
513 else 552 else
514 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
515 break; 554 break;
516#endif 555#endif
517#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
518 case XK_Delete: 567 case XK_Delete:
519 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
520 break; 569 break;
521#endif 570#endif
522 case XK_Tab: 571 case XK_Tab:
… …
625#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
626 case XK_KP_Begin: 675 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
628 break; 677 break;
629 678
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 679#endif
638 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
673 break; 715 break;
674 716
675 case XK_Find: 717 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
677 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
678 case XK_Insert: 731 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
680 break; 733 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 735 case DXK_Remove:
… …
802 { 855 {
803#ifdef META8_OPTION 856#ifdef META8_OPTION
804 /* set 8-bit on */ 857 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
806 { 859 {
807 unsigned char *ch; 860 char *ch;
808 861
809 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 863 *ch |= 0x80;
811 864
812 meta = 0; 865 meta = 0;
… …
814#endif 867#endif
815 /* nil */ ; 868 /* nil */ ;
816 } 869 }
817 } 870 }
818 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
819 if (len <= 0) 875 if (len <= 0)
820 return; /* not mapped */ 876 return; /* not mapped */
821 877
822 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 879 if (view_start)
824 { 880 {
825 TermWin.view_start = 0; 881 view_start = 0;
826 want_refresh = 1; 882 want_refresh = 1;
827 } 883 }
828 884
829 /* 885 /*
830 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 901#ifdef META8_OPTION
846 && meta_char == C0_ESC 902 && meta_char == C0_ESC
847#endif 903#endif
848 ) 904 )
849 { 905 {
850 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
851 tt_write (&ch, 1); 907 tt_write (&ch, 1);
852 } 908 }
853 909
854#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
863#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
864 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
865} 921}
866/*}}} */ 922/*}}} */
867 923
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */
871unsigned int 925unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 927{
874 unsigned int n, s; 928 unsigned int n, s;
875 929
876 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 968 }
915#endif 969#endif
916 970
917 if (want_refresh) 971 if (want_refresh)
918 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
919 scr_refresh (refresh_type); 1011 scr_refresh ();
920 scrollbar_show (1); 1012 scrollbar_show (1);
921#ifdef USE_XIM 1013#ifdef USE_XIM
922 IMSendSpot (); 1014 IMSendSpot ();
923#endif 1015#endif
924 } 1016 }
… …
927} 1019}
928 1020
929void 1021void
930rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
931{ 1023{
932 SET_R (this); 1024 make_current ();
933 SET_LOCALE (locale);
934 1025
935 display->flush (); 1026 display->flush ();
936 1027
937 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1030}
940 1031
941void 1032void
942rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
943{ 1034{
944 SET_R (this); 1035 make_current ();
945 SET_LOCALE (locale);
946 1036
947 refresh_limit = 1; 1037 refresh_limit = 1;
948 refresh_count = 0; 1038 refresh_count = 0;
949 flush (); 1039 flush ();
950} 1040}
… …
978rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
979{ 1069{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 { 1072 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1073 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
986 } 1075 }
987} 1076}
988#endif 1077#endif
… …
992rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
993{ 1082{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 { 1084 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1086 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 } 1088 }
1001} 1089}
1002#endif 1090#endif
… …
1007{ 1095{
1008 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1099 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1100 if (view_start == top_row || view_start == 0)
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1015 1102
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1103 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1105 }
1020} 1106}
1021#endif 1107#endif
1022 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
1023bool 1127bool
1024rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
1025{ 1129{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1131
1028 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1029 { 1133 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1135 n = 0;
1032 } 1136 }
1033 1137
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1037 1141
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039 1143
1040 if (n > 0) 1144 if (r > 0)
1041 { 1145 {
1042 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
1043 return true; 1147 return true;
1044 } 1148 }
1045 else if (n < 0 && errno != EAGAIN) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1157 {
1158 pty_ev.stop ();
1159
1160 if (!OPTION (Opt_hold))
1046 destroy (); 1161 destroy ();
1162 }
1047 1163
1048 return false; 1164 return false;
1049} 1165}
1050 1166
1051void 1167void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1053{ 1169{
1054 SET_R (this); 1170 make_current ();
1055 SET_LOCALE (locale);
1056 1171
1057 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1058 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1174 while (pty_fill ())
1060 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1065} 1180}
1066 1181
1067void 1182void
1068rxvt_term::pointer_unblank () 1183rxvt_term::pointer_unblank ()
1069{ 1184{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1185 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1186 recolour_cursor ();
1072 1187
1073#ifdef POINTER_BLANK 1188#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1189 hidden_pointer = 0;
1075 1190
1076 if (options & Opt_pointerBlank) 1191 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1192 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1193#endif
1079} 1194}
1080 1195
1081#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1082void 1197void
1083rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1084{ 1199{
1085 if (! (options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1086 return; 1201 return;
1087 1202
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1204 XFlush (display->display);
1090 1205
1091 hidden_pointer = 1; 1206 hidden_pointer = 1;
1092} 1207}
1093 1208
1094void 1209void
1095rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1096{ 1211{
1097 SET_R (this); 1212 make_current ();
1098 SET_LOCALE (locale);
1099 1213
1100 pointer_blank (); 1214 pointer_blank ();
1101} 1215}
1102#endif 1216#endif
1103 1217
… …
1182 1296
1183/*{{{ process an X event */ 1297/*{{{ process an X event */
1184void 1298void
1185rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1186{ 1300{
1187 SET_R (this); 1301 make_current ();
1188 SET_LOCALE (locale);
1189 1302
1190#if defined(CURSOR_BLINK) 1303 dDisp;
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1304
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1305 if (ev.xany.window == vt
1200 } 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1201#endif 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1202 1309
1203#if defined(POINTER_BLANK) 1310 // for XQueryPointer
1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1205 {
1206 if (ev.type == MotionNotify
1207 || ev.type == ButtonPress
1208 || ev.type == ButtonRelease)
1209 if (hidden_pointer)
1210 pointer_unblank ();
1211
1212 if (ev.type == KeyPress && hidden_pointer == 0)
1213 pointer_blank ();
1214 }
1215#endif
1216
1217 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1313 unsigned int unused_mask;
1220 1314
1221 switch (ev.type) 1315 switch (ev.type)
… …
1228 1322
1229 break; 1323 break;
1230 1324
1231 case KeyRelease: 1325 case KeyRelease:
1232 { 1326 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1234 KeySym ks; 1328 KeySym keysym;
1235 1329
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif 1331#endif
1238 1332
1239#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support 1334 // ISO 14755 support
1241 if (iso14755buf) 1335 if (iso14755buf)
… …
1246# endif 1340# endif
1247# if ISO_14755 1341# if ISO_14755
1248 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1249 // first: controls 1343 // first: controls
1250 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1253 { 1347 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1255 commit_iso14755 (); 1349 commit_iso14755 ();
1256 return; // case-break; 1350 goto skip_switch;
1257 } 1351 }
1258 1352
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks) 1354 if (i[0] == keysym)
1261 { 1355 {
1262 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 (); 1357 commit_iso14755 ();
1264 return; // case-break; 1358 goto skip_switch;
1265 } 1359 }
1266 1360
1267 scr_bell (); 1361 scr_bell ();
1268# endif 1362# endif
1269 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1288 else 1382 else
1289 iso14755buf = 0; 1383 iso14755buf = 0;
1290 } 1384 }
1291#endif 1385#endif
1292 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1297 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1298#endif 1396#endif
1299 break; 1397 break;
1300 } 1398 }
1301 1399
… …
1307 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1308 break; 1406 break;
1309 1407
1310 case ClientMessage: 1408 case ClientMessage:
1311 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313 destroy (); 1413 destroy ();
1414#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev);
1419#endif
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1314#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1320 { 1436 {
1321 /* Get Dnd data */ 1437 /* Get Dnd data */
1322 Atom ActualType; 1438 Atom ActualType;
1323 int ActualFormat; 1439 int ActualFormat;
1324 unsigned char *data; 1440 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1441 unsigned long Size, RemainingBytes;
1326 1442
1327 XGetWindowProperty (display->display, display->root, 1443 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1444 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1445 0L, 1000000L,
1330 False, AnyPropertyType, 1446 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1447 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1448 &Size, &RemainingBytes,
1333 &data); 1449 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1450 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1451 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1454 }
1339#endif /* OFFIX_DND */ 1455#endif /* OFFIX_DND */
1340 break; 1456 break;
1341 1457
1342 case MappingNotify: 1458 case MappingNotify:
… …
1367 break; 1483 break;
1368 } 1484 }
1369 break; 1485 break;
1370 1486
1371 case FocusIn: 1487 case FocusIn:
1372 if (!TermWin.focus) 1488 focus_in ();
1489 break;
1490
1491 case FocusOut:
1492 focus_out ();
1493 break;
1494
1495 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0])
1373 { 1497 {
1374 TermWin.focus = 1;
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ;
1441 1500
1442 if (szHint.width != width || szHint.height != height) 1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1502 {
1444 seen_resize = 1; 1503 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1505 }
1447 1506
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1508 if (OPTION (Opt_transparent))
1450 check_our_parents (); 1509 check_our_parents ();
1451#endif 1510#endif
1452 } 1511 }
1453 break; 1512 break;
1454 1513
… …
1470 1529
1471 case SelectionRequest: 1530 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1473 break; 1532 break;
1474 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1475 case UnmapNotify: 1542 case UnmapNotify:
1476 TermWin.mapped = 0; 1543 mapped = 0;
1477#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1479#endif 1546#endif
1480 break; 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1481
1482 case MapNotify:
1483 TermWin.mapped = 1;
1484#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif
1487 break; 1548 break;
1488 1549
1489#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1490 case ReparentNotify: 1551 case ReparentNotify:
1491 rootwin_cb (ev); 1552 rootwin_cb (ev);
1492 break; 1553 break;
1493#endif /* TRANSPARENT */ 1554#endif /* TRANSPARENT */
1494 1555
1495 case GraphicsExpose: 1556 case GraphicsExpose:
1496 case Expose: 1557 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == vt)
1498 { 1559 {
1499 do 1560 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503 1564
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1566
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1509 1570
1510 scr_refresh (refresh_type); 1571 want_refresh = 1;
1511 } 1572 }
1512 else 1573 else
1513 { 1574 {
1514 XEvent unused_event; 1575 XEvent unused_event;
1515 1576
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1578 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1580 ;
1520 1581
1521 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1522 { 1583 {
1523 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1524 scrollbar_show (0); 1585 scrollbar_show (0);
1525 } 1586 }
1526#ifdef MENUBAR
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose ();
1529#endif
1530 1587
1531#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1534#endif 1591#endif
1535 } 1592 }
1536 break; 1593 break;
1537 1594
1538 case MotionNotify: 1595 case MotionNotify:
1539#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1540 if (hidden_pointer) 1597 if (hidden_pointer)
1541 pointer_unblank (); 1598 pointer_unblank ();
1542#endif 1599#endif
1543#if MENUBAR
1544 if (isMenuBarWindow (ev.xany.window))
1545 {
1546 menubar_control (ev.xbutton);
1547 break;
1548 }
1549#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1601 break;
1552 1602
1553 if (ev.xany.window == TermWin.vt) 1603 if (ev.xany.window == vt)
1554 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1609 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558 ; 1611 ;
1559 1612
1560 XQueryPointer (display->display, TermWin.vt, 1613 XQueryPointer (disp, vt,
1561 &unused_root, &unused_child, 1614 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1615 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1616 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1617 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
… …
1577#endif 1630#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1631 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1632 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1633
1581#ifdef SELECTION_SCROLLING 1634#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1635 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1636 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1637 {
1585 int dist; 1638 int dist;
1586 1639
1587 /* don't clobber the current delay if we are 1640 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1641 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1649 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1650 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1651 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1652
1600 /* calc number of lines to scroll */ 1653 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1654 if (ev.xbutton.y < int_bwidth)
1602 { 1655 {
1603 scroll_selection_dir = UP; 1656 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1657 dist = int_bwidth - ev.xbutton.y;
1605 } 1658 }
1606 else 1659 else
1607 { 1660 {
1608 scroll_selection_dir = DN; 1661 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1662 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1663 }
1611 1664
1612 scroll_selection_lines = Pixel2Height (dist) 1665 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1666 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1667 + 1;
1615 MIN_IT (scroll_selection_lines, 1668 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1669 SELECTION_SCROLL_MAX_LINES);
1617 } 1670 }
1618 else 1671 else
1619 { 1672 {
1620 /* we are within the text window, so we 1673 /* we are within the text window, so we
… …
1629#endif 1682#endif
1630 } 1683 }
1631 } 1684 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1686 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1687 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1688 MotionNotify, &ev))
1636 ; 1689 ;
1637 1690
1638 XQueryPointer (display->display, scrollBar.win, 1691 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1692 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1694 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1695 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1697 scrollbar_size ());
1645 scr_refresh (refresh_type); 1698 want_refresh = 1;
1646 refresh_limit = 0; 1699 refresh_limit = 0;
1647 scrollbar_show (1); 1700 scrollbar_show (1);
1648 } 1701 }
1649 break; 1702 break;
1650 } 1703 }
1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1733}
1734
1735void
1736rxvt_term::focus_in ()
1737{
1738 if (!focus)
1739 {
1740 focus = 1;
1741 want_refresh = 1;
1742
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1745#if USE_XIM
1746 if (Input_Context != NULL)
1747 {
1748 IMSetStatusPosition ();
1749 XSetICFocus (Input_Context);
1750 }
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_focused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766void
1767rxvt_term::focus_out ()
1768{
1769 if (focus)
1770 {
1771 focus = 0;
1772 want_refresh = 1;
1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1779 iso14755buf = 0;
1780# if ENABLE_OVERLAY
1781 scr_overlay_off ();
1782# endif
1783 }
1784#endif
1785#if USE_XIM
1786 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context);
1788#endif
1789#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink))
1791 cursor_blink_ev.stop ();
1792 hidden_cursor = 0;
1793#endif
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 pix_colors = pix_colors_unfocused;
1798 scr_recolour ();
1799 }
1800#endif
1801 }
1651} 1802}
1652 1803
1653#if TRANSPARENT 1804#if TRANSPARENT
1654void 1805void
1655rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1807{
1657 SET_R (this); 1808 make_current ();
1658 SET_LOCALE (locale);
1659 1809
1660 switch (ev.type) 1810 switch (ev.type)
1661 { 1811 {
1662 case PropertyNotify: 1812 case PropertyNotify:
1663 /* 1813 /*
… …
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669 return; 1819 return;
1670 1820
1671 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1672 case ReparentNotify: 1822 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1675 break; 1825 break;
1676 } 1826 }
1677} 1827}
1678#endif 1828#endif
… …
1681rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1682{ 1832{
1683 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1684 1834
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1686 if (!bypass_keystate) 1837 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1839
1689 /* 1840 /*
1690 * VT window processing of button press 1841 * VT window processing of button press
1691 */ 1842 */
1692 if (ev.window == TermWin.vt) 1843 if (ev.window == vt)
1693 { 1844 {
1694#if ISO_14755 1845#if ISO_14755
1695 // 5.4 1846 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1848 {
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1712 { 1863 {
1713 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1714 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1715 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1716 { 1868 {
1717 /* only report double clicks */ 1869 /* only report double clicks */
1718 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1719 mouse_report (ev); 1871 mouse_report (ev);
… …
1739 else 1891 else
1740 { 1892 {
1741 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1743 1895
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1744 switch (ev.button) 1897 switch (ev.button)
1745 { 1898 {
1746 case Button1: 1899 case Button1:
1747 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1748 /* should be done in screen.C */ 1901 /* should be done in screen.C */
1749#if ENABLE_FRILLS 1902#if ENABLE_FRILLS
1750 selection.rect = !!(ev.state & ModMetaMask); 1903 selection.rect = !!(ev.state & ModMetaMask);
1751#else 1904#else
1752 selection.rect = false; 1905 selection.rect = false;
1753#endif 1906#endif
1754 1907
1755 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1910 {
1758 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1760 else 1913 else
1761 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1762 } 1915 }
1763 else 1916 else
1764 { 1917 {
1765 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1766 MEvent.clicks++; 1919 MEvent.clicks++;
1767 else 1920 else
1768 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1769 1922
1770 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1771 } 1924 }
1772 1925
1773 MEvent.button = Button1; 1926 MEvent.button = Button1;
1774 break; 1927 break;
1775 1928
1776 case Button3: 1929 case Button3:
1777 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1778 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1779 else 1932 else
1780 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1781 1934
1782 MEvent.button = Button3; 1935 MEvent.button = Button3;
1783 break; 1936 break;
1784 } 1937 }
1785 } 1938 }
1786 1939
1787 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1788 return; 1941 return;
1789 } 1942 }
1790 1943
… …
1902 case Button3: 2055 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1904 { 2057 {
1905 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1908# else 2061# else
1909 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1910# endif 2063# endif
1911 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1914# else 2067# else
1915 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1916# endif 2069# endif
1917 else 2070 else
1918 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1919 } 2072 }
1920 else 2073 else
1921 { 2074 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2076 (nrow
1924 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2078 / scrollbar_size ()));
1926 } 2079 }
1927 2080
1928 break; 2081 break;
1929 } 2082 }
1930 } 2083 }
2084
1931 return; 2085 return;
1932 } 2086 }
1933#if MENUBAR
1934 /*
1935 * Menubar window processing of button press
1936 */
1937 if (isMenuBarWindow (ev.window))
1938 menubar_control (ev);
1939#endif
1940} 2087}
1941 2088
1942void 2089void
1943rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1944{ 2091{
… …
1950 2097
1951 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1952 { 2099 {
1953 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1954 scrollbar_show (0); 2101 scrollbar_show (0);
1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1956 refresh_type &= ~SMOOTH_REFRESH;
1957#endif
1958 } 2102 }
1959 2103
1960#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
1963#endif 2107#endif
1964 2108
1965 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1966 { 2110 {
1967#if ISO_14755 2111#if ISO_14755
1968 // 5.4 2112 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2114 return;
… …
2000 if (priv_modes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
2001 && bypass_keystate 2145 && bypass_keystate
2002 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
2003 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2004 2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2005 switch (ev.button) 2152 switch (ev.button)
2006 { 2153 {
2007 case Button1: 2154 case Button1:
2008 case Button3: 2155 case Button3:
2009 selection_make (ev.time); 2156 selection_make (ev.time);
… …
2020 2167
2021 v = ev.button == Button4 ? UP : DN; 2168 v = ev.button == Button4 ? UP : DN;
2022 2169
2023 if (ev.state & ShiftMask) 2170 if (ev.state & ShiftMask)
2024 i = 1; 2171 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2172 else if (OPTION (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2173 i = nrow - 1;
2027 else 2174 else
2028 i = 5; 2175 i = 5;
2029 2176
2030# ifdef MOUSE_SLIP_WHEELING 2177# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2178 if (ev.state & ControlMask)
2032 { 2179 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2180 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2181 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2183
2037 if (slip_wheel_ev.at < NOW) 2184 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2186
2040 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
2041 } 2188 }
2042 else 2189 else
2043 { 2190 {
2044# endif 2191# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2192 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2193 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2058 } 2195 }
2059#endif 2196# endif
2060 } 2197 }
2061 break; 2198 break;
2062#endif 2199#endif
2063 } 2200 }
2064 } 2201 }
2065#ifdef MENUBAR
2066 else if (isMenuBarWindow (ev.window))
2067 menubar_control (ev);
2068#endif
2069} 2202}
2070 2203
2071#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2072#if TINTING 2205#if TINTING
2073/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2217 int i;
2085 2218
2086 Visual* visual = display->visual; 2219 Visual *visual = display->visual;
2087 2220
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2222
2090 /* for convenience */ 2223 /* for convenience */
2091 mask_r = visual->red_mask; 2224 mask_r = visual->red_mask;
… …
2312 Atom atype; 2445 Atom atype;
2313 unsigned char *prop = NULL; 2446 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2447 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2448 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2317 2451
2318 pchanged = 0; 2452 pchanged = 0;
2319 2453
2320 if (!(options & Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2322 2456
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2457 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2325 2459
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2460 XGetWindowAttributes (disp, parent[0], &wattr);
2327 2461
2328 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2329 { 2463 {
2330 if (am_transparent) 2464 if (am_transparent)
2331 { 2465 {
2332 pchanged = 1; 2466 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2335 } 2469 }
2336 2470
2337 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2338 } 2472 }
2339 2473
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2475 XSync (disp, False);
2342 2476
2343 /* 2477 /*
2344 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2347 */ 2481 */
2348 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2352 2486
2353 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2358 2492
2359 if (!i || prop == NULL 2493 if (!i || prop == NULL
2360#if TINTING 2494#if TINTING
… …
2379 Window cr; 2513 Window cr;
2380 XImage *image; 2514 XImage *image;
2381 GC gc; 2515 GC gc;
2382 XGCValues gcvalue; 2516 XGCValues gcvalue;
2383 2517
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2518 XTranslateCoordinates (disp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2522 nx = ny = 0;
2389 2523
… …
2399 nh += sy; 2533 nh += sy;
2400 ny = -sy; 2534 ny = -sy;
2401 sy = 0; 2535 sy = 0;
2402 } 2536 }
2403 2537
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2406 2540
2407 XSync (display->display, False); 2541 XSync (disp, False);
2408 allowedxerror = -1; 2542 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2544
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2547 allowedxerror = 0;
2414 2548
2415 if (image == NULL) 2549 if (image == NULL)
2416 { 2550 {
2417 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2418 { 2552 {
2419 pchanged = 1; 2553 pchanged = 1;
2420 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2421 { 2555 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2556 XFreePixmap (disp, pixmap);
2423 TermWin.pixmap = None; 2557 pixmap = None;
2424 } 2558 }
2425 } 2559 }
2426 2560
2427 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2428 } 2562 }
2429 else 2563 else
2430 { 2564 {
2431 if (TermWin.pixmap != None) 2565 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2566 XFreePixmap (disp, pixmap);
2433 2567
2434#if TINTING 2568#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2570 {
2437 unsigned short rm, gm, bm; 2571 unsigned short rm, gm, bm;
… …
2441 2575
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2577 }
2444#endif 2578#endif
2445 2579
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2580 pixmap = XCreatePixmap (disp, vt,
2447 szHint.width, szHint.height, image->depth); 2581 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2584 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2585 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2586 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2588 XClearWindow (disp, parent[0]);
2455 2589
2456 if (!am_transparent || !am_pixmap_trans) 2590 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2591 pchanged = 1;
2458 2592
2459 am_transparent = am_pixmap_trans = 1; 2593 am_transparent = am_pixmap_trans = 1;
2460 } 2594 }
2461 } 2595 }
2462 2596
2463 if (am_pixmap_trans) 2597 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465 else 2599 else
2466 { 2600 {
2467 unsigned int n; 2601 unsigned int n;
2468 /* 2602 /*
2469 * InheritPixmap transparency 2603 * InheritPixmap transparency
2470 */ 2604 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2606 {
2473 oldp = TermWin.parent[i]; 2607 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2608 XQueryTree (disp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2609 &parent[i], &list, &n);
2476 XFree (list); 2610 XFree (list);
2477 2611
2478 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2479 { 2613 {
2480 if (oldp != None) 2614 if (oldp != None)
2481 pchanged = 1; 2615 pchanged = 1;
2482 2616
2483 break; 2617 break;
2484 } 2618 }
2485 2619
2486 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2487 pchanged = 1; 2621 pchanged = 1;
2488 } 2622 }
2489 2623
2490 n = 0; 2624 n = 0;
2491 2625
2492 if (pchanged) 2626 if (pchanged)
2493 { 2627 {
2494 for (; n < (unsigned int)i; n++) 2628 for (; n < (unsigned int)i; n++)
2495 { 2629 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2630 XGetWindowAttributes (disp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2632 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2634 break;
2501 } 2635 }
2502 } 2636 }
2503 } 2637 }
2504 2638
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2640 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2643 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2644 /* XXX: also turn off Opt_transparent? */
2511 } 2645 }
2512 else 2646 else
2513 { 2647 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2650 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2651 sleep (1);
2518#endif 2652#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2653 for (n = 0; n < (unsigned int)i; n++)
2520 { 2654 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2656 XClearWindow (disp, parent[n]);
2523 } 2657 }
2524 2658
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526 am_transparent = 1; 2660 am_transparent = 1;
2527 } 2661 }
2528 2662
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2664 parent[i] = None;
2531 } 2665 }
2532 2666
2533 if (scrollBar.win) 2667 if (scrollBar.win)
2534 { 2668 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2670 scrollBar.setIdle ();
2537 scrollbar_show (0); 2671 scrollbar_show (0);
2538 } 2672 }
2539 2673
2540 if (am_transparent) 2674 if (am_transparent)
… …
2552 2686
2553bool 2687bool
2554rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2555{ 2689{
2556 bool flag = false; 2690 bool flag = false;
2557 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2559 2693
2560 for (;;) 2694 for (;;)
2561 { 2695 {
2562 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2563 { 2697 {
2564 seq_begin = cmdbuf_ptr; 2698 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2699 ch = next_char ();
2566 }
2567 2700
2568 if (ch == NOCHAR) // TODO: improve 2701 if (ch == NOCHAR)
2569 break; 2702 break;
2703 }
2570 2704
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2706 {
2573 if (!seen_input) 2707 if (!seen_input)
2574 { 2708 {
… …
2578 // some window managers resize the window early, and these programs 2712 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2713 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2714 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2715 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2716 // resized.
2583 if (seen_resize) 2717 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2718 kill (-cmd_pid, SIGWINCH);
2585 } 2719 }
2586 2720
2587 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2723 bool refreshnow = false;
2590 int nlines = 0; 2724 int nlines = 0;
2591 unicode_t *str = buf; 2725 wchar_t *str = buf;
2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2727
2593 for (;;) 2728 for (;;)
2594 { 2729 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2731 break;
2597 2732
2598 *str++ = ch; 2733 *str++ = ch;
2599 2734
2600 if (ch == C0_LF) 2735 if (ch == C0_LF || str >= eol)
2601 { 2736 {
2737 if (ch == C0_LF)
2602 nlines++; 2738 nlines++;
2739
2603 refresh_count++; 2740 refresh_count++;
2604 2741
2605 if (!(options & Opt_jumpScroll) 2742 if (!OPTION (Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2744 {
2608 refreshnow = true; 2745 refreshnow = true;
2746 refresh_count = 0;
2609 ch = NOCHAR; 2747 ch = NOCHAR;
2610 break; 2748 break;
2611 } 2749 }
2612 2750
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2752 if (nlines >= nrow - 1)
2615 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2616 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2757
2617 nlines = 0; 2758 nlines = 0;
2618 str = buf; 2759 str = buf;
2760 eol = str + min (ncol, UBUFSIZ);
2619 } 2761 }
2620 }
2621 2762
2622 if (str >= buf + UBUFSIZ) 2763 if (str >= eol)
2623 { 2764 {
2765 if (eol >= buf + UBUFSIZ)
2766 {
2624 ch = NOCHAR; 2767 ch = NOCHAR;
2625 break; 2768 break;
2769 }
2770 else
2771 eol = min (eol + ncol, buf + UBUFSIZ);
2772 }
2773
2626 } 2774 }
2627 2775
2628 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2777 ch = next_char ();
2630 } 2778 }
2631 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2632 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2633 2783
2634 /* 2784 /*
2635 * If there have been a lot of new lines, then update the screen 2785 * If there have been a lot of new lines, then update the screen
2636 * What the heck I'll cheat and only refresh less than every page-full. 2786 * What the heck I'll cheat and only refresh less than every page-full.
2637 * the number of pages between refreshes is refresh_limit, which 2787 * the number of pages between refreshes is refresh_limit, which
2638 * is incremented here because we must be doing flat-out scrolling. 2788 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2789 */
2640 if (refreshnow) 2790 if (refreshnow)
2641 { 2791 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++; 2793 refresh_limit++;
2644 else 2794 else
2645 { 2795 {
2646 flag = true; 2796 flag = true;
2647 scr_refresh (refresh_type); 2797 scr_refresh ();
2798 want_refresh = 1;
2648 } 2799 }
2649 } 2800 }
2650 2801
2651 } 2802 }
2652 else 2803 else
… …
2667 } 2818 }
2668 2819
2669 return flag; 2820 return flag;
2670} 2821}
2671 2822
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679}
2680
2681// read the next character 2823// read the next character
2682unicode_t 2824wchar_t
2683rxvt_term::next_char () 2825rxvt_term::next_char ()
2684{ 2826{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2828 {
2687 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2831 return *cmdbuf_ptr++;
2690 2832
2691 wchar_t wc; 2833 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2835
2694 if (len == (size_t)-2) 2836 if (len == (size_t)-2)
2695 { 2837 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2838 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2840 break;
2699 } 2841 }
2700 2842
2701 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2845
2704 // assume wchar == unicode 2846 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2848 return wc & UNICODE_MASK;
2707 } 2849 }
2708 2850
2709 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2710} 2861}
2711 2862
2712/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2713/* 2864/*
2714 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2715 * to the command. 2866 * to the command.
2716 */ 2867 */
2717unicode_t 2868wchar_t
2718rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2719{ 2870{
2720 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2721 2872
2722 if (c == NOCHAR) 2873 if (c == NOCHAR)
2723 throw out_of_input; 2874 throw out_of_input;
2724 2875
2725 return c; 2876 return c;
2726} 2877}
2727 2878
2728unicode_t 2879uint32_t
2729rxvt_term::cmd_get8 () 2880rxvt_term::cmd_get8 ()
2730{ 2881{
2731 unicode_t c = next_octet (); 2882 uint32_t c = next_octet ();
2732 2883
2733 if (c == NOCHAR) 2884 if (c == NOCHAR)
2734 throw out_of_input; 2885 throw out_of_input;
2735 2886
2736 return c; 2887 return c;
… …
2836 case C0_ESC: 2987 case C0_ESC:
2837 process_escape_seq (); 2988 process_escape_seq ();
2838 break; 2989 break;
2839 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 2993 else
2844 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 2995 break;
2847 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2848 scr_bell (); 2997 scr_bell ();
2849 break; 2998 break;
2850 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
3005 break; 3154 break;
3006 3155
3007 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
3009 { 3158 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 3161 }
3013 break; 3162 break;
3014 3163
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 3187 process_dcs_seq ();
3039 break; 3188 break;
3040 3189
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
3046 3194
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 3197 process_csi_seq ();
… …
3174 { 3322 {
3175 switch (priv) 3323 switch (priv)
3176 { 3324 {
3177 case '>': 3325 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3326 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3328 break;
3181 case '?': 3329 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3331 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3332 break;
… …
3289 3437
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3438 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3439 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3440 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3443 break;
3296 3444
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3447 break;
3301 3448
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
3304 break; 3451 break;
… …
3311 break; 3458 break;
3312 case 6: /* CPR requested */ 3459 case 6: /* CPR requested */
3313 scr_report_position (); 3460 scr_report_position ();
3314 break; 3461 break;
3315 case 7: /* unofficial extension */ 3462 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3463 if (OPTION (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3464 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3465 break;
3319 case 8: /* unofficial extension */ 3466 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3468 break;
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3560rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3561{
3415 int x, y; 3562 int x, y;
3416 XWindowAttributes wattr; 3563 XWindowAttributes wattr;
3417 Window wdummy; 3564 Window wdummy;
3565 dDisp;
3418 3566
3419 if (nargs == 0) 3567 if (nargs == 0)
3420 return; 3568 return;
3421 3569
3422 switch (args[0]) 3570 switch (args[0])
3423 { 3571 {
3424 /* 3572 /*
3425 * commands 3573 * commands
3426 */ 3574 */
3427 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (disp, parent[0]);
3429 break; 3577 break;
3430 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (disp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3580 break;
3434 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (disp, parent[0], args[1], args[2]);
3436 break; 3583 break;
3437 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3586 break;
3440 case 5: /* raise window */ 3587 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (disp, parent[0]);
3442 break; 3589 break;
3443 case 6: /* lower window */ 3590 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (disp, parent[0]);
3445 break; 3592 break;
3446 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3447 scr_touch (true); 3594 scr_touch (true);
3448 break; 3595 break;
3449 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
3452 break; 3599 break;
3453 3600
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3602 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
3459 break; 3606 break;
3460 3607
3461 3608
3462 /* 3609 /*
3463 * reports - some output format copied from XTerm 3610 * reports - some output format copied from XTerm
3464 */ 3611 */
3465 case 11: /* report window state */ 3612 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3613 XGetWindowAttributes (disp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3615 break;
3469 case 13: /* report window position */ 3616 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3618 XTranslateCoordinates (disp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3619 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3620 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3621 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3622 break;
3476 case 14: /* report window size (pixels) */ 3623 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3626 break;
3480 case 18: /* report text area size (chars) */ 3627 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3628 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3629 break;
3483 case 19: /* report window size (chars) */ 3630 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3631 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3632 break;
3486 case 20: /* report icon label */ 3633 case 20: /* report icon label */
3487 { 3634 {
3488 char *s; 3635 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3636 XGetIconName (disp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3638 XFree (s);
3492 } 3639 }
3493 break; 3640 break;
3494 case 21: /* report window title */ 3641 case 21: /* report window title */
3495 { 3642 {
3496 char *s; 3643 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3644 XFetchName (disp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3646 XFree (s);
3500 } 3647 }
3501 break; 3648 break;
3502 } 3649 }
3503} 3650}
… …
3506/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
3507/* 3654/*
3508 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3656 * ends_how is terminator used. returned input must be free()'d
3510 */ 3657 */
3511unsigned char * 3658char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3660{
3514 unicode_t ch; 3661 unicode_t ch;
3515 bool seen_esc = false; 3662 bool seen_esc = false;
3516 unsigned int n = 0; 3663 unsigned int n = 0;
… …
3535 else if (ch < 0x20) 3682 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3683 return NULL; /* other control character - exit */
3537 3684
3538 seen_esc = false; 3685 seen_esc = false;
3539 3686
3540 if (n >= sizeof (string) - 1) 3687 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3688 // stop at some sane length
3542 return NULL; 3689 return NULL;
3543 3690
3544 if (ch == C0_SYN) 3691 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3692 string[n++] = cmd_get8 ();
… …
3549 3696
3550 string[n++] = '\0'; 3697 string[n++] = '\0';
3551 3698
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3700
3554 return (unsigned char *)rxvt_wcstombs (string); 3701 return rxvt_wcstombs (string);
3555} 3702}
3556 3703
3557/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3558/* 3705/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3707 */
3561void 3708void
3562rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3563{ 3710{
3564 unsigned char *s; 3711 char *s;
3565 unicode_t eh; 3712 unicode_t eh;
3566 3713
3567 /* 3714 /*
3568 * Not handled yet 3715 * Not handled yet
3569 */ 3716 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3590 3737
3591 if (ch == ';') 3738 if (ch == ';')
3592 { 3739 {
3593 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3594 3741
3595 if (s) 3742 if (s)
3596 { 3743 {
3597 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3598 free (s); 3745 free (s);
3599 } 3746 }
3600 } 3747 }
3601} 3748}
3602 3749
3603void 3750void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3752{
3606 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3607 { 3754 {
3608 unsigned short r, g, b; 3755 unsigned short r, g, b;
3609 pix_colors_focused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (display, r, g, b);
… …
3613 set_window_color (color, str); 3760 set_window_color (color, str);
3614} 3761}
3615 3762
3616/* 3763/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3765 */
3641void 3766void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3768{
3644 int changed = 0; 3769 int changed = 0;
3645 int color; 3770 int color;
3646 char *buf, *name; 3771 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3772 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3773 int saveop = op;
3774 dDisp;
3649 3775
3650 assert (str != NULL); 3776 assert (str != NULL);
3651 switch (op) 3777 switch (op)
3652 { 3778 {
3653 case XTerm_name: 3779 case XTerm_name:
… …
3669 unsigned long bytes_after; 3795 unsigned long bytes_after;
3670 unsigned char *value = 0; 3796 unsigned char *value = 0;
3671 const char *str = ""; 3797 const char *str = "";
3672 3798
3673 if (prop 3799 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3800 && XGetWindowProperty (disp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3801 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3802 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3803 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3804 && actual_type != None
3679 && actual_format == 8) 3805 && actual_format == 8)
… …
3691 { 3817 {
3692 *eq = 0; 3818 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3819 set_utf8_property (display->atom (str), eq + 1);
3694 } 3820 }
3695 else 3821 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3822 XDeleteProperty (disp, parent[0],
3697 display->atom (str)); 3823 display->atom (str));
3698 } 3824 }
3699 break; 3825 break;
3700 3826
3701 case XTerm_Color: 3827 case XTerm_Color:
… …
3703 { 3829 {
3704 if ((name = strchr (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3831 break;
3706 3832
3707 *name++ = '\0'; 3833 *name++ = '\0';
3708 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3709 3835
3710 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3837 break;
3712 3838
3713 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3840 *buf++ = '\0';
3715 3841
3716 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3717 { 3843 {
3718 unsigned short r, g, b; 3844 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 } 3847 }
3722 else 3848 else
3723 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3724 } 3850 }
3725 break; 3851 break;
3726 case XTerm_Color00: 3852 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3728 break; 3854 break;
3729 case XTerm_Color01: 3855 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3731 break; 3857 break;
3732#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3735 break; 3861 break;
… …
3739 break; 3865 break;
3740 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3742 break; 3868 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break;
3753 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break; 3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3880 break;
3881 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3883 break;
3756#endif 3884#endif
3757#if TRANSPARENT && TINTING 3885#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3886 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760 check_our_parents (); 3888 check_our_parents ();
3761 if (am_transparent) 3889 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3763 break; 3891 break;
3764#endif 3892#endif
3765 3893
3766 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3767 if (*str != ';') 3895 if (*str != ';')
3768 { 3896 {
3769#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true); 3900 scr_touch (true);
3901#endif
3774 } 3902 }
3903
3775 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3776 { 3905 {
3777 str++; 3906 str++;
3778#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
3780#endif 3909#endif
3781
3782 } 3910 }
3911
3783 if (changed) 3912 if (changed)
3784 { 3913 {
3785#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3915 resize_pixmap ();
3787#endif
3788 scr_touch (true); 3916 scr_touch (true);
3917#endif
3789 } 3918 }
3790 break; 3919 break;
3791 3920
3792 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3794 break; 3923 break;
3795 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3797 break; 3926 break;
3798 3927
3799 case XTerm_logfile: 3928 case XTerm_logfile:
3800 // TODO, when secure mode? 3929 // TODO, when secure mode?
3801 break; 3930 break;
3802 3931
3932#if 0
3933 case Rxvt_dumpscreen: /* no error notices */
3934 {
3935 int fd;
3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3937 {
3938 scr_dump (fd);
3939 close (fd);
3940 }
3941 }
3942 break;
3943#endif
3803 case XTerm_font: 3944 case XTerm_font:
3804 op = URxvt_font; 3945 op = URxvt_font;
3805 case URxvt_font: 3946 case URxvt_font:
3806#if ENABLE_STYLES 3947#if ENABLE_STYLES
3807 case URxvt_boldFont: 3948 case URxvt_boldFont:
3808 case URxvt_italicFont: 3949 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3950 case URxvt_boldItalicFont:
3810#endif 3951#endif
3811 if (query) 3952 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3953 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3955 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3956 resp);
3816 else 3957 else
3817 { 3958 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3959 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3960
… …
3822 set_fonts (); 3963 set_fonts ();
3823 } 3964 }
3824 break; 3965 break;
3825 3966
3826#if ENABLE_FRILLS 3967#if ENABLE_FRILLS
3827 case XTerm_locale: 3968 case URxvt_locale:
3828 if (query) 3969 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3830 else 3971 else
3831 { 3972 {
3832 set_locale (str); 3973 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3974 pty.set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3975 init_xlocale ();
3836# endif
3837 } 3976 }
3838 break; 3977 break;
3839#endif
3840 3978
3841#ifdef MENUBAR 3979 case URxvt_view_up:
3842 case XTerm_Menu: 3980 case URxvt_view_down:
3843 if (options & Opt_insecure) 3981 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3982 int lines = atoi (str);
3983
3984 if (lines)
3985 scr_page (op == URxvt_view_up ? UP : DN, lines);
3986 else
3987 scr_erase_savelines ();
3988 }
3989
3845 break; 3990 break;
3846#endif 3991#endif
3847#if 0 3992
3848 case XTerm_dumpscreen: /* no error notices */ 3993#if ENABLE_PERL
3849 { 3994 case URxvt_perl:
3850 int fd; 3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3996 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3997 break;
3858#endif 3998#endif
3859 } 3999 }
3860} 4000}
3861/*----------------------------------------------------------------------*/ 4001/*----------------------------------------------------------------------*/
… …
3913 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
3914 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
3915 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
3917 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc
3919 { menuBar_esc, PrivMode_menuBar },
3920#endif
3921 // 18, 19 printing-related 4058 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
3923#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 4062#endif
… …
3970 } 4107 }
3971 4108
3972 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4110 switch (arg[i])
3974 { 4111 {
4112#if ENABLE_STYLES
4113 case 1021:
4114 set_option (Opt_intensityStyles, mode);
4115
4116 scr_touch (true);
4117 break;
4118#endif
3975 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
3976 case 1049: 4120 case 1049:
3977 if (options & Opt_secondaryScreen) 4121 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4122 if (mode == 0)
3979 scr_cursor (RESTORE); 4123 scr_cursor (RESTORE);
3980 else if (mode == 1) 4124 else if (mode == 1)
3981 scr_cursor (SAVE); 4125 scr_cursor (SAVE);
3982 break; 4126 break;
… …
3994 */ 4138 */
3995 PrivMode (1, PrivMode_vt52); 4139 PrivMode (1, PrivMode_vt52);
3996 break; 4140 break;
3997 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4144 break;
4001 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 4146 set_option (Opt_jumpScroll, !state);
4006 break; 4147 break;
4007 case 5: /* reverse video */ 4148 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
4009 break; 4150 break;
4010 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
… …
4016 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4020 break; 4161 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4029 case scrollBar_esc: 4163 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4031 { 4165 {
4032 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
4051#if 0 4185#if 0
4052 case 1001: 4186 case 1001:
4053 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
4054#endif 4188#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 4190 set_option (Opt_scrollTtyOutput, !state);
4060 break; 4191 break;
4061 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 4193 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 4194 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4198 scr_erase_screen (2);
4071 scr_change_screen (state); 4199 scr_change_screen (state);
4072 break; 4200 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4202 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4205 scr_erase_screen (2);
4078 break; 4206 break;
4079 default: 4207 default:
4080 break; 4208 break;
… …
4208 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
4209 break; 4337 break;
4210 4338
4211 //case 50: // not variable spacing 4339 //case 50: // not variable spacing
4212 4340
4213#ifndef NO_BRIGHTCOLOR 4341#if ENABLE_FRILLS
4214 case 90: 4342 case 90:
4215 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
4216 case 92: 4344 case 92:
4217 case 93: 4345 case 93:
4218 case 94: 4346 case 94:
… …
4230 case 106: 4358 case 106:
4231 case 107: 4359 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4361 break;
4234#endif 4362#endif
4235
4236 } 4363 }
4237 } 4364 }
4238} 4365}
4239/*}}} */ 4366/*}}} */
4240 4367
… …
4264 */ 4391 */
4265void 4392void
4266rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
4267{ 4394{
4268 va_list arg_ptr; 4395 va_list arg_ptr;
4269 unsigned char buf[256]; 4396 char buf[256];
4270 4397
4271 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4400 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4401 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
4280 */ 4407 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 4409
4283void 4410void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 4412{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4415
4416 if (pty.pty < 0)
4417 return;
4418
4286 if (v_buflen == 0) 4419 if (v_buflen == 0)
4287 { 4420 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4289 4422
4290 if ((unsigned int)written == len) 4423 if ((unsigned int)written == len)
… …
4292 4425
4293 data += written; 4426 data += written;
4294 len -= written; 4427 len -= written;
4295 } 4428 }
4296 4429
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 4431
4299 memcpy (v_buffer + v_buflen, data, len); 4432 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4433 v_buflen += len;
4301 4434
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4435 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4321 } 4454 }
4322 4455
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4456 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4457 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4459 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4460}
4329 4461
4330/*----------------------- end-of-file (C source) -----------------------*/ 4462/*----------------------- end-of-file (C source) -----------------------*/
4331 4463

Diff Legend

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