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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 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
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
… …
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
207 scr_overlay_new (0, -1, width, len + 2); 213 scr_overlay_new (x, y, width, len + 2);
208 214
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 216
211 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
212 { 218 {
… …
215 ch = *chr++; 221 ch = *chr++;
216 222
217 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
220#if !UNICODE3 226# if !UNICODE3
221 if (ch >= 0x10000) 227 if (ch >= 0x10000)
222 ch = 0xfffd; 228 ch = 0xfffd;
223#endif 229# endif
224 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
225 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
226 } 234 }
227 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
228 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
230 243
231 free (fname); 244 free (fname);
232 245
233#if ENABLE_COMBINING 246# if ENABLE_COMBINING
234 if (alloc) 247 if (alloc)
235 delete [] alloc; 248 delete [] alloc;
236#endif 249# endif
237} 250}
238#endif 251#endif
239 252
240void 253void
241rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
258 mb[0] = ch[0]; 271 mb[0] = ch[0];
259 len = 1; 272 len = 1;
260 } 273 }
261 274
262 if (len > 0) 275 if (len > 0)
263 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
264 else 277 else
265 scr_bell (); 278 scr_bell ();
266 } 279 }
267 280
268 iso14755buf = 0; 281 iso14755buf = 0;
… …
285 298
286 return -1; 299 return -1;
287} 300}
288#endif 301#endif
289 302
290/*{{{ Convert the keypress event into a string */
291void 303void
292rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
293{ 305{
294 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
295 unsigned int newlen; 307 unsigned int newlen;
296 KeySym keysym; 308 KeySym keysym;
297#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */
299#endif
300 int valid_keysym; 309 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
302 316
303 /* 317 /*
304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
305 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
306 * 320 *
… …
324 Status status_return; 338 Status status_return;
325 339
326#if 0 340#if 0
327#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
328 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
331 else 345 else
332#endif 346#endif
333#endif 347#endif
334 { 348 {
… …
371 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
372 } 386 }
373 else 387 else
374#endif 388#endif
375 { 389 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
378 } 392 }
379 393
380 if (valid_keysym) 394 if (valid_keysym)
381 { 395 {
… …
433 scr_move_to (0, 1); 447 scr_move_to (0, 1);
434 return; 448 return;
435 } 449 }
436 else if (keysym == XK_End) 450 else if (keysym == XK_End)
437 { 451 {
438 scr_move_to (1, 0); 452 scr_move_to (1, 1);
439 return; 453 return;
440 } 454 }
441 } 455 }
442#endif 456#endif
443 } 457 }
… …
454 { 468 {
455 switch (keysym) 469 switch (keysym)
456 { 470 {
457 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
458 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
459 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
460 return; 474 return;
461#if TODO 475#if TODO
462 /* rxvt extras */ 476 /* rxvt extras */
463 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
464 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
483 { 497 {
484 commit_iso14755 (); 498 commit_iso14755 ();
485 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
486# if ISO_14755 500# if ISO_14755
487 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
488# endif 510# endif
489 return; 511 return;
490 } 512 }
491 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
492 { 514 {
… …
845 { 867 {
846#ifdef META8_OPTION 868#ifdef META8_OPTION
847 /* set 8-bit on */ 869 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
849 { 871 {
850 unsigned char *ch; 872 char *ch;
851 873
852 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 875 *ch |= 0x80;
854 876
855 meta = 0; 877 meta = 0;
… …
857#endif 879#endif
858 /* nil */ ; 880 /* nil */ ;
859 } 881 }
860 } 882 }
861 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
862 if (len <= 0) 887 if (len <= 0)
863 return; /* not mapped */ 888 return; /* not mapped */
864 889
865 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
866 if (view_start) 891 if (view_start)
867 { 892 {
868 view_start = 0; 893 view_start = 0;
869 want_refresh = 1; 894 want_refresh = 1;
870 } 895 }
… …
888#ifdef META8_OPTION 913#ifdef META8_OPTION
889 && meta_char == C0_ESC 914 && meta_char == C0_ESC
890#endif 915#endif
891 ) 916 )
892 { 917 {
893 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
894 tt_write (&ch, 1); 919 tt_write (&ch, 1);
895 } 920 }
896 921
897#if defined(DEBUG_CMD)
898 /* Display keyboard buffer contents */
899 unsigned char *p;
900 int i;
901
902 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
903 for (i = 0, p = kbuf; i < len; i++, p++)
904 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
905 fprintf (stderr, "'\n");
906#endif /* DEBUG_CMD */
907 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
908} 923}
909/*}}} */
910 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */
914unsigned int 1003unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 1005{
917 unsigned int n, s; 1006 unsigned int n, s;
918 1007
919 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
957 } 1046 }
958#endif 1047#endif
959 1048
960 if (want_refresh) 1049 if (want_refresh)
961 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
962 scr_refresh (refresh_type); 1089 scr_refresh ();
963 scrollbar_show (1); 1090 scrollbar_show (1);
964#ifdef USE_XIM 1091#ifdef USE_XIM
965 IMSendSpot (); 1092 IMSendSpot ();
966#endif 1093#endif
967 } 1094 }
… …
970} 1097}
971 1098
972void 1099void
973rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
974{ 1101{
975 SET_R (this); 1102 make_current ();
976 SET_LOCALE (locale);
977 1103
978 display->flush (); 1104 display->flush ();
979 1105
980 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 1108}
983 1109
984void 1110void
985rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
986{ 1112{
987 SET_R (this); 1113 make_current ();
988 SET_LOCALE (locale);
989 1114
990 refresh_limit = 1; 1115 refresh_limit = 1;
991 refresh_count = 0; 1116 refresh_count = 0;
992 flush (); 1117 flush ();
993} 1118}
… …
997rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
998{ 1123{
999 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1000 want_refresh = 1; 1125 want_refresh = 1;
1001 1126
1002 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1003} 1128}
1004#endif 1129#endif
1005 1130
1006#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1007void 1132void
… …
1021rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1022{ 1147{
1023 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1024 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1025 { 1150 {
1026 refresh_type |= SMOOTH_REFRESH;
1027 want_refresh = 1; 1151 want_refresh = 1;
1028 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1029 } 1153 }
1030} 1154}
1031#endif 1155#endif
… …
1035rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1036{ 1160{
1037 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1038 { 1162 {
1039 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1040 refresh_type |= SMOOTH_REFRESH;
1041 want_refresh = 1; 1164 want_refresh = 1;
1042 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1043 } 1166 }
1044} 1167}
1045#endif 1168#endif
… …
1050{ 1173{
1051 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1053 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1054 { 1177 {
1055 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1056 view_start == 0)
1057 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1058 1180
1059 refresh_type |= SMOOTH_REFRESH;
1060 want_refresh = 1; 1181 want_refresh = 1;
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1183 }
1063} 1184}
1064#endif 1185#endif
1065 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1066bool 1212bool
1067rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1068{ 1214{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1216
1071 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1072 { 1218 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1220 n = 0;
1075 } 1221 }
1076 1222
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1080 1226
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1082 1228
1083 if (n > 0) 1229 if (r > 0)
1084 { 1230 {
1085 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1086 return true; 1232 return true;
1087 } 1233 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1089 { 1242 {
1090 pty_ev.stop (); 1243 pty_ev.stop ();
1091 1244
1092 if (!(options & Opt_hold)) 1245 if (!option (Opt_hold))
1093 destroy (); 1246 destroy ();
1094 } 1247 }
1095 1248
1096 return false; 1249 return false;
1097} 1250}
1098 1251
1099void 1252void
1100rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1101{ 1254{
1102 SET_R (this); 1255 make_current ();
1103 SET_LOCALE (locale);
1104 1256
1105 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1106 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1107 while (pty_fill ()) 1259 while (pty_fill ())
1108 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1113} 1265}
1114 1266
1115void 1267void
1116rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1117{ 1269{
1118 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1119 recolour_cursor (); 1271 recolour_cursor ();
1120 1272
1121#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1274 hidden_pointer = 0;
1123 1275
1124 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1278#endif
1127} 1279}
1128 1280
1129#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1130void 1282void
1131rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1132{ 1284{
1133 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1134 return; 1286 return;
1135 1287
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1137 XFlush (display->display); 1289 XFlush (dpy);
1138 1290
1139 hidden_pointer = 1; 1291 hidden_pointer = 1;
1140} 1292}
1141 1293
1142void 1294void
1143rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1144{ 1296{
1145 SET_R (this); 1297 make_current ();
1146 SET_LOCALE (locale);
1147 1298
1148 pointer_blank (); 1299 pointer_blank ();
1149} 1300}
1150#endif 1301#endif
1151 1302
… …
1216 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1217 (32 + x + 1), 1368 (32 + x + 1),
1218 (32 + y + 1)); 1369 (32 + y + 1));
1219} 1370}
1220 1371
1221#ifdef USING_W11LIB
1222void
1223rxvt_W11_process_x_event (XEvent *ev)
1224{
1225 rxvt_t *r = rxvt_get_r ();
1226
1227 x_cb (*ev);
1228}
1229#endif
1230
1231/*{{{ process an X event */ 1372/*{{{ process an X event */
1232void 1373void
1233rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1234{ 1375{
1235 dDisp; 1376 make_current ();
1236 1377
1237 SET_R (this); 1378 dLocal (Display *, dpy);
1238 SET_LOCALE (locale);
1239 1379
1240#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1242 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1243 if (hidden_cursor) 1383 return;
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248 1384
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1250 }
1251#endif
1252
1253#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1255 {
1256 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease)
1259 if (hidden_pointer)
1260 pointer_unblank ();
1261
1262 if (ev.type == KeyPress && hidden_pointer == 0)
1263 pointer_blank ();
1264 }
1265#endif
1266
1267 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1388 unsigned int unused_mask;
1270 1389
1271 switch (ev.type) 1390 switch (ev.type)
1272 { 1391 {
1273 case KeyPress: 1392 case KeyPress:
1274#if ISO_14755 1393 key_press (ev.xkey);
1275 if (!(iso14755buf & ISO_14755_52))
1276#endif
1277 lookup_key (ev.xkey);
1278
1279 break; 1394 break;
1280 1395
1281 case KeyRelease: 1396 case KeyRelease:
1282 { 1397 key_release (ev.xkey);
1283#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1284 KeySym ks;
1285
1286 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1287#endif
1288
1289#if ENABLE_FRILLS || ISO_14755
1290 // ISO 14755 support
1291 if (iso14755buf)
1292 if (iso14755buf & ISO_14755_52)
1293 {
1294# if ENABLE_OVERLAY
1295 scr_overlay_off ();
1296# endif
1297# if ISO_14755
1298 // iso14755 part 5.2 handling: release time
1299 // first: controls
1300 if ((ev.xkey.state & ControlMask)
1301 && ((ks >= 0x40 && ks <= 0x5f)
1302 || (ks >= 0x61 && ks <= 0x7f)))
1303 {
1304 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1305 commit_iso14755 ();
1306 return; // case-break;
1307 }
1308
1309 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1310 if (i[0] == ks)
1311 {
1312 iso14755buf = ISO_14755_51 | i[1];
1313 commit_iso14755 ();
1314 return; // case-break;
1315 }
1316
1317 scr_bell ();
1318# endif
1319 iso14755buf = 0;
1320 break;
1321 }
1322 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327 if (iso14755buf & ISO_14755_51)
1328 commit_iso14755 ();
1329#if ISO_14755
1330 else if (iso14755buf & ISO_14755_STARTED)
1331 {
1332 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1333
1334 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1335 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1336 }
1337# endif
1338 else
1339 iso14755buf = 0;
1340 }
1341#endif
1342
1343#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1344 if (!(ev.xkey.state & ControlMask))
1345 slip_wheel_ev.stop ();
1346 else if (ks == XK_Control_L || ks == XK_Control_R)
1347 mouse_slip_wheel_speed = 0;
1348#endif
1349 break; 1398 break;
1350 }
1351 1399
1352 case ButtonPress: 1400 case ButtonPress:
1353 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1354 break; 1402 break;
1355 1403
… …
1357 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1358 break; 1406 break;
1359 1407
1360 case ClientMessage: 1408 case ClientMessage:
1361 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1363 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1365 destroy (); 1419 destroy ();
1420 }
1366#if ENABLE_EWMH 1421#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1371#endif 1437#endif
1372 } 1438 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1382#ifdef OFFIX_DND
1383 /* OffiX Dnd (drag 'n' drop) protocol */
1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1385 && (ev.xclient.data.l[0] == DndFile
1386 || ev.xclient.data.l[0] == DndDir
1387 || ev.xclient.data.l[0] == DndLink))
1388 {
1389 /* Get Dnd data */
1390 Atom ActualType;
1391 int ActualFormat;
1392 unsigned char *data;
1393 unsigned long Size, RemainingBytes;
1394
1395 XGetWindowProperty (disp, display->root,
1396 xa[XA_DNDSELECTION],
1397 0L, 1000000L,
1398 False, AnyPropertyType,
1399 &ActualType, &ActualFormat,
1400 &Size, &RemainingBytes,
1401 &data);
1402 set_string_property (XA_CUT_BUFFER0, data);
1403 XFree (data);
1404 selection_paste (display->root, XA_CUT_BUFFER0, true);
1405 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1406 }
1407#endif /* OFFIX_DND */
1408 break; 1439 break;
1409 1440
1410 case MappingNotify: 1441 case MappingNotify:
1411 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1412 break; 1443 break;
… …
1435 break; 1466 break;
1436 } 1467 }
1437 break; 1468 break;
1438 1469
1439 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1440 focus_in (); 1474 focus_in ();
1441 break; 1475 break;
1442 1476
1443 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1444 focus_out (); 1481 focus_out ();
1445 break; 1482 break;
1446 1483
1447 case ConfigureNotify: 1484 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1449 { 1486 {
1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1488 ;
1452 1489
1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1454 { 1491 {
1455 seen_resize = 1; 1492 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1494 }
1458 1495
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1460 if (options & Opt_transparent) 1499 if (option (Opt_transparent))
1461 check_our_parents (); 1500 check_our_parents ();
1462#endif 1501#endif
1463 } 1502 }
1464 break; 1503 break;
1465 1504
1466 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1510
1471 break; 1511 break;
1472 1512
1473 case SelectionClear: 1513 case SelectionClear:
1474 selection_clear (); 1514 selection_clear ();
… …
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break; 1520 break;
1481 1521
1482 case SelectionRequest: 1522 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1524 break;
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1532 break;
1485 1533
1486 case UnmapNotify: 1534 case UnmapNotify:
1487 mapped = 0; 1535 mapped = 0;
1488#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1490#endif 1538#endif
1491 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492
1493 case MapNotify:
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1497#endif
1498 break; 1540 break;
1499 1541
1500#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1501 case ReparentNotify: 1543 case ReparentNotify:
1502 rootwin_cb (ev); 1544 rootwin_cb (ev);
… …
1508 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1509 { 1551 {
1510 do 1552 do
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1514 1556
1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1516 1558
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1520 1562
1521 scr_refresh (refresh_type); 1563 want_refresh = 1;
1522 } 1564 }
1523 else 1565 else
1524 { 1566 {
1525 XEvent unused_event; 1567 XEvent unused_event;
1526 1568
1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1528 ; 1570 ;
1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1530 ; 1572 ;
1531 1573
1532 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1533 { 1575 {
1534 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1535 scrollbar_show (0); 1577 scrollbar_show (0);
1536 } 1578 }
1537#ifdef MENUBAR
1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1539 menubar_expose ();
1540#endif
1541 1579
1542#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1543 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1544 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1545#endif 1583#endif
1546 } 1584 }
1547 break; 1585 break;
1548 1586
1549 case MotionNotify: 1587 case MotionNotify:
1550#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1589 if (hidden_pointer)
1552 pointer_unblank (); 1590 pointer_unblank ();
1553#endif 1591#endif
1554#if MENUBAR
1555 if (isMenuBarWindow (ev.xany.window))
1556 {
1557 menubar_control (ev.xbutton);
1558 break;
1559 }
1560#endif
1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1593 break;
1563 1594
1564 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1565 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1601 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1569 ; 1603 ;
1570 1604
1571 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1572 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1574 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1575 &ev.xbutton.state); 1609 &ev.xbutton.state);
1576#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1640#endif 1674#endif
1641 } 1675 }
1642 } 1676 }
1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1644 { 1678 {
1645 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1646 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1647 ; 1681 ;
1648 1682
1649 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1650 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1651 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1652 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1653 &unused_mask); 1687 &unused_mask);
1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1655 scrollbar_size ()); 1689 scrollbar_size ());
1656 scr_refresh (refresh_type); 1690 want_refresh = 1;
1657 refresh_limit = 0; 1691 refresh_limit = 0;
1658 scrollbar_show (1); 1692 scrollbar_show (1);
1659 } 1693 }
1660 break; 1694 break;
1661 } 1695 }
1696
1697#if defined(CURSOR_BLINK)
1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1699 {
1700 if (hidden_cursor)
1701 {
1702 hidden_cursor = 0;
1703 want_refresh = 1;
1704 }
1705
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1707 }
1708#endif
1709
1710#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1712 {
1713 if (ev.type == MotionNotify
1714 || ev.type == ButtonPress
1715 || ev.type == ButtonRelease)
1716 if (hidden_pointer)
1717 pointer_unblank ();
1718
1719 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank ();
1721 }
1722#endif
1662} 1723}
1663 1724
1664void 1725void
1665rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1666{ 1727{
1667 if (!focus) 1728 if (!focus)
1668 { 1729 {
1669 focus = 1; 1730 focus = 1;
1670 want_refresh = 1; 1731 want_refresh = 1;
1732
1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1734
1671#if USE_XIM 1735#if USE_XIM
1672 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1673 { 1737 {
1674 IMSetStatusPosition (); 1738 IMSetPosition ();
1675 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1676 } 1740 }
1677#endif 1741#endif
1678#if CURSOR_BLINK 1742#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1743 if (option (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1681#endif 1745#endif
1682#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1684 { 1748 {
1685 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1686 scr_recolour (); 1750 scr_recolour ();
1687 } 1751 }
1688#endif 1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1764 }
1765#endif
1689 } 1766 }
1690} 1767}
1691 1768
1692void 1769void
1693rxvt_term::focus_out () 1770rxvt_term::focus_out ()
… …
1695 if (focus) 1772 if (focus)
1696 { 1773 {
1697 focus = 0; 1774 focus = 0;
1698 want_refresh = 1; 1775 want_refresh = 1;
1699 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1700#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1701 iso14755buf = 0; 1782 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1705#endif 1787#endif
1706#if USE_XIM 1788#if USE_XIM
1707 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1709#endif 1791#endif
1710#if CURSOR_BLINK 1792#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1793 if (option (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1795 hidden_cursor = 0;
1714#endif 1796#endif
1715#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1720 } 1802 }
1721#endif 1803#endif
1722 } 1804 }
1723} 1805}
1724 1806
1725#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1726void 1821void
1727rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1728{ 1823{
1729 SET_R (this); 1824 make_current ();
1730 SET_LOCALE (locale);
1731 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1732 switch (ev.type) 1831 switch (ev.type)
1733 { 1832 {
1734 case PropertyNotify: 1833 case PropertyNotify:
1735 /* 1834 /*
1736 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1840 return;
1742 1841
1743 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1744 case ReparentNotify: 1843 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1747 break; 1846 break;
1748 } 1847 }
1848# endif
1749} 1849}
1750#endif 1850#endif
1751 1851
1752void 1852void
1753rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1754{ 1854{
1755 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1756 1856
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1758 if (!bypass_keystate) 1859 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1861
1761 /* 1862 /*
1762 * VT window processing of button press 1863 * VT window processing of button press
1763 */ 1864 */
1764 if (ev.window == vt) 1865 if (ev.window == vt)
1765 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1766#if ISO_14755 1870#if ISO_14755
1767 // 5.4 1871 // 5.4
1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1769 { 1873 {
1770 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1784 { 1888 {
1785 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1786 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1787 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1788 { 1893 {
1789 /* only report double clicks */ 1894 /* only report double clicks */
1790 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1791 mouse_report (ev); 1896 mouse_report (ev);
… …
1823#else 1928#else
1824 selection.rect = false; 1929 selection.rect = false;
1825#endif 1930#endif
1826 1931
1827 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1829 { 1934 {
1830 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1832 else 1937 else
1833 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1998 } 2103 }
1999 2104
2000 break; 2105 break;
2001 } 2106 }
2002 } 2107 }
2108
2003 return; 2109 return;
2004 } 2110 }
2005#if MENUBAR
2006 /*
2007 * Menubar window processing of button press
2008 */
2009 if (isMenuBarWindow (ev.window))
2010 menubar_control (ev);
2011#endif
2012} 2111}
2013 2112
2014void 2113void
2015rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
2016{ 2115{
… …
2022 2121
2023 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2024 { 2123 {
2025 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2026 scrollbar_show (0); 2125 scrollbar_show (0);
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 refresh_type &= ~SMOOTH_REFRESH;
2029#endif
2030 } 2126 }
2031 2127
2032#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2033 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2034 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2035#endif 2131#endif
2036 2132
2037 if (ev.window == vt) 2133 if (ev.window == vt)
2038 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2039#if ISO_14755 2138#if ISO_14755
2040 // 5.4 2139 // 5.4
2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2042 return; 2141 return;
2043#endif 2142#endif
2143
2044 if (reportmode) 2144 if (reportmode)
2045 { 2145 {
2046 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2047 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2048 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2078 { 2178 {
2079 case Button1: 2179 case Button1:
2080 case Button3: 2180 case Button3:
2081 selection_make (ev.time); 2181 selection_make (ev.time);
2082 break; 2182 break;
2183
2083 case Button2: 2184 case Button2:
2084 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2085 break; 2187 break;
2188
2086#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2087 case Button4: 2190 case Button4:
2088 case Button5: 2191 case Button5:
2089 { 2192 {
2090 int i; 2193 int i;
… …
2092 2195
2093 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2094 2197
2095 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2096 i = 1; 2199 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2201 i = nrow - 1;
2099 else 2202 else
2100 i = 5; 2203 i = 5;
2101 2204
2102# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2112 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2113 } 2216 }
2114 else 2217 else
2115 { 2218 {
2116# endif 2219# endif
2117# ifdef JUMP_MOUSE_WHEEL
2118 scr_page (v, i); 2220 scr_page (v, i);
2119 scr_refresh (SMOOTH_REFRESH);
2120 scrollbar_show (1); 2221 scrollbar_show (1);
2121# else
2122 while (i--)
2123 {
2124 scr_page (v, 1);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1);
2127 }
2128# endif
2129# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
2130 } 2223 }
2131#endif 2224# endif
2132 } 2225 }
2133 break; 2226 break;
2134#endif 2227#endif
2135 } 2228 }
2136 } 2229 }
2137#ifdef MENUBAR
2138 else if (isMenuBarWindow (ev.window))
2139 menubar_control (ev);
2140#endif
2141} 2230}
2142 2231
2143#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2144#if TINTING 2233#if TINTING
2145/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2146 2235
2147typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2148 2237
2149void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2150{ 2239{
2151 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2152 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2153 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2154 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2155 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2156 int i; 2245 int i;
2157 2246
2158 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2159 2248
2160 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2161 2250
2162 /* for convenience */ 2251 /* for convenience */
2163 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2384 Atom atype; 2473 Atom atype;
2385 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2386 Window root, oldp, *list; 2475 Window root, oldp, *list;
2387 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2388 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2389 dDisp;
2390 2478
2391 pchanged = 0; 2479 pchanged = 0;
2392 2480
2393 if (!(options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2395 2483
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2398 2486
2399 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2400 2488
2401 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2402 { 2490 {
2403 if (am_transparent) 2491 if (am_transparent)
2404 { 2492 {
2405 pchanged = 1; 2493 pchanged = 1;
2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2407 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2408 } 2496 }
2409 2497
2410 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2411 } 2499 }
2412 2500
2413 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2414 XSync (disp, False); 2502 XSync (dpy, False);
2415 2503
2416 /* 2504 /*
2417 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2418 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2419 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2420 */ 2508 */
2421 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2422 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2423 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2424 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2425 2513
2426 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2427 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2431 2519
2432 if (!i || prop == NULL 2520 if (!i || prop == NULL
2433#if TINTING 2521#if TINTING
2434 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2435#endif 2523#endif
2436 ) 2524 )
2437 have_pixmap = 0; 2525 have_pixmap = 0;
2438 else 2526 else
2439 { 2527 {
… …
2452 Window cr; 2540 Window cr;
2453 XImage *image; 2541 XImage *image;
2454 GC gc; 2542 GC gc;
2455 XGCValues gcvalue; 2543 XGCValues gcvalue;
2456 2544
2457 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2458 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2459 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2460 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2461 nx = ny = 0; 2549 nx = ny = 0;
2462 2550
… …
2475 } 2563 }
2476 2564
2477 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2478 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2479 2567
2480 XSync (disp, False); 2568 XSync (dpy, False);
2481 allowedxerror = -1; 2569 allowedxerror = -1;
2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2483 2571
2484 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2485 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2486 allowedxerror = 0; 2574 allowedxerror = 0;
2487 2575
… …
2490 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2491 { 2579 {
2492 pchanged = 1; 2580 pchanged = 1;
2493 if (pixmap != None) 2581 if (pixmap != None)
2494 { 2582 {
2495 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2496 pixmap = None; 2584 pixmap = None;
2497 } 2585 }
2498 } 2586 }
2499 2587
2500 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2501 } 2589 }
2502 else 2590 else
2503 { 2591 {
2504 if (pixmap != None) 2592 if (pixmap != None)
2505 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2506 2594
2507#if TINTING 2595#if TINTING
2508 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2509 { 2597 {
2510 unsigned short rm, gm, bm;
2511 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2512 2599
2600 rgba c;
2513 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2514 2602
2515 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2516 } 2604 }
2517#endif 2605#endif
2518 2606
2519 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2520 szHint.width, szHint.height, image->depth);
2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2522 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2523 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2524 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2525 XDestroyImage (image); 2612 XDestroyImage (image);
2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2527 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2528 2615
2529 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2530 pchanged = 1; 2617 pchanged = 1;
2531 2618
2532 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2533 } 2620 }
2534 } 2621 }
2535 2622
2536 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538 else 2625 else
2539 { 2626 {
2540 unsigned int n; 2627 unsigned int n;
2541 /* 2628 /*
2542 * InheritPixmap transparency 2629 * InheritPixmap transparency
2543 */ 2630 */
2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2545 { 2632 {
2546 oldp = parent[i]; 2633 oldp = parent[i];
2547 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2548 &parent[i], &list, &n);
2549 XFree (list); 2635 XFree (list);
2550 2636
2551 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2552 { 2638 {
2553 if (oldp != None) 2639 if (oldp != None)
… …
2561 } 2647 }
2562 2648
2563 n = 0; 2649 n = 0;
2564 2650
2565 if (pchanged) 2651 if (pchanged)
2566 {
2567 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2568 { 2653 {
2569 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2571 { 2657 {
2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2573 break; 2659 break;
2574 } 2660 }
2575 } 2661 }
2576 }
2577 2662
2578 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2579 { 2664 {
2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2582 am_transparent = 0; 2667 am_transparent = 0;
2583 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2584 } 2669 }
2585 else 2670 else
2586 { 2671 {
2587#if WAIT_FOR_WM
2588 /* wait (an arbitrary period) for the WM to do its thing
2589 * needed for fvwm2.2.2 (and before?) */
2590 sleep (1);
2591#endif
2592 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2593 { 2673 {
2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2595 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2596 } 2676 }
2597 2677
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2599 am_transparent = 1; 2679 am_transparent = 1;
2600 } 2680 }
2601 2681
2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2603 parent[i] = None; 2683 parent[i] = None;
2604 } 2684 }
2605 2685
2606 if (scrollBar.win) 2686 if (scrollBar.win)
2607 { 2687 {
2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2609 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2610 scrollbar_show (0); 2690 scrollbar_show (0);
2611 } 2691 }
2612 2692
2613 if (am_transparent) 2693 if (am_transparent)
… …
2625 2705
2626bool 2706bool
2627rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2628{ 2708{
2629 bool flag = false; 2709 bool flag = false;
2630 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2632 2712
2633 for (;;) 2713 for (;;)
2634 { 2714 {
2635 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2636 { 2716 {
2637 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2718 ch = next_char ();
2639 }
2640 2719
2641 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2642 break; 2721 break;
2722 }
2643 2723
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2724 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2725 {
2646 if (!seen_input) 2726 if (!seen_input)
2647 { 2727 {
… …
2656 if (seen_resize && cmd_pid) 2736 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2737 kill (-cmd_pid, SIGWINCH);
2658 } 2738 }
2659 2739
2660 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2742 bool refreshnow = false;
2663 int nlines = 0; 2743 int nlines = 0;
2664 unicode_t *str = buf; 2744 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2746
2667 for (;;) 2747 for (;;)
2668 { 2748 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2749 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2750 break;
… …
2676 if (ch == C0_LF) 2756 if (ch == C0_LF)
2677 nlines++; 2757 nlines++;
2678 2758
2679 refresh_count++; 2759 refresh_count++;
2680 2760
2681 if (!(options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2763 {
2684 refreshnow = true; 2764 refreshnow = true;
2765 refresh_count = 0;
2685 ch = NOCHAR; 2766 ch = NOCHAR;
2686 break; 2767 break;
2687 } 2768 }
2688 2769
2689 // scr_add_lines only works for nlines <= nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2771 if (nlines >= nrow - 1)
2691 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2692 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2693 nlines = 0; 2777 nlines = 0;
2694 str = buf; 2778 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2779 eol = str + min (ncol, UBUFSIZ);
2696 } 2780 }
2697 2781
… …
2710 2794
2711 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2796 ch = next_char ();
2713 } 2797 }
2714 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2716 2802
2717 /* 2803 /*
2718 * If there have been a lot of new lines, then update the screen 2804 * If there have been a lot of new lines, then update the screen
2719 * What the heck I'll cheat and only refresh less than every page-full. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2720 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2808 */
2723 if (refreshnow) 2809 if (refreshnow)
2724 { 2810 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2812 refresh_limit++;
2727 else 2813 else
2728 { 2814 {
2729 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2730 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2731 } 2819 }
2732 } 2820 }
2733 2821
2734 } 2822 }
2735 else 2823 else
… …
2750 } 2838 }
2751 2839
2752 return flag; 2840 return flag;
2753} 2841}
2754 2842
2755// read the next octet
2756unicode_t
2757rxvt_term::next_octet ()
2758{
2759 return cmdbuf_ptr < cmdbuf_endp
2760 ? *cmdbuf_ptr++
2761 : NOCHAR;
2762}
2763
2764// read the next character 2843// read the next character
2765unicode_t 2844wchar_t
2766rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2767{ 2846{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2848 {
2770 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2773 2852
2774 wchar_t wc; 2853 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2854 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2855
2777 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2778 { 2857 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2860 break;
2782 } 2861 }
2783 2862
2784 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2865
2787 // assume wchar == unicode 2866 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2868 return wc & UNICODE_MASK;
2790 } 2869 }
2791 2870
2792 return NOCHAR; 2871 return NOCHAR;
2793} 2872}
2873
2874// read the next octet
2875uint32_t
2876rxvt_term::next_octet () NOTHROW
2877{
2878 return cmdbuf_ptr < cmdbuf_endp
2879 ? (unsigned char)*cmdbuf_ptr++
2880 : NOCHAR;
2881}
2882
2883static class out_of_input out_of_input;
2794 2884
2795/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2796/* 2886/*
2797 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2798 * to the command. 2888 * to the command.
2799 */ 2889 */
2800unicode_t 2890wchar_t
2801rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2802{ 2892{
2803 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2804 2894
2805 if (c == NOCHAR) 2895 if (c == NOCHAR)
2806 throw out_of_input; 2896 throw out_of_input;
2807 2897
2808 return c; 2898 return c;
2809} 2899}
2810 2900
2811unicode_t 2901uint32_t
2812rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2813{ 2903{
2814 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2815 2905
2816 if (c == NOCHAR) 2906 if (c == NOCHAR)
2817 throw out_of_input; 2907 throw out_of_input;
2818 2908
2819 return c; 2909 return c;
… …
2919 case C0_ESC: 3009 case C0_ESC:
2920 process_escape_seq (); 3010 process_escape_seq ();
2921 break; 3011 break;
2922 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 3015 else
2927 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 3017 break;
2930 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2931 scr_bell (); 3019 scr_bell ();
2932 break; 3020 break;
2933 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
3057 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3058 break; 3146 break;
3059 case '+': 3147 case '+':
3060 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3061 break; 3149 break;
3062#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3063 case '6': 3151 case '6':
3064 scr_backindex (); 3152 scr_backindex ();
3065 break; 3153 break;
3066#endif 3154#endif
3067 case '7': 3155 case '7':
3068 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3069 break; 3157 break;
3070 case '8': 3158 case '8':
3071 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3072 break; 3160 break;
3073#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3074 case '9': 3162 case '9':
3075 scr_forwardindex (); 3163 scr_forwardindex ();
3076 break; 3164 break;
3077#endif 3165#endif
3078 case '=': 3166 case '=':
… …
3088 break; 3176 break;
3089 3177
3090 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
3092 { 3180 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 3183 }
3096 break; 3184 break;
3097 3185
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
3121 process_dcs_seq (); 3209 process_dcs_seq ();
3122 break; 3210 break;
3123 3211
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
3129 3216
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3219 process_csi_seq ();
… …
3241 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3242 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3243 if (arg[p] == -1) 3330 if (arg[p] == -1)
3244 arg[p] = ndef; 3331 arg[p] = ndef;
3245 3332
3246#ifdef DEBUG_CMD
3247 fprintf (stderr, "CSI ");
3248 for (p = 0; p < nargs; p++)
3249 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3250 fprintf (stderr, "%c\n", ch);
3251#endif
3252
3253 /* 3333 /*
3254 * private mode handling 3334 * private mode handling
3255 */ 3335 */
3256 if (priv) 3336 if (priv)
3257 { 3337 {
3258 switch (priv) 3338 switch (priv)
3259 { 3339 {
3260 case '>': 3340 case '>':
3261 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3263 break; 3352 break;
3264 case '?': 3353 case '?':
3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3266 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3267 break; 3356 break;
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3467 break;
3379 3468
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3471 break;
3384 3472
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
3387 break; 3475 break;
… …
3394 break; 3482 break;
3395 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3396 scr_report_position (); 3484 scr_report_position ();
3397 break; 3485 break;
3398 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3487 if (option (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3489 break;
3402 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3492 break;
… …
3471 break; 3559 break;
3472 case CSI_75: 3560 case CSI_75:
3473 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3474 break; 3562 break;
3475 3563
3476#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3477 case CSI_74: 3565 case CSI_74:
3478 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3479 break; 3567 break;
3480#endif 3568#endif
3481 3569
… …
3488 break; 3576 break;
3489 } 3577 }
3490} 3578}
3491/*}}} */ 3579/*}}} */
3492 3580
3493#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3494/* ARGSUSED */ 3582/* ARGSUSED */
3495void 3583void
3496rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3497{ 3585{
3498 int x, y; 3586 int x, y;
3499 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3500 Window wdummy; 3588 Window wdummy;
3501 dDisp; 3589
3590 dLocal (Display *, dpy);
3502 3591
3503 if (nargs == 0) 3592 if (nargs == 0)
3504 return; 3593 return;
3505 3594
3506 switch (args[0]) 3595 switch (args[0])
3507 { 3596 {
3508 /* 3597 /*
3509 * commands 3598 * commands
3510 */ 3599 */
3511 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3512 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3513 break; 3602 break;
3514 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3515 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3516 break; 3605 break;
3517 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3518 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3519 break; 3608 break;
3520 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3522 break; 3611 break;
3523 case 5: /* raise window */ 3612 case 5: /* raise window */
3524 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3525 break; 3614 break;
3526 case 6: /* lower window */ 3615 case 6: /* lower window */
3527 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3528 break; 3617 break;
3529 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3530 scr_touch (true); 3619 scr_touch (true);
3531 break; 3620 break;
3532 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3539 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3540 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3541 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3542 break; 3631 break;
3543 3632
3544
3545 /* 3633 /*
3546 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3547 */ 3635 */
3548 case 11: /* report window state */ 3636 case 11: /* report window state */
3549 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3551 break; 3639 break;
3552 case 13: /* report window position */ 3640 case 13: /* report window position */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3554 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3555 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3556 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3557 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3558 break; 3646 break;
3559 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3560 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3562 break; 3650 break;
3563 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3564 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3565 break; 3653 break;
… …
3567 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3568 break; 3656 break;
3569 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3570 { 3658 {
3571 char *s; 3659 char *s;
3572 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3662 XFree (s);
3575 } 3663 }
3576 break; 3664 break;
3577 case 21: /* report window title */ 3665 case 21: /* report window title */
3578 { 3666 {
3579 char *s; 3667 char *s;
3580 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3670 XFree (s);
3583 } 3671 }
3584 break; 3672 break;
3585 } 3673 }
3586} 3674}
… …
3589/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3590/* 3678/*
3591 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3593 */ 3681 */
3594unsigned char * 3682char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3684{
3597 unicode_t ch; 3685 unicode_t ch;
3598 bool seen_esc = false; 3686 bool seen_esc = false;
3599 unsigned int n = 0; 3687 unsigned int n = 0;
… …
3613 seen_esc = true; 3701 seen_esc = true;
3614 continue; 3702 continue;
3615 } 3703 }
3616 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3617 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3618 else if (ch < 0x20) 3708 else if (ch < 0x20)
3619 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3620 3710
3621 seen_esc = false; 3711 seen_esc = false;
3622 3712
3623 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3624 // stop at some sane length 3714 // stop at some sane length
3625 return NULL; 3715 return NULL;
3626 3716
3627 if (ch == C0_SYN)
3628 string[n++] = cmd_get8 ();
3629 else
3630 string[n++] = ch; 3717 string[n++] = ch;
3631 } 3718 }
3632 3719
3633 string[n++] = '\0'; 3720 string[n++] = '\0';
3634 3721
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3723
3637 return (unsigned char *)rxvt_wcstombs (string); 3724 return rxvt_wcstombs (string);
3638} 3725}
3639 3726
3640/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3641/* 3728/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3729 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3730 */
3644void 3731void
3645rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3646{ 3733{
3647 unsigned char *s; 3734 char *s;
3648 unicode_t eh; 3735 unicode_t eh;
3649 3736
3650 /* 3737 /*
3651 * Not handled yet 3738 * Not handled yet
3652 */ 3739 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3673 3760
3674 if (ch == ';') 3761 if (ch == ';')
3675 { 3762 {
3676 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3677 3764
3678 if (s) 3765 if (s)
3679 { 3766 {
3680 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3681 free (s); 3768 free (s);
3682 } 3769 }
3683 } 3770 }
3684} 3771}
3685 3772
3686void 3773void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3775{
3689 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3690 { 3777 {
3691 unsigned short r, g, b; 3778 rgba c;
3692 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3693 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3694 } 3787 }
3695 else 3788 else
3696 set_window_color (color, str); 3789 set_window_color (color, str);
3697} 3790}
3698 3791
3699/* 3792/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3794 */
3702void 3795void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3797{
3705 int changed = 0;
3706 int color; 3798 int color;
3707 char *buf, *name; 3799 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3709 int saveop = op; 3801 int saveop = op;
3710 dDisp; 3802
3803 dLocal (Display *, dpy);
3711 3804
3712 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3713 switch (op) 3810 switch (op)
3714 { 3811 {
3715 case XTerm_name: 3812 case XTerm_name:
3716 set_title (str); 3813 set_title (str);
3717 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3731 unsigned long bytes_after; 3828 unsigned long bytes_after;
3732 unsigned char *value = 0; 3829 unsigned char *value = 0;
3733 const char *str = ""; 3830 const char *str = "";
3734 3831
3735 if (prop 3832 if (prop
3736 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3737 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3738 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3739 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3740 && actual_type != None 3837 && actual_type != None
3741 && actual_format == 8) 3838 && actual_format == 8)
3742 str = (const char *)(value); 3839 str = (const char *)(value);
3743 3840
3744 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3745 3842
3746 XFree (value); 3843 XFree (value);
3747 } 3844 }
3748 else 3845 else
3749 { 3846 {
… …
3753 { 3850 {
3754 *eq = 0; 3851 *eq = 0;
3755 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3756 } 3853 }
3757 else 3854 else
3758 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3759 display->atom (str)); 3856 display->atom (str));
3760 } 3857 }
3761 break; 3858 break;
3762 3859
3763 case XTerm_Color: 3860 case XTerm_Color:
… …
3765 { 3862 {
3766 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3767 break; 3864 break;
3768 3865
3769 *name++ = '\0'; 3866 *name++ = '\0';
3770 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3771 3868
3772 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3773 break; 3870 break;
3774 3871
3775 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3776 *buf++ = '\0'; 3873 *buf++ = '\0';
3777 3874
3778 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3779 {
3780 unsigned short r, g, b;
3781 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3782 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3783 }
3784 else
3785 set_window_color (color + minCOLOR, name);
3786 } 3876 }
3787 break; 3877 break;
3788 case XTerm_Color00: 3878 case XTerm_Color00:
3789 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3790 break; 3880 break;
3791 case XTerm_Color01: 3881 case XTerm_Color01:
3792 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3793 break; 3883 break;
3794#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3795 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3796 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3797 break; 3887 break;
3798#endif 3888#endif
3799 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3800 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3801 break; 3891 break;
3802 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3803 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3804 break; 3894 break;
3805#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3806 case XTerm_Color_BD:
3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3808 break;
3809 case XTerm_Color_UL:
3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3811 break;
3812 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3814 break; 3906 break;
3815 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3817 break; 3909 break;
3818#endif 3910#endif
3819#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3820 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3822 check_our_parents (); 3915 check_our_parents ();
3916
3823 if (am_transparent) 3917 if (am_transparent)
3824 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3825 break;
3826#endif
3827 3919
3920 break;
3921#endif
3922
3828 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3829 if (*str != ';') 3925 if (*str != ';')
3830 { 3926 {
3831#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3832 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3833 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3834#endif
3835 scr_touch (true); 3930 scr_touch (true);
3931#endif
3836 } 3932 }
3933
3934 int changed = 0;
3935
3837 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3838 { 3937 {
3839 str++; 3938 str++;
3840#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3841 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3842#endif 3941#endif
3843 } 3942 }
3844 3943
3845 if (changed) 3944 if (changed)
3846 { 3945 {
3847#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3848 resize_pixmap (); 3947 resize_pixmap ();
3849#endif
3850 scr_touch (true); 3948 scr_touch (true);
3949#endif
3851 } 3950 }
3951 }
3852 break; 3952 break;
3853 3953
3854 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3855 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3856 break; 3956 break;
3857 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3858 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3859 break; 3959 break;
3860 3960
3861 case XTerm_logfile: 3961 case XTerm_logfile:
3862 // TODO, when secure mode? 3962 // TODO, when secure mode?
3863 break; 3963 break;
3864 3964
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0 3965#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3873 { 3967 {
3874 int fd; 3968 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 { 3970 {
3877 scr_dump (fd); 3971 scr_dump (fd);
… …
3888 case URxvt_italicFont: 3982 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3890#endif 3984#endif
3891 if (query) 3985 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3989 resp);
3896 else 3990 else
3897 { 3991 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3901 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3902 set_fonts (); 3996 set_fonts ();
3903 } 3997 }
3904 break; 3998 break;
3905 3999
3906#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
3907 case URxvt_locale: 4009 case URxvt_locale:
3908 if (query) 4010 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3910 else 4012 else
3911 { 4013 {
3912 set_locale (str); 4014 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3914 init_xlocale (); 4016 init_xlocale ();
3915 } 4017 }
3916 break; 4018 break;
3917 4019
3918 case URxvt_view_up: 4020 case URxvt_view_up:
3919 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3920 int lines = atoi (str); 4023 int lines = atoi (str);
3921 4024
3922 if (lines) 4025 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 4027 else
3925 {
3926 scr_erase_savelines (); 4028 scr_erase_savelines ();
3927 } 4029 }
3928 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet
3929 break; 4038 break;
3930#endif 4039#endif
3931 } 4040 }
3932} 4041}
3933/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3964 return state; 4073 return state;
3965} 4074}
3966 4075
3967/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3968void 4077void
3969rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3970{ 4079{
3971 unsigned int i, j; 4080 unsigned int i, j;
3972 int state; 4081 int state;
3973 4082
3974 static const struct 4083 static const struct
… …
3985 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3986 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3987 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
3989 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3990#ifdef menuBar_esc
3991 { menuBar_esc, PrivMode_menuBar },
3992#endif
3993 // 18, 19 printing-related 4099 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
3995#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3996 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3997#endif 4103#endif
… …
4042 } 4148 }
4043 4149
4044 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4151 switch (arg[i])
4046 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
4047 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4048 case 1049: 4161 case 1049:
4049 if (options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
4050 if (mode == 0) 4163 if (mode == 0)
4051 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4052 else if (mode == 1) 4165 else if (mode == 1)
4053 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4054 break; 4167 break;
… …
4069 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4185 break;
4073 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 4187 set_option (Opt_jumpScroll, !state);
4078 break; 4188 break;
4079 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4081 break; 4191 break;
4082 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4088 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
4089 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4090 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4091 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4092 break; 4202 break;
4093#ifdef menuBar_esc
4094 case menuBar_esc:
4095#ifdef MENUBAR
4096 map_menuBar (state);
4097#endif
4098 break;
4099#endif
4100#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4101 case scrollBar_esc: 4204 case scrollBar_esc:
4102 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4103 { 4206 {
4104 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4123#if 0 4226#if 0
4124 case 1001: 4227 case 1001:
4125 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
4126#endif 4229#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
4132 break; 4232 break;
4133 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 4235 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4239 scr_erase_screen (2);
4143 scr_change_screen (state); 4240 scr_change_screen (state);
4144 break; 4241 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4243 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4246 scr_erase_screen (2);
4150 break; 4247 break;
4151 default: 4248 default:
4152 break; 4249 break;
… …
4280 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4281 break; 4378 break;
4282 4379
4283 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4284 4381
4285#ifndef NO_BRIGHTCOLOR 4382#if !ENABLE_MINIMAL
4286 case 90: 4383 case 90:
4287 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4288 case 92: 4385 case 92:
4289 case 93: 4386 case 93:
4290 case 94: 4387 case 94:
… …
4302 case 106: 4399 case 106:
4303 case 107: 4400 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4402 break;
4306#endif 4403#endif
4307
4308 } 4404 }
4309 } 4405 }
4310} 4406}
4311/*}}} */ 4407/*}}} */
4312 4408
… …
4336 */ 4432 */
4337void 4433void
4338rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
4339{ 4435{
4340 va_list arg_ptr; 4436 va_list arg_ptr;
4341 unsigned char buf[256]; 4437 char buf[256];
4342 4438
4343 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4441 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4442 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 4447 * or generated by us in response to a query ESC sequence.
4352 */ 4448 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4450
4355void 4451void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4453{
4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4455 return;
4456
4457 if (pty->pty < 0)
4458 return;
4459
4358 if (v_buflen == 0) 4460 if (v_buflen == 0)
4359 { 4461 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4361 4463
4362 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4363 return; 4465 return;
4364 4466
4365 data += written; 4467 data += written;
4366 len -= written; 4468 len -= written;
4367 } 4469 }
4368 4470
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4472
4371 memcpy (v_buffer + v_buflen, data, len); 4473 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4474 v_buflen += len;
4373 4475
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4375} 4477}
4376 4478
4377void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4378{ 4480{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380 4482
4381 if (written > 0) 4483 if (written > 0)
4382 { 4484 {
4383 v_buflen -= written; 4485 v_buflen -= written;
4384 4486

Diff Legend

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