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.313 by root, Wed Jul 5 22:46:14 2006 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);
… …
845 { 859 {
846#ifdef META8_OPTION 860#ifdef META8_OPTION
847 /* set 8-bit on */ 861 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
849 { 863 {
850 unsigned char *ch; 864 char *ch;
851 865
852 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 867 *ch |= 0x80;
854 868
855 meta = 0; 869 meta = 0;
… …
857#endif 871#endif
858 /* nil */ ; 872 /* nil */ ;
859 } 873 }
860 } 874 }
861 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
862 if (len <= 0) 879 if (len <= 0)
863 return; /* not mapped */ 880 return; /* not mapped */
864 881
865 if (options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 883 if (view_start)
867 { 884 {
868 view_start = 0; 885 view_start = 0;
869 want_refresh = 1; 886 want_refresh = 1;
870 } 887 }
… …
888#ifdef META8_OPTION 905#ifdef META8_OPTION
889 && meta_char == C0_ESC 906 && meta_char == C0_ESC
890#endif 907#endif
891 ) 908 )
892 { 909 {
893 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
894 tt_write (&ch, 1); 911 tt_write (&ch, 1);
895 } 912 }
896 913
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); 914 tt_write (kbuf, (unsigned int)len);
908} 915}
909/*}}} */
910 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */
914unsigned int 995unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 997{
917 unsigned int n, s; 998 unsigned int n, s;
918 999
919 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
957 } 1038 }
958#endif 1039#endif
959 1040
960 if (want_refresh) 1041 if (want_refresh)
961 { 1042 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 {
1045 int row = view_start;
1046 int end_row = row + nrow;
1047
1048 while (row > top_row && ROW (row - 1).is_longer ())
1049 --row;
1050
1051 do
1052 {
1053 int start_row = row;
1054 line_t *l;
1055
1056 do
1057 {
1058 l = &ROW (row++);
1059
1060 if (!(l->f & LINE_FILTERED))
1061 {
1062 // line not filtered, mark it as filtered
1063 l->f |= LINE_FILTERED;
1064 while (l->is_longer ())
1065 {
1066 l = &ROW (row++);
1067 l->f |= LINE_FILTERED;
1068 }
1069
1070 // and filter it
1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1072
1073 break;
1074 }
1075 }
1076 while (l->is_longer () && row < end_row);
1077 }
1078 while (row < end_row);
1079 }
1080
962 scr_refresh (refresh_type); 1081 scr_refresh ();
963 scrollbar_show (1); 1082 scrollbar_show (1);
964#ifdef USE_XIM 1083#ifdef USE_XIM
965 IMSendSpot (); 1084 IMSendSpot ();
966#endif 1085#endif
967 } 1086 }
… …
970} 1089}
971 1090
972void 1091void
973rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
974{ 1093{
975 SET_R (this); 1094 make_current ();
976 SET_LOCALE (locale);
977 1095
978 display->flush (); 1096 display->flush ();
979 1097
980 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 1100}
983 1101
984void 1102void
985rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
986{ 1104{
987 SET_R (this); 1105 make_current ();
988 SET_LOCALE (locale);
989 1106
990 refresh_limit = 1; 1107 refresh_limit = 1;
991 refresh_count = 0; 1108 refresh_count = 0;
992 flush (); 1109 flush ();
993} 1110}
… …
997rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
998{ 1115{
999 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1000 want_refresh = 1; 1117 want_refresh = 1;
1001 1118
1002 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1003} 1120}
1004#endif 1121#endif
1005 1122
1006#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1007void 1124void
… …
1021rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1022{ 1139{
1023 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1024 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1025 { 1142 {
1026 refresh_type |= SMOOTH_REFRESH;
1027 want_refresh = 1; 1143 want_refresh = 1;
1028 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1029 } 1145 }
1030} 1146}
1031#endif 1147#endif
… …
1035rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1036{ 1152{
1037 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1038 { 1154 {
1039 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1040 refresh_type |= SMOOTH_REFRESH;
1041 want_refresh = 1; 1156 want_refresh = 1;
1042 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1043 } 1158 }
1044} 1159}
1045#endif 1160#endif
… …
1050{ 1165{
1051 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1053 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1054 { 1169 {
1055 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1056 view_start == 0)
1057 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1058 1172
1059 refresh_type |= SMOOTH_REFRESH;
1060 want_refresh = 1; 1173 want_refresh = 1;
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1175 }
1063} 1176}
1064#endif 1177#endif
1065 1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1066bool 1204bool
1067rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1068{ 1206{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1208
1071 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1072 { 1210 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1212 n = 0;
1075 } 1213 }
1076 1214
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1080 1218
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1082 1220
1083 if (n > 0) 1221 if (r > 0)
1084 { 1222 {
1085 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
1086 return true; 1224 return true;
1087 } 1225 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1227 {
1228#if LINUX_YIELD_HACK
1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1231#endif
1232 }
1233 else
1089 { 1234 {
1090 pty_ev.stop (); 1235 pty_ev.stop ();
1091 1236
1092 if (!(options & Opt_hold)) 1237 if (!OPTION (Opt_hold))
1093 destroy (); 1238 destroy ();
1094 } 1239 }
1095 1240
1096 return false; 1241 return false;
1097} 1242}
1098 1243
1099void 1244void
1100rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1101{ 1246{
1102 SET_R (this); 1247 make_current ();
1103 SET_LOCALE (locale);
1104 1248
1105 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1106 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1107 while (pty_fill ()) 1251 while (pty_fill ())
1108 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1113} 1257}
1114 1258
1115void 1259void
1116rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1117{ 1261{
1118 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1119 recolour_cursor (); 1263 recolour_cursor ();
1120 1264
1121#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1266 hidden_pointer = 0;
1123 1267
1124 if (options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1270#endif
1127} 1271}
1128 1272
1129#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1130void 1274void
1131rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1132{ 1276{
1133 if (! (options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1134 return; 1278 return;
1135 1279
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1137 XFlush (display->display); 1281 XFlush (dpy);
1138 1282
1139 hidden_pointer = 1; 1283 hidden_pointer = 1;
1140} 1284}
1141 1285
1142void 1286void
1143rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1144{ 1288{
1145 SET_R (this); 1289 make_current ();
1146 SET_LOCALE (locale);
1147 1290
1148 pointer_blank (); 1291 pointer_blank ();
1149} 1292}
1150#endif 1293#endif
1151 1294
… …
1216 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1217 (32 + x + 1), 1360 (32 + x + 1),
1218 (32 + y + 1)); 1361 (32 + y + 1));
1219} 1362}
1220 1363
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 */ 1364/*{{{ process an X event */
1232void 1365void
1233rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1234{ 1367{
1235 dDisp; 1368 make_current ();
1236 1369
1237 SET_R (this); 1370 dLocal (Display *, dpy);
1238 SET_LOCALE (locale);
1239 1371
1240#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1242 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1243 if (hidden_cursor) 1375 return;
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248 1376
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // 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; 1378 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1380 unsigned int unused_mask;
1270 1381
1271 switch (ev.type) 1382 switch (ev.type)
1272 { 1383 {
1273 case KeyPress: 1384 case KeyPress:
1274#if ISO_14755 1385 key_press (ev.xkey);
1275 if (!(iso14755buf & ISO_14755_52))
1276#endif
1277 lookup_key (ev.xkey);
1278
1279 break; 1386 break;
1280 1387
1281 case KeyRelease: 1388 case KeyRelease:
1282 { 1389 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; 1390 break;
1350 }
1351 1391
1352 case ButtonPress: 1392 case ButtonPress:
1353 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1354 break; 1394 break;
1355 1395
… …
1357 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1358 break; 1398 break;
1359 1399
1360 case ClientMessage: 1400 case ClientMessage:
1361 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1363 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1365 destroy (); 1411 destroy ();
1412 }
1366#if ENABLE_EWMH 1413#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1371#endif 1429#endif
1372 } 1430 }
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; 1431 break;
1409 1432
1410 case MappingNotify: 1433 case MappingNotify:
1411 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1412 break; 1435 break;
… …
1445 break; 1468 break;
1446 1469
1447 case ConfigureNotify: 1470 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1449 { 1472 {
1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1474 ;
1452 1475
1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1454 { 1477 {
1455 seen_resize = 1; 1478 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1480 }
1458 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1485 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1486 check_our_parents ();
1462#endif 1487#endif
1463 } 1488 }
1464 break; 1489 break;
1465 1490
1466 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1496
1471 break; 1497 break;
1472 1498
1473 case SelectionClear: 1499 case SelectionClear:
1474 selection_clear (); 1500 selection_clear ();
… …
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break; 1506 break;
1481 1507
1482 case SelectionRequest: 1508 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1510 break;
1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1518 break;
1485 1519
1486 case UnmapNotify: 1520 case UnmapNotify:
1487 mapped = 0; 1521 mapped = 0;
1488#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1490#endif 1524#endif
1491 break; 1525 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; 1526 break;
1499 1527
1500#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1501 case ReparentNotify: 1529 case ReparentNotify:
1502 rootwin_cb (ev); 1530 rootwin_cb (ev);
… …
1508 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1509 { 1537 {
1510 do 1538 do
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1514 1542
1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1516 1544
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1520 1548
1521 scr_refresh (refresh_type); 1549 want_refresh = 1;
1522 } 1550 }
1523 else 1551 else
1524 { 1552 {
1525 XEvent unused_event; 1553 XEvent unused_event;
1526 1554
1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1528 ; 1556 ;
1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1530 ; 1558 ;
1531 1559
1532 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1533 { 1561 {
1534 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1535 scrollbar_show (0); 1563 scrollbar_show (0);
1536 } 1564 }
1537#ifdef MENUBAR
1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1539 menubar_expose ();
1540#endif
1541 1565
1542#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1543 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1544 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1545#endif 1569#endif
1546 } 1570 }
1547 break; 1571 break;
1548 1572
1549 case MotionNotify: 1573 case MotionNotify:
1550#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1575 if (hidden_pointer)
1552 pointer_unblank (); 1576 pointer_unblank ();
1553#endif 1577#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) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1579 break;
1563 1580
1564 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1565 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1587 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1569 ; 1589 ;
1570 1590
1571 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1572 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1574 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1575 &ev.xbutton.state); 1595 &ev.xbutton.state);
1576#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1640#endif 1660#endif
1641 } 1661 }
1642 } 1662 }
1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1644 { 1664 {
1645 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1646 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1647 ; 1667 ;
1648 1668
1649 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1650 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1651 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1652 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1653 &unused_mask); 1673 &unused_mask);
1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1655 scrollbar_size ()); 1675 scrollbar_size ());
1656 scr_refresh (refresh_type); 1676 want_refresh = 1;
1657 refresh_limit = 0; 1677 refresh_limit = 0;
1658 scrollbar_show (1); 1678 scrollbar_show (1);
1659 } 1679 }
1660 break; 1680 break;
1661 } 1681 }
1682
1683#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1685 {
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif
1695
1696#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 {
1699 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease)
1702 if (hidden_pointer)
1703 pointer_unblank ();
1704
1705 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank ();
1707 }
1708#endif
1662} 1709}
1663 1710
1664void 1711void
1665rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1666{ 1713{
1667 if (!focus) 1714 if (!focus)
1668 { 1715 {
1669 focus = 1; 1716 focus = 1;
1670 want_refresh = 1; 1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1671#if USE_XIM 1721#if USE_XIM
1672 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1673 { 1723 {
1674 IMSetStatusPosition (); 1724 IMSetPosition ();
1675 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1676 } 1726 }
1677#endif 1727#endif
1678#if CURSOR_BLINK 1728#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1729 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1681#endif 1731#endif
1682#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1684 { 1734 {
1685 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
… …
1695 if (focus) 1745 if (focus)
1696 { 1746 {
1697 focus = 0; 1747 focus = 0;
1698 want_refresh = 1; 1748 want_refresh = 1;
1699 1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1700#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1701 iso14755buf = 0; 1755 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1756# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1757 scr_overlay_off ();
1758# endif
1759 }
1705#endif 1760#endif
1706#if USE_XIM 1761#if USE_XIM
1707 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1709#endif 1764#endif
1710#if CURSOR_BLINK 1765#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1766 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1767 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1768 hidden_cursor = 0;
1714#endif 1769#endif
1715#if OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
… …
1718 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1719 scr_recolour (); 1774 scr_recolour ();
1720 } 1775 }
1721#endif 1776#endif
1722 } 1777 }
1778}
1779
1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1723} 1791}
1724 1792
1725#if TRANSPARENT 1793#if TRANSPARENT
1726void 1794void
1727rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1728{ 1796{
1729 SET_R (this); 1797 make_current ();
1730 SET_LOCALE (locale);
1731 1798
1732 switch (ev.type) 1799 switch (ev.type)
1733 { 1800 {
1734 case PropertyNotify: 1801 case PropertyNotify:
1735 /* 1802 /*
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1807 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1808 return;
1742 1809
1743 /* FALLTHROUGH */ 1810 /* FALLTHROUGH */
1744 case ReparentNotify: 1811 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1812 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1813 want_refresh = want_full_refresh = 1;
1747 break; 1814 break;
1748 } 1815 }
1749} 1816}
1750#endif 1817#endif
… …
1753rxvt_term::button_press (XButtonEvent &ev) 1820rxvt_term::button_press (XButtonEvent &ev)
1754{ 1821{
1755 int reportmode = 0, clickintime; 1822 int reportmode = 0, clickintime;
1756 1823
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1824 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1825
1758 if (!bypass_keystate) 1826 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1827 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1828
1761 /* 1829 /*
1762 * VT window processing of button press 1830 * VT window processing of button press
1763 */ 1831 */
1764 if (ev.window == vt) 1832 if (ev.window == vt)
1765 { 1833 {
1834 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1766#if ISO_14755 1837#if ISO_14755
1767 // 5.4 1838 // 5.4
1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1839 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1769 { 1840 {
1770 iso14755_54 (ev.x, ev.y); 1841 iso14755_54 (ev.x, ev.y);
… …
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1853#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1854 if (ev.button == MEvent.button && clickintime)
1784 { 1855 {
1785 /* same button, within alloted time */ 1856 /* same button, within alloted time */
1786 MEvent.clicks++; 1857 MEvent.clicks++;
1858
1787 if (MEvent.clicks > 1) 1859 if (MEvent.clicks > 1)
1788 { 1860 {
1789 /* only report double clicks */ 1861 /* only report double clicks */
1790 MEvent.clicks = 2; 1862 MEvent.clicks = 2;
1791 mouse_report (ev); 1863 mouse_report (ev);
… …
1823#else 1895#else
1824 selection.rect = false; 1896 selection.rect = false;
1825#endif 1897#endif
1826 1898
1827 /* allow shift+left click to extend selection */ 1899 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1900 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1829 { 1901 {
1830 if (MEvent.button == Button1 && clickintime) 1902 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1832 else 1904 else
1833 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
… …
1998 } 2070 }
1999 2071
2000 break; 2072 break;
2001 } 2073 }
2002 } 2074 }
2075
2003 return; 2076 return;
2004 } 2077 }
2005#if MENUBAR
2006 /*
2007 * Menubar window processing of button press
2008 */
2009 if (isMenuBarWindow (ev.window))
2010 menubar_control (ev);
2011#endif
2012} 2078}
2013 2079
2014void 2080void
2015rxvt_term::button_release (XButtonEvent &ev) 2081rxvt_term::button_release (XButtonEvent &ev)
2016{ 2082{
… …
2022 2088
2023 if (scrollbar_isUpDn ()) 2089 if (scrollbar_isUpDn ())
2024 { 2090 {
2025 scrollBar.setIdle (); 2091 scrollBar.setIdle ();
2026 scrollbar_show (0); 2092 scrollbar_show (0);
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 refresh_type &= ~SMOOTH_REFRESH;
2029#endif
2030 } 2093 }
2031 2094
2032#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2033 if (sel_scroll_ev.active) 2096 if (sel_scroll_ev.active)
2034 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2035#endif 2098#endif
2036 2099
2037 if (ev.window == vt) 2100 if (ev.window == vt)
2038 { 2101 {
2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2103 return;
2104
2039#if ISO_14755 2105#if ISO_14755
2040 // 5.4 2106 // 5.4
2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2107 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2042 return; 2108 return;
2043#endif 2109#endif
2110
2044 if (reportmode) 2111 if (reportmode)
2045 { 2112 {
2046 /* mouse report from vt window */ 2113 /* mouse report from vt window */
2047 /* don't report release of wheel "buttons" */ 2114 /* don't report release of wheel "buttons" */
2048 if (ev.button >= 4) 2115 if (ev.button >= 4)
… …
2078 { 2145 {
2079 case Button1: 2146 case Button1:
2080 case Button3: 2147 case Button3:
2081 selection_make (ev.time); 2148 selection_make (ev.time);
2082 break; 2149 break;
2150
2083 case Button2: 2151 case Button2:
2084 selection_request (ev.time, ev.x, ev.y); 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2085 break; 2154 break;
2155
2086#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2087 case Button4: 2157 case Button4:
2088 case Button5: 2158 case Button5:
2089 { 2159 {
2090 int i; 2160 int i;
… …
2092 2162
2093 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2094 2164
2095 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2096 i = 1; 2166 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2167 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2168 i = nrow - 1;
2099 else 2169 else
2100 i = 5; 2170 i = 5;
2101 2171
2102# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2112 slip_wheel_ev.start (); 2182 slip_wheel_ev.start ();
2113 } 2183 }
2114 else 2184 else
2115 { 2185 {
2116# endif 2186# endif
2117# ifdef JUMP_MOUSE_WHEEL
2118 scr_page (v, i); 2187 scr_page (v, i);
2119 scr_refresh (SMOOTH_REFRESH);
2120 scrollbar_show (1); 2188 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 2189# ifdef MOUSE_SLIP_WHEELING
2130 } 2190 }
2131#endif 2191# endif
2132 } 2192 }
2133 break; 2193 break;
2134#endif 2194#endif
2135 } 2195 }
2136 } 2196 }
2137#ifdef MENUBAR
2138 else if (isMenuBarWindow (ev.window))
2139 menubar_control (ev);
2140#endif
2141} 2197}
2142 2198
2143#ifdef TRANSPARENT 2199#ifdef TRANSPARENT
2144#if TINTING 2200#if TINTING
2145/* taken from aterm-0.4.2 */ 2201/* taken from aterm-0.4.2 */
2146 2202
2147typedef uint32_t RUINT32T; 2203typedef uint32_t RUINT32T;
2148 2204
2149void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2205void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2150{ 2206{
2151 int sh_r, sh_g, sh_b; 2207 int sh_r, sh_g, sh_b;
2152 RUINT32T mask_r, mask_g, mask_b; 2208 RUINT32T mask_r, mask_g, mask_b;
2153 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2209 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2154 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2210 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2155 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2211 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2156 int i; 2212 int i;
2157 2213
2158 Visual *visual = display->visual; 2214 Visual *visual = term->visual;
2159 2215
2160 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2216 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2161 2217
2162 /* for convenience */ 2218 /* for convenience */
2163 mask_r = visual->red_mask; 2219 mask_r = visual->red_mask;
… …
2384 Atom atype; 2440 Atom atype;
2385 unsigned char *prop = NULL; 2441 unsigned char *prop = NULL;
2386 Window root, oldp, *list; 2442 Window root, oldp, *list;
2387 Pixmap rootpixmap = None; 2443 Pixmap rootpixmap = None;
2388 XWindowAttributes wattr, wrootattr; 2444 XWindowAttributes wattr, wrootattr;
2389 dDisp;
2390 2445
2391 pchanged = 0; 2446 pchanged = 0;
2392 2447
2393 if (!(options & Opt_transparent)) 2448 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2395 2450
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2451 XGetWindowAttributes (dpy, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2452 rootdepth = wrootattr.depth;
2398 2453
2399 XGetWindowAttributes (disp, parent[0], &wattr); 2454 XGetWindowAttributes (dpy, parent[0], &wattr);
2400 2455
2401 if (rootdepth != wattr.depth) 2456 if (rootdepth != wattr.depth)
2402 { 2457 {
2403 if (am_transparent) 2458 if (am_transparent)
2404 { 2459 {
2405 pchanged = 1; 2460 pchanged = 1;
2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2461 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2407 am_transparent = am_pixmap_trans = 0; 2462 am_transparent = am_pixmap_trans = 0;
2408 } 2463 }
2409 2464
2410 return pchanged; /* Don't try any more */ 2465 return pchanged; /* Don't try any more */
2411 } 2466 }
2412 2467
2413 /* Get all X ops out of the queue so that our information is up-to-date. */ 2468 /* Get all X ops out of the queue so that our information is up-to-date. */
2414 XSync (disp, False); 2469 XSync (dpy, False);
2415 2470
2416 /* 2471 /*
2417 * Make the frame window set by the window manager have 2472 * Make the frame window set by the window manager have
2418 * the root background. Some window managers put multiple nested frame 2473 * the root background. Some window managers put multiple nested frame
2419 * windows for each client, so we have to take care about that. 2474 * windows for each client, so we have to take care about that.
2420 */ 2475 */
2421 i = (xa[XA_XROOTPMAP_ID] 2476 i = (xa[XA_XROOTPMAP_ID]
2422 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2477 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2423 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2478 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2424 &nitems, &bytes_after, &prop) == Success); 2479 &nitems, &bytes_after, &prop) == Success);
2425 2480
2426 if (!i || prop == NULL) 2481 if (!i || prop == NULL)
2427 i = (xa[XA_ESETROOT_PMAP_ID] 2482 i = (xa[XA_ESETROOT_PMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2431 2486
2432 if (!i || prop == NULL 2487 if (!i || prop == NULL
2433#if TINTING 2488#if TINTING
2434 || !rs[Rs_color + Color_tint] 2489 || !ISSET_PIXCOLOR (Color_tint)
2435#endif 2490#endif
2436 ) 2491 )
2437 have_pixmap = 0; 2492 have_pixmap = 0;
2438 else 2493 else
2439 { 2494 {
… …
2452 Window cr; 2507 Window cr;
2453 XImage *image; 2508 XImage *image;
2454 GC gc; 2509 GC gc;
2455 XGCValues gcvalue; 2510 XGCValues gcvalue;
2456 2511
2457 XTranslateCoordinates (disp, parent[0], display->root, 2512 XTranslateCoordinates (dpy, parent[0], display->root,
2458 0, 0, &sx, &sy, &cr); 2513 0, 0, &sx, &sy, &cr);
2459 nw = (unsigned int)szHint.width; 2514 nw = (unsigned int)szHint.width;
2460 nh = (unsigned int)szHint.height; 2515 nh = (unsigned int)szHint.height;
2461 nx = ny = 0; 2516 nx = ny = 0;
2462 2517
… …
2475 } 2530 }
2476 2531
2477 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2532 min_it (nw, (unsigned int) (wrootattr.width - sx));
2478 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2533 min_it (nh, (unsigned int) (wrootattr.height - sy));
2479 2534
2480 XSync (disp, False); 2535 XSync (dpy, False);
2481 allowedxerror = -1; 2536 allowedxerror = -1;
2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2537 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2483 2538
2484 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2539 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2485 /* XXX: may need a delay here? */ 2540 /* XXX: may need a delay here? */
2486 allowedxerror = 0; 2541 allowedxerror = 0;
2487 2542
… …
2490 if (am_transparent && am_pixmap_trans) 2545 if (am_transparent && am_pixmap_trans)
2491 { 2546 {
2492 pchanged = 1; 2547 pchanged = 1;
2493 if (pixmap != None) 2548 if (pixmap != None)
2494 { 2549 {
2495 XFreePixmap (disp, pixmap); 2550 XFreePixmap (dpy, pixmap);
2496 pixmap = None; 2551 pixmap = None;
2497 } 2552 }
2498 } 2553 }
2499 2554
2500 am_pixmap_trans = 0; 2555 am_pixmap_trans = 0;
2501 } 2556 }
2502 else 2557 else
2503 { 2558 {
2504 if (pixmap != None) 2559 if (pixmap != None)
2505 XFreePixmap (disp, pixmap); 2560 XFreePixmap (dpy, pixmap);
2506 2561
2507#if TINTING 2562#if TINTING
2508 if (ISSET_PIXCOLOR (Color_tint)) 2563 if (ISSET_PIXCOLOR (Color_tint))
2509 { 2564 {
2510 unsigned short rm, gm, bm;
2511 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2565 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2512 2566
2567 rgba c;
2513 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2568 pix_colors_focused [Color_tint].get (c);
2514 2569
2515 ShadeXImage (display, image, shade, rm, gm, bm); 2570 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2516 } 2571 }
2517#endif 2572#endif
2518 2573
2519 pixmap = XCreatePixmap (disp, vt, 2574 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2520 szHint.width, szHint.height, image->depth);
2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2575 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2522 XPutImage (disp, pixmap, gc, image, 0, 0, 2576 XPutImage (dpy, pixmap, gc, image, 0, 0,
2523 nx, ny, image->width, image->height); 2577 nx, ny, image->width, image->height);
2524 XFreeGC (disp, gc); 2578 XFreeGC (dpy, gc);
2525 XDestroyImage (image); 2579 XDestroyImage (image);
2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2580 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2527 XClearWindow (disp, parent[0]); 2581 XClearWindow (dpy, parent[0]);
2528 2582
2529 if (!am_transparent || !am_pixmap_trans) 2583 if (!am_transparent || !am_pixmap_trans)
2530 pchanged = 1; 2584 pchanged = 1;
2531 2585
2532 am_transparent = am_pixmap_trans = 1; 2586 am_transparent = am_pixmap_trans = 1;
2533 } 2587 }
2534 } 2588 }
2535 2589
2536 if (am_pixmap_trans) 2590 if (am_pixmap_trans)
2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2591 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538 else 2592 else
2539 { 2593 {
2540 unsigned int n; 2594 unsigned int n;
2541 /* 2595 /*
2542 * InheritPixmap transparency 2596 * InheritPixmap transparency
2543 */ 2597 */
2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2598 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2545 { 2599 {
2546 oldp = parent[i]; 2600 oldp = parent[i];
2547 XQueryTree (disp, parent[i - 1], &root, 2601 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2548 &parent[i], &list, &n);
2549 XFree (list); 2602 XFree (list);
2550 2603
2551 if (parent[i] == display->root) 2604 if (parent[i] == display->root)
2552 { 2605 {
2553 if (oldp != None) 2606 if (oldp != None)
… …
2561 } 2614 }
2562 2615
2563 n = 0; 2616 n = 0;
2564 2617
2565 if (pchanged) 2618 if (pchanged)
2566 {
2567 for (; n < (unsigned int)i; n++) 2619 for (; n < (unsigned int)i; n++)
2568 { 2620 {
2569 XGetWindowAttributes (disp, parent[n], &wattr); 2621 XGetWindowAttributes (dpy, parent[n], &wattr);
2622
2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2623 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2571 { 2624 {
2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2625 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2573 break; 2626 break;
2574 } 2627 }
2575 } 2628 }
2576 }
2577 2629
2578 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2630 if (n > (sizeof (parent) / sizeof (parent[0])))
2579 { 2631 {
2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2632 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2633 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2582 am_transparent = 0; 2634 am_transparent = 0;
2583 /* XXX: also turn off Opt_transparent? */ 2635 /* XXX: also turn off Opt_transparent? */
2584 } 2636 }
2585 else 2637 else
2586 { 2638 {
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++) 2639 for (n = 0; n < (unsigned int)i; n++)
2593 { 2640 {
2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2641 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2595 XClearWindow (disp, parent[n]); 2642 XClearWindow (dpy, parent[n]);
2596 } 2643 }
2597 2644
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2645 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2599 am_transparent = 1; 2646 am_transparent = 1;
2600 } 2647 }
2601 2648
2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2603 parent[i] = None; 2650 parent[i] = None;
2604 } 2651 }
2605 2652
2606 if (scrollBar.win) 2653 if (scrollBar.win)
2607 { 2654 {
2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2655 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2609 scrollBar.setIdle (); 2656 scrollBar.setIdle ();
2610 scrollbar_show (0); 2657 scrollbar_show (0);
2611 } 2658 }
2612 2659
2613 if (am_transparent) 2660 if (am_transparent)
… …
2625 2672
2626bool 2673bool
2627rxvt_term::cmd_parse () 2674rxvt_term::cmd_parse ()
2628{ 2675{
2629 bool flag = false; 2676 bool flag = false;
2630 unicode_t ch = NOCHAR; 2677 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2678 char *seq_begin; // remember start of esc-sequence here
2632 2679
2633 for (;;) 2680 for (;;)
2634 { 2681 {
2635 if (ch == NOCHAR) 2682 if (ch == NOCHAR)
2636 { 2683 {
2637 seq_begin = cmdbuf_ptr; 2684 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2685 ch = next_char ();
2639 }
2640 2686
2641 if (ch == NOCHAR) // TODO: improve 2687 if (ch == NOCHAR)
2642 break; 2688 break;
2689 }
2643 2690
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2692 {
2646 if (!seen_input) 2693 if (!seen_input)
2647 { 2694 {
… …
2656 if (seen_resize && cmd_pid) 2703 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2704 kill (-cmd_pid, SIGWINCH);
2658 } 2705 }
2659 2706
2660 /* Read a text string from the input buffer */ 2707 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2708 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2709 bool refreshnow = false;
2663 int nlines = 0; 2710 int nlines = 0;
2664 unicode_t *str = buf; 2711 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2712 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2713
2667 for (;;) 2714 for (;;)
2668 { 2715 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2717 break;
… …
2676 if (ch == C0_LF) 2723 if (ch == C0_LF)
2677 nlines++; 2724 nlines++;
2678 2725
2679 refresh_count++; 2726 refresh_count++;
2680 2727
2681 if (!(options & Opt_jumpScroll) 2728 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2730 {
2684 refreshnow = true; 2731 refreshnow = true;
2732 refresh_count = 0;
2685 ch = NOCHAR; 2733 ch = NOCHAR;
2686 break; 2734 break;
2687 } 2735 }
2688 2736
2689 // scr_add_lines only works for nlines <= nrow - 1. 2737 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2738 if (nlines >= nrow - 1)
2691 { 2739 {
2740 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2741 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2692 scr_add_lines (buf, nlines, str - buf); 2742 scr_add_lines (buf, str - buf, nlines);
2743
2693 nlines = 0; 2744 nlines = 0;
2694 str = buf; 2745 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2746 eol = str + min (ncol, UBUFSIZ);
2696 } 2747 }
2697 2748
… …
2710 2761
2711 seq_begin = cmdbuf_ptr; 2762 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2763 ch = next_char ();
2713 } 2764 }
2714 2765
2766 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, nlines, str - buf); 2768 scr_add_lines (buf, str - buf, nlines);
2716 2769
2717 /* 2770 /*
2718 * If there have been a lot of new lines, then update the screen 2771 * 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. 2772 * 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 2773 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2774 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2775 */
2723 if (refreshnow) 2776 if (refreshnow)
2724 { 2777 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2779 refresh_limit++;
2727 else 2780 else
2728 { 2781 {
2729 flag = true; 2782 flag = true;
2783 //TODO: due to popular request, implement "skipscroll" option here
2730 scr_refresh (refresh_type); 2784 scr_refresh ();
2785 want_refresh = 1;
2731 } 2786 }
2732 } 2787 }
2733 2788
2734 } 2789 }
2735 else 2790 else
… …
2750 } 2805 }
2751 2806
2752 return flag; 2807 return flag;
2753} 2808}
2754 2809
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 2810// read the next character
2765unicode_t 2811wchar_t
2766rxvt_term::next_char () 2812rxvt_term::next_char () NOTHROW
2767{ 2813{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2814 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2815 {
2770 // assume 7-bit to be ascii ALWAYS 2816 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2817 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2818 return *cmdbuf_ptr++;
2773 2819
2774 wchar_t wc; 2820 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2821 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2822
2777 if (len == (size_t)-2) 2823 if (len == (size_t)-2)
2778 { 2824 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2825 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2826 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2827 break;
2782 } 2828 }
2783 2829
2784 if (len == (size_t)-1) 2830 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2831 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2832
2787 // assume wchar == unicode 2833 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2834 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2835 return wc & UNICODE_MASK;
2790 } 2836 }
2791 2837
2792 return NOCHAR; 2838 return NOCHAR;
2793} 2839}
2840
2841// read the next octet
2842uint32_t
2843rxvt_term::next_octet () NOTHROW
2844{
2845 return cmdbuf_ptr < cmdbuf_endp
2846 ? (unsigned char)*cmdbuf_ptr++
2847 : NOCHAR;
2848}
2849
2850static class out_of_input out_of_input;
2794 2851
2795/* rxvt_cmd_getc () - Return next input character */ 2852/* rxvt_cmd_getc () - Return next input character */
2796/* 2853/*
2797 * Return the next input character after first passing any keyboard input 2854 * Return the next input character after first passing any keyboard input
2798 * to the command. 2855 * to the command.
2799 */ 2856 */
2800unicode_t 2857wchar_t
2801rxvt_term::cmd_getc () 2858rxvt_term::cmd_getc () THROW ((class out_of_input))
2802{ 2859{
2803 unicode_t c = next_char (); 2860 wchar_t c = next_char ();
2804 2861
2805 if (c == NOCHAR) 2862 if (c == NOCHAR)
2806 throw out_of_input; 2863 throw out_of_input;
2807 2864
2808 return c; 2865 return c;
2809} 2866}
2810 2867
2811unicode_t 2868uint32_t
2812rxvt_term::cmd_get8 () 2869rxvt_term::cmd_get8 () THROW ((class out_of_input))
2813{ 2870{
2814 unicode_t c = next_octet (); 2871 uint32_t c = next_octet ();
2815 2872
2816 if (c == NOCHAR) 2873 if (c == NOCHAR)
2817 throw out_of_input; 2874 throw out_of_input;
2818 2875
2819 return c; 2876 return c;
… …
2919 case C0_ESC: 2976 case C0_ESC:
2920 process_escape_seq (); 2977 process_escape_seq ();
2921 break; 2978 break;
2922 case C0_ENQ: /* terminal Status */ 2979 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 2980 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2981 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 2982 else
2927 tt_write ((unsigned char *)VT100_ANS, 2983 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 2984 break;
2930 case C0_BEL: /* bell */ 2985 case C0_BEL: /* bell */
2931 scr_bell (); 2986 scr_bell ();
2932 break; 2987 break;
2933 case C0_BS: /* backspace */ 2988 case C0_BS: /* backspace */
… …
3057 scr_charset_set (2, (unsigned int)cmd_getc ()); 3112 scr_charset_set (2, (unsigned int)cmd_getc ());
3058 break; 3113 break;
3059 case '+': 3114 case '+':
3060 scr_charset_set (3, (unsigned int)cmd_getc ()); 3115 scr_charset_set (3, (unsigned int)cmd_getc ());
3061 break; 3116 break;
3062#if ENABLE_FRILLS 3117#if !ENABLE_MINIMAL
3063 case '6': 3118 case '6':
3064 scr_backindex (); 3119 scr_backindex ();
3065 break; 3120 break;
3066#endif 3121#endif
3067 case '7': 3122 case '7':
3068 scr_cursor (SAVE); 3123 scr_cursor (SAVE);
3069 break; 3124 break;
3070 case '8': 3125 case '8':
3071 scr_cursor (RESTORE); 3126 scr_cursor (RESTORE);
3072 break; 3127 break;
3073#if ENABLE_FRILLS 3128#if !ENABLE_MINIMAL
3074 case '9': 3129 case '9':
3075 scr_forwardindex (); 3130 scr_forwardindex ();
3076 break; 3131 break;
3077#endif 3132#endif
3078 case '=': 3133 case '=':
… …
3088 break; 3143 break;
3089 3144
3090 /* 8.3.87: NEXT LINE */ 3145 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 3146 case C1_NEL: /* ESC E */
3092 { 3147 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 3148 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 3149 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 3150 }
3096 break; 3151 break;
3097 3152
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 3153 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 3154 case C1_ESA: /* ESC G */
… …
3121 process_dcs_seq (); 3176 process_dcs_seq ();
3122 break; 3177 break;
3123 3178
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3179 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3180 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3181 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3182 break; /* steal obsolete ESC [ c */
3129 3183
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3184 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3185 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3186 process_csi_seq ();
… …
3241 ndef = get_byte_array_bit (csi_defaults, i); 3295 ndef = get_byte_array_bit (csi_defaults, i);
3242 for (p = 0; p < nargs; p++) 3296 for (p = 0; p < nargs; p++)
3243 if (arg[p] == -1) 3297 if (arg[p] == -1)
3244 arg[p] = ndef; 3298 arg[p] = ndef;
3245 3299
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 /* 3300 /*
3254 * private mode handling 3301 * private mode handling
3255 */ 3302 */
3256 if (priv) 3303 if (priv)
3257 { 3304 {
3258 switch (priv) 3305 switch (priv)
3259 { 3306 {
3260 case '>': 3307 case '>':
3261 if (ch == CSI_DA) /* secondary device attributes */ 3308 if (ch == CSI_DA) /* secondary device attributes */
3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3309 {
3310 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3311 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3312 //
3313 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3314 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3315 // that we do not support xterm mouse reporting (should be 95 when we do).
3316 //
3317 tt_printf ("\033[>%d;94;0c", 'U');
3318 }
3263 break; 3319 break;
3264 case '?': 3320 case '?':
3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3321 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3266 process_terminal_mode (ch, priv, nargs, arg); 3322 process_terminal_mode (ch, priv, nargs, arg);
3267 break; 3323 break;
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3432 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3433 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3434 break;
3379 3435
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3436 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3437 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3438 break;
3384 3439
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3440 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3441 process_sgr_mode (nargs, arg);
3387 break; 3442 break;
… …
3394 break; 3449 break;
3395 case 6: /* CPR requested */ 3450 case 6: /* CPR requested */
3396 scr_report_position (); 3451 scr_report_position ();
3397 break; 3452 break;
3398 case 7: /* unofficial extension */ 3453 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3454 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3455 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3456 break;
3402 case 8: /* unofficial extension */ 3457 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3458 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3459 break;
… …
3471 break; 3526 break;
3472 case CSI_75: 3527 case CSI_75:
3473 scr_cursor (RESTORE); 3528 scr_cursor (RESTORE);
3474 break; 3529 break;
3475 3530
3476#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3477 case CSI_74: 3532 case CSI_74:
3478 process_window_ops (arg, nargs); 3533 process_window_ops (arg, nargs);
3479 break; 3534 break;
3480#endif 3535#endif
3481 3536
… …
3488 break; 3543 break;
3489 } 3544 }
3490} 3545}
3491/*}}} */ 3546/*}}} */
3492 3547
3493#if ENABLE_FRILLS 3548#if !ENABLE_MINIMAL
3494/* ARGSUSED */ 3549/* ARGSUSED */
3495void 3550void
3496rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3551rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3497{ 3552{
3498 int x, y; 3553 int x, y;
3499 XWindowAttributes wattr; 3554 XWindowAttributes wattr;
3500 Window wdummy; 3555 Window wdummy;
3501 dDisp; 3556
3557 dLocal (Display *, dpy);
3502 3558
3503 if (nargs == 0) 3559 if (nargs == 0)
3504 return; 3560 return;
3505 3561
3506 switch (args[0]) 3562 switch (args[0])
3507 { 3563 {
3508 /* 3564 /*
3509 * commands 3565 * commands
3510 */ 3566 */
3511 case 1: /* deiconify window */ 3567 case 1: /* deiconify window */
3512 XMapWindow (disp, parent[0]); 3568 XMapWindow (dpy, parent[0]);
3513 break; 3569 break;
3514 case 2: /* iconify window */ 3570 case 2: /* iconify window */
3515 XIconifyWindow (disp, parent[0], display->screen); 3571 XIconifyWindow (dpy, parent[0], display->screen);
3516 break; 3572 break;
3517 case 3: /* set position (pixels) */ 3573 case 3: /* set position (pixels) */
3518 XMoveWindow (disp, parent[0], args[1], args[2]); 3574 XMoveWindow (dpy, parent[0], args[1], args[2]);
3519 break; 3575 break;
3520 case 4: /* set size (pixels) */ 3576 case 4: /* set size (pixels) */
3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3577 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3522 break; 3578 break;
3523 case 5: /* raise window */ 3579 case 5: /* raise window */
3524 XRaiseWindow (disp, parent[0]); 3580 XRaiseWindow (dpy, parent[0]);
3525 break; 3581 break;
3526 case 6: /* lower window */ 3582 case 6: /* lower window */
3527 XLowerWindow (disp, parent[0]); 3583 XLowerWindow (dpy, parent[0]);
3528 break; 3584 break;
3529 case 7: /* refresh window */ 3585 case 7: /* refresh window */
3530 scr_touch (true); 3586 scr_touch (true);
3531 break; 3587 break;
3532 case 8: /* set size (chars) */ 3588 case 8: /* set size (chars) */
… …
3539 if (args[0] >= 24) /* set height (chars) */ 3595 if (args[0] >= 24) /* set height (chars) */
3540 set_widthheight ((unsigned int)width, 3596 set_widthheight ((unsigned int)width,
3541 (unsigned int) (args[1] * fheight)); 3597 (unsigned int) (args[1] * fheight));
3542 break; 3598 break;
3543 3599
3544
3545 /* 3600 /*
3546 * reports - some output format copied from XTerm 3601 * reports - some output format copied from XTerm
3547 */ 3602 */
3548 case 11: /* report window state */ 3603 case 11: /* report window state */
3549 XGetWindowAttributes (disp, parent[0], &wattr); 3604 XGetWindowAttributes (dpy, parent[0], &wattr);
3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3605 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3551 break; 3606 break;
3552 case 13: /* report window position */ 3607 case 13: /* report window position */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3608 XGetWindowAttributes (dpy, parent[0], &wattr);
3554 XTranslateCoordinates (disp, parent[0], wattr.root, 3609 XTranslateCoordinates (dpy, parent[0], wattr.root,
3555 -wattr.border_width, -wattr.border_width, 3610 -wattr.border_width, -wattr.border_width,
3556 &x, &y, &wdummy); 3611 &x, &y, &wdummy);
3557 tt_printf ("\033[3;%d;%dt", x, y); 3612 tt_printf ("\033[3;%d;%dt", x, y);
3558 break; 3613 break;
3559 case 14: /* report window size (pixels) */ 3614 case 14: /* report window size (pixels) */
3560 XGetWindowAttributes (disp, parent[0], &wattr); 3615 XGetWindowAttributes (dpy, parent[0], &wattr);
3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3616 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3562 break; 3617 break;
3563 case 18: /* report text area size (chars) */ 3618 case 18: /* report text area size (chars) */
3564 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3619 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3565 break; 3620 break;
… …
3567 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3622 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3568 break; 3623 break;
3569 case 20: /* report icon label */ 3624 case 20: /* report icon label */
3570 { 3625 {
3571 char *s; 3626 char *s;
3572 XGetIconName (disp, parent[0], &s); 3627 XGetIconName (dpy, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3629 XFree (s);
3575 } 3630 }
3576 break; 3631 break;
3577 case 21: /* report window title */ 3632 case 21: /* report window title */
3578 { 3633 {
3579 char *s; 3634 char *s;
3580 XFetchName (disp, parent[0], &s); 3635 XFetchName (dpy, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3637 XFree (s);
3583 } 3638 }
3584 break; 3639 break;
3585 } 3640 }
3586} 3641}
… …
3589/*----------------------------------------------------------------------*/ 3644/*----------------------------------------------------------------------*/
3590/* 3645/*
3591 * get input up until STRING TERMINATOR (or BEL) 3646 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3647 * ends_how is terminator used. returned input must be free()'d
3593 */ 3648 */
3594unsigned char * 3649char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3650rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3651{
3597 unicode_t ch; 3652 unicode_t ch;
3598 bool seen_esc = false; 3653 bool seen_esc = false;
3599 unsigned int n = 0; 3654 unsigned int n = 0;
… …
3632 3687
3633 string[n++] = '\0'; 3688 string[n++] = '\0';
3634 3689
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3690 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3691
3637 return (unsigned char *)rxvt_wcstombs (string); 3692 return rxvt_wcstombs (string);
3638} 3693}
3639 3694
3640/*----------------------------------------------------------------------*/ 3695/*----------------------------------------------------------------------*/
3641/* 3696/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3697 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3698 */
3644void 3699void
3645rxvt_term::process_dcs_seq () 3700rxvt_term::process_dcs_seq ()
3646{ 3701{
3647 unsigned char *s; 3702 char *s;
3648 unicode_t eh; 3703 unicode_t eh;
3649 3704
3650 /* 3705 /*
3651 * Not handled yet 3706 * Not handled yet
3652 */ 3707 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3726 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3727 arg = arg * 10 + (ch - '0');
3673 3728
3674 if (ch == ';') 3729 if (ch == ';')
3675 { 3730 {
3676 unsigned char *s = get_to_st (eh); 3731 char *s = get_to_st (eh);
3677 3732
3678 if (s) 3733 if (s)
3679 { 3734 {
3680 process_xterm_seq (arg, (char *)s, eh); 3735 process_xterm_seq (arg, s, eh);
3681 free (s); 3736 free (s);
3682 } 3737 }
3683 } 3738 }
3684} 3739}
3685 3740
3686void 3741void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3742rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3743{
3689 if (str[0] == '?' && !str[1]) 3744 if (str[0] == '?' && !str[1])
3690 { 3745 {
3691 unsigned short r, g, b; 3746 rgba c;
3692 pix_colors_focused[color].get (display, r, g, b); 3747 pix_colors_focused[color].get (c);
3748
3749#if XFT
3750 if (c.a != rgba::MAX_CC)
3751 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3752 else
3753#endif
3693 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3754 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3694 } 3755 }
3695 else 3756 else
3696 set_window_color (color, str); 3757 set_window_color (color, str);
3697} 3758}
3698 3759
3699/* 3760/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3761 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3762 */
3702void 3763void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3764rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3765{
3705 int changed = 0;
3706 int color; 3766 int color;
3707 char *buf, *name; 3767 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3768 bool query = str[0] == '?' && !str[1];
3709 int saveop = op; 3769 int saveop = op;
3710 dDisp; 3770
3771 dLocal (Display *, dpy);
3711 3772
3712 assert (str != NULL); 3773 assert (str != NULL);
3774
3775 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3776 return;
3777
3713 switch (op) 3778 switch (op)
3714 { 3779 {
3715 case XTerm_name: 3780 case XTerm_name:
3716 set_title (str); 3781 set_title (str);
3717 /* FALLTHROUGH */ 3782 /* FALLTHROUGH */
… …
3731 unsigned long bytes_after; 3796 unsigned long bytes_after;
3732 unsigned char *value = 0; 3797 unsigned char *value = 0;
3733 const char *str = ""; 3798 const char *str = "";
3734 3799
3735 if (prop 3800 if (prop
3736 && XGetWindowProperty (disp, parent[0], 3801 && XGetWindowProperty (dpy, parent[0],
3737 prop, 0, 1<<16, 0, AnyPropertyType, 3802 prop, 0, 1<<16, 0, AnyPropertyType,
3738 &actual_type, &actual_format, 3803 &actual_type, &actual_format,
3739 &nitems, &bytes_after, &value) == Success 3804 &nitems, &bytes_after, &value) == Success
3740 && actual_type != None 3805 && actual_type != None
3741 && actual_format == 8) 3806 && actual_format == 8)
3742 str = (const char *)(value); 3807 str = (const char *)(value);
3743 3808
3744 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3809 tt_printf ("\033]%d;%s%c", op, str, resp);
3745 3810
3746 XFree (value); 3811 XFree (value);
3747 } 3812 }
3748 else 3813 else
3749 { 3814 {
… …
3753 { 3818 {
3754 *eq = 0; 3819 *eq = 0;
3755 set_utf8_property (display->atom (str), eq + 1); 3820 set_utf8_property (display->atom (str), eq + 1);
3756 } 3821 }
3757 else 3822 else
3758 XDeleteProperty (disp, parent[0], 3823 XDeleteProperty (dpy, parent[0],
3759 display->atom (str)); 3824 display->atom (str));
3760 } 3825 }
3761 break; 3826 break;
3762 3827
3763 case XTerm_Color: 3828 case XTerm_Color:
… …
3765 { 3830 {
3766 if ((name = strchr (buf, ';')) == NULL) 3831 if ((name = strchr (buf, ';')) == NULL)
3767 break; 3832 break;
3768 3833
3769 *name++ = '\0'; 3834 *name++ = '\0';
3770 color = atoi (buf); 3835 color = atoi (buf) + minCOLOR;
3771 3836
3772 if (color < 0 || color >= TOTAL_COLORS) 3837 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3773 break; 3838 break;
3774 3839
3775 if ((buf = strchr (name, ';')) != NULL) 3840 if ((buf = strchr (name, ';')) != NULL)
3776 *buf++ = '\0'; 3841 *buf++ = '\0';
3777 3842
3778 if (name[0] == '?' && !name[1]) 3843 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 } 3844 }
3787 break; 3845 break;
3788 case XTerm_Color00: 3846 case XTerm_Color00:
3789 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3847 process_color_seq (op, Color_fg, str, resp);
3790 break; 3848 break;
3791 case XTerm_Color01: 3849 case XTerm_Color01:
3792 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3850 process_color_seq (op, Color_bg, str, resp);
3793 break; 3851 break;
3794#ifndef NO_CURSORCOLOR 3852#ifndef NO_CURSORCOLOR
3795 case XTerm_Color_cursor: 3853 case XTerm_Color_cursor:
3796 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3854 process_color_seq (op, Color_cursor, str, resp);
3797 break; 3855 break;
3798#endif 3856#endif
3799 case XTerm_Color_pointer_fg: 3857 case XTerm_Color_pointer_fg:
3800 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3858 process_color_seq (op, Color_pointer_fg, str, resp);
3801 break; 3859 break;
3802 case XTerm_Color_pointer_bg: 3860 case XTerm_Color_pointer_bg:
3803 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3861 process_color_seq (op, Color_pointer_bg, str, resp);
3804 break; 3862 break;
3805#ifndef NO_BOLD_UNDERLINE_REVERSE 3863#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: 3864 case XTerm_Color_RV:
3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3865 process_color_seq (op, Color_RV, str, resp);
3866 break;
3867 case Rxvt_Color_BD:
3868 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp);
3870 break;
3871 case Rxvt_Color_UL:
3872 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp);
3814 break; 3874 break;
3815 case URxvt_Color_IT: 3875 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3876 process_color_seq (op, Color_IT, str, resp);
3817 break; 3877 break;
3818#endif 3878#endif
3819#if TRANSPARENT && TINTING 3879#if TRANSPARENT && TINTING
3820 case URxvt_Color_tint: 3880 case URxvt_Color_tint:
3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3881 process_color_seq (op, Color_tint, str, resp);
3882
3822 check_our_parents (); 3883 check_our_parents ();
3884
3823 if (am_transparent) 3885 if (am_transparent)
3824 want_full_refresh = want_refresh = 1; 3886 want_full_refresh = want_refresh = 1;
3825 break;
3826#endif
3827 3887
3888 break;
3889#endif
3890
3828 case XTerm_Pixmap: 3891 case Rxvt_Pixmap:
3892 {
3829 if (*str != ';') 3893 if (*str != ';')
3830 { 3894 {
3831#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3832 scale_pixmap (""); /* reset to default scaling */ 3896 scale_pixmap (""); /* reset to default scaling */
3833 set_bgPixmap (str); /* change pixmap */ 3897 set_bgPixmap (str); /* change pixmap */
3834#endif
3835 scr_touch (true); 3898 scr_touch (true);
3899#endif
3836 } 3900 }
3901
3902 int changed = 0;
3903
3837 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3838 { 3905 {
3839 str++; 3906 str++;
3840#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3841 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
3842#endif 3909#endif
3843 } 3910 }
3844 3911
3845 if (changed) 3912 if (changed)
3846 { 3913 {
3847#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3848 resize_pixmap (); 3915 resize_pixmap ();
3849#endif
3850 scr_touch (true); 3916 scr_touch (true);
3917#endif
3851 } 3918 }
3919 }
3852 break; 3920 break;
3853 3921
3854 case XTerm_restoreFG: 3922 case Rxvt_restoreFG:
3855 set_window_color (Color_fg, str); 3923 set_window_color (Color_fg, str);
3856 break; 3924 break;
3857 case XTerm_restoreBG: 3925 case Rxvt_restoreBG:
3858 set_window_color (Color_bg, str); 3926 set_window_color (Color_bg, str);
3859 break; 3927 break;
3860 3928
3861 case XTerm_logfile: 3929 case XTerm_logfile:
3862 // TODO, when secure mode? 3930 // TODO, when secure mode?
3863 break; 3931 break;
3864 3932
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 3933#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3934 case Rxvt_dumpscreen: /* no error notices */
3873 { 3935 {
3874 int fd; 3936 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3937 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 { 3938 {
3877 scr_dump (fd); 3939 scr_dump (fd);
… …
3888 case URxvt_italicFont: 3950 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3951 case URxvt_boldItalicFont:
3890#endif 3952#endif
3891 if (query) 3953 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3954 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3955 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3956 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3957 resp);
3896 else 3958 else
3897 { 3959 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3960 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3901 allocated.push_back ((void *)res); 3963 allocated.push_back ((void *)res);
3902 set_fonts (); 3964 set_fonts ();
3903 } 3965 }
3904 break; 3966 break;
3905 3967
3906#if ENABLE_FRILLS 3968 case URxvt_version:
3969 if (query)
3970 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3971 op,
3972 rs[Rs_name], VERSION[0], VERSION[2],
3973 resp);
3974 break;
3975
3976#if !ENABLE_MINIMAL
3907 case URxvt_locale: 3977 case URxvt_locale:
3908 if (query) 3978 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3979 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3980 else
3911 { 3981 {
3912 set_locale (str); 3982 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3983 pty->set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3984 init_xlocale ();
3915 } 3985 }
3916 break; 3986 break;
3917 3987
3918 case URxvt_view_up: 3988 case URxvt_view_up:
3919 case URxvt_view_down: 3989 case URxvt_view_down:
3990 {
3920 int lines = atoi (str); 3991 int lines = atoi (str);
3921 3992
3922 if (lines) 3993 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 3994 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 3995 else
3925 {
3926 scr_erase_savelines (); 3996 scr_erase_savelines ();
3927 } 3997 }
3928 3998
3999 break;
4000#endif
4001
4002#if ENABLE_PERL
4003 case URxvt_perl:
4004 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4005 ; // no responses yet
3929 break; 4006 break;
3930#endif 4007#endif
3931 } 4008 }
3932} 4009}
3933/*----------------------------------------------------------------------*/ 4010/*----------------------------------------------------------------------*/
… …
3964 return state; 4041 return state;
3965} 4042}
3966 4043
3967/* we're not using priv _yet_ */ 4044/* we're not using priv _yet_ */
3968void 4045void
3969rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4046rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3970{ 4047{
3971 unsigned int i, j; 4048 unsigned int i, j;
3972 int state; 4049 int state;
3973 4050
3974 static const struct 4051 static const struct
… …
3985 { 5, PrivMode_rVideo }, 4062 { 5, PrivMode_rVideo },
3986 { 6, PrivMode_relOrigin }, 4063 { 6, PrivMode_relOrigin },
3987 { 7, PrivMode_Autowrap }, 4064 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode 4065 // 8, bi-directional support mode
3989 { 9, PrivMode_MouseX10 }, 4066 { 9, PrivMode_MouseX10 },
3990#ifdef menuBar_esc
3991 { menuBar_esc, PrivMode_menuBar },
3992#endif
3993 // 18, 19 printing-related 4067 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor }, 4068 { 25, PrivMode_VisibleCursor },
3995#ifdef scrollBar_esc 4069#ifdef scrollBar_esc
3996 { scrollBar_esc, PrivMode_scrollBar }, 4070 { scrollBar_esc, PrivMode_scrollBar },
3997#endif 4071#endif
… …
4042 } 4116 }
4043 4117
4044 /* extra handling for values with state unkept */ 4118 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4119 switch (arg[i])
4046 { 4120 {
4121#if ENABLE_STYLES
4122 case 1021:
4123 set_option (Opt_intensityStyles, mode);
4124
4125 scr_touch (true);
4126 break;
4127#endif
4047 case 1048: /* alternative cursor save */ 4128 case 1048: /* alternative cursor save */
4048 case 1049: 4129 case 1049:
4049 if (options & Opt_secondaryScreen) 4130 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4131 if (mode == 0)
4051 scr_cursor (RESTORE); 4132 scr_cursor (RESTORE);
4052 else if (mode == 1) 4133 else if (mode == 1)
4053 scr_cursor (SAVE); 4134 scr_cursor (SAVE);
4054 break; 4135 break;
… …
4069 case 3: /* 80/132 */ 4150 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4151 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4152 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4153 break;
4073 case 4: /* smooth scrolling */ 4154 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 4155 set_option (Opt_jumpScroll, !state);
4078 break; 4156 break;
4079 case 5: /* reverse video */ 4157 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4158 scr_rvideo_mode (state);
4081 break; 4159 break;
4082 case 6: /* relative/absolute origins */ 4160 case 6: /* relative/absolute origins */
… …
4088 /* case 8: - auto repeat, can't do on a per window basis */ 4166 /* case 8: - auto repeat, can't do on a per window basis */
4089 case 9: /* X10 mouse reporting */ 4167 case 9: /* X10 mouse reporting */
4090 if (state) /* orthogonal */ 4168 if (state) /* orthogonal */
4091 priv_modes &= ~PrivMode_MouseX11; 4169 priv_modes &= ~PrivMode_MouseX11;
4092 break; 4170 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 4171#ifdef scrollBar_esc
4101 case scrollBar_esc: 4172 case scrollBar_esc:
4102 if (scrollbar_mapping (state)) 4173 if (scrollbar_mapping (state))
4103 { 4174 {
4104 resize_all_windows (0, 0, 0); 4175 resize_all_windows (0, 0, 0);
… …
4123#if 0 4194#if 0
4124 case 1001: 4195 case 1001:
4125 break; /* X11 mouse highlighting */ 4196 break; /* X11 mouse highlighting */
4126#endif 4197#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4198 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 4199 set_option (Opt_scrollTtyOutput, !state);
4132 break; 4200 break;
4133 case 1011: /* scroll to bottom on key press */ 4201 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 4202 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 4203 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4204 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4205 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4206 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4207 scr_erase_screen (2);
4143 scr_change_screen (state); 4208 scr_change_screen (state);
4144 break; 4209 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4210 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4211 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4212 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4213 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4214 scr_erase_screen (2);
4150 break; 4215 break;
4151 default: 4216 default:
4152 break; 4217 break;
… …
4280 scr_color (Color_bg, Color_bg); 4345 scr_color (Color_bg, Color_bg);
4281 break; 4346 break;
4282 4347
4283 //case 50: // not variable spacing 4348 //case 50: // not variable spacing
4284 4349
4285#ifndef NO_BRIGHTCOLOR 4350#if !ENABLE_MINIMAL
4286 case 90: 4351 case 90:
4287 case 91: /* set bright fg color */ 4352 case 91: /* set bright fg color */
4288 case 92: 4353 case 92:
4289 case 93: 4354 case 93:
4290 case 94: 4355 case 94:
… …
4302 case 106: 4367 case 106:
4303 case 107: 4368 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4369 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4370 break;
4306#endif 4371#endif
4307
4308 } 4372 }
4309 } 4373 }
4310} 4374}
4311/*}}} */ 4375/*}}} */
4312 4376
… …
4336 */ 4400 */
4337void 4401void
4338rxvt_term::tt_printf (const char *fmt,...) 4402rxvt_term::tt_printf (const char *fmt,...)
4339{ 4403{
4340 va_list arg_ptr; 4404 va_list arg_ptr;
4341 unsigned char buf[256]; 4405 char buf[256];
4342 4406
4343 va_start (arg_ptr, fmt); 4407 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4408 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4409 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4410 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 4415 * or generated by us in response to a query ESC sequence.
4352 */ 4416 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4417const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4418
4355void 4419void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4420rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4421{
4422 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4423 return;
4424
4425 if (pty->pty < 0)
4426 return;
4427
4358 if (v_buflen == 0) 4428 if (v_buflen == 0)
4359 { 4429 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4430 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4361 4431
4362 if ((unsigned int)written == len) 4432 if ((unsigned int)written == len)
4363 return; 4433 return;
4364 4434
4365 data += written; 4435 data += written;
4366 len -= written; 4436 len -= written;
4367 } 4437 }
4368 4438
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4439 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4440
4371 memcpy (v_buffer + v_buflen, data, len); 4441 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4442 v_buflen += len;
4373 4443
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4444 pty_ev.set (EVENT_READ | EVENT_WRITE);
4375} 4445}
4376 4446
4377void rxvt_term::pty_write () 4447void rxvt_term::pty_write ()
4378{ 4448{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4449 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380 4450
4381 if (written > 0) 4451 if (written > 0)
4382 { 4452 {
4383 v_buflen -= written; 4453 v_buflen -= written;
4384 4454

Diff Legend

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