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.208 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.309 by root, Mon Feb 20 22:42:00 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)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= 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 = save[y + saveLines - 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
160} 161}
161#endif
162 162
163#if ENABLE_OVERLAY
164void 163void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 169 int len;
171 170
172 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
173 172
174#if ENABLE_COMBINING 173# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
176 { 175 {
177 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
180 } 179 }
181 else 180 else
182#endif 181# endif
183 { 182 {
184 ch2 = ch; 183 ch2 = ch;
185 184
186 alloc = 0; 185 alloc = 0;
187 chr = &ch2; 186 chr = &ch2;
188 len = 1; 187 len = 1;
189 } 188 }
190 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
191 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
192 203
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
194 214
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 216
197 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
198 { 218 {
… …
201 ch = *chr++; 221 ch = *chr++;
202 222
203 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
206#if !UNICODE3 226# if !UNICODE3
207 if (ch >= 0x10000) 227 if (ch >= 0x10000)
208 ch = 0xfffd; 228 ch = 0xfffd;
209#endif 229# endif
210 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
211 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
212 } 234 }
213 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// }
241 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
215 243
216 free (fname); 244 free (fname);
217 245
218#if ENABLE_COMBINING 246# if ENABLE_COMBINING
219 if (alloc) 247 if (alloc)
220 delete [] alloc; 248 delete [] alloc;
221#endif 249# endif
222} 250}
223#endif 251#endif
224 252
225void 253void
226rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
243 mb[0] = ch[0]; 271 mb[0] = ch[0];
244 len = 1; 272 len = 1;
245 } 273 }
246 274
247 if (len > 0) 275 if (len > 0)
248 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
249 else 277 else
250 scr_bell (); 278 scr_bell ();
251 } 279 }
252 280
253 iso14755buf = 0; 281 iso14755buf = 0;
… …
270 298
271 return -1; 299 return -1;
272} 300}
273#endif 301#endif
274 302
275/*{{{ Convert the keypress event into a string */
276void 303void
277rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
278{ 305{
279 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
280 unsigned int newlen; 307 unsigned int newlen;
281 KeySym keysym; 308 KeySym keysym;
282#ifdef DEBUG_CMD
283 static int debug_key = 1; /* accessible by a debugger only */
284#endif
285 int valid_keysym; 309 int valid_keysym;
286 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
287 316
288 /* 317 /*
289 * 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
290 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
291 * 320 *
… …
309 Status status_return; 338 Status status_return;
310 339
311#if 0 340#if 0
312#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
313 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
314 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
315 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
316 else 345 else
317#endif 346#endif
318#endif 347#endif
319 { 348 {
… …
356 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
357 } 386 }
358 else 387 else
359#endif 388#endif
360 { 389 {
361 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
362 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
363 } 392 }
364 393
365 if (valid_keysym) 394 if (valid_keysym)
366 { 395 {
… …
418 scr_move_to (0, 1); 447 scr_move_to (0, 1);
419 return; 448 return;
420 } 449 }
421 else if (keysym == XK_End) 450 else if (keysym == XK_End)
422 { 451 {
423 scr_move_to (1, 0); 452 scr_move_to (1, 1);
424 return; 453 return;
425 } 454 }
426 } 455 }
427#endif 456#endif
428 } 457 }
… …
439 { 468 {
440 switch (keysym) 469 switch (keysym)
441 { 470 {
442 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
443 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
444 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
445 return; 474 return;
446#if TODO 475#if TODO
447 /* rxvt extras */ 476 /* rxvt extras */
448 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
449 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
830 { 859 {
831#ifdef META8_OPTION 860#ifdef META8_OPTION
832 /* set 8-bit on */ 861 /* set 8-bit on */
833 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
834 { 863 {
835 unsigned char *ch; 864 char *ch;
836 865
837 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
838 *ch |= 0x80; 867 *ch |= 0x80;
839 868
840 meta = 0; 869 meta = 0;
… …
842#endif 871#endif
843 /* nil */ ; 872 /* nil */ ;
844 } 873 }
845 } 874 }
846 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
847 if (len <= 0) 879 if (len <= 0)
848 return; /* not mapped */ 880 return; /* not mapped */
849 881
850 if (options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
851 if (view_start) 883 if (view_start)
852 { 884 {
853 view_start = 0; 885 view_start = 0;
854 want_refresh = 1; 886 want_refresh = 1;
855 } 887 }
… …
873#ifdef META8_OPTION 905#ifdef META8_OPTION
874 && meta_char == C0_ESC 906 && meta_char == C0_ESC
875#endif 907#endif
876 ) 908 )
877 { 909 {
878 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
879 tt_write (&ch, 1); 911 tt_write (&ch, 1);
880 } 912 }
881 913
882#if defined(DEBUG_CMD)
883 /* Display keyboard buffer contents */
884 unsigned char *p;
885 int i;
886
887 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
888 for (i = 0, p = kbuf; i < len; i++, p++)
889 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
890 fprintf (stderr, "'\n");
891#endif /* DEBUG_CMD */
892 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
893} 915}
894/*}}} */
895 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
896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
898/* attempt to `write' count to the input buffer */
899unsigned int 995unsigned int
900rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
901{ 997{
902 unsigned int n, s; 998 unsigned int n, s;
903 999
904 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
942 } 1038 }
943#endif 1039#endif
944 1040
945 if (want_refresh) 1041 if (want_refresh)
946 { 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
947 scr_refresh (refresh_type); 1081 scr_refresh ();
948 scrollbar_show (1); 1082 scrollbar_show (1);
949#ifdef USE_XIM 1083#ifdef USE_XIM
950 IMSendSpot (); 1084 IMSendSpot ();
951#endif 1085#endif
952 } 1086 }
… …
955} 1089}
956 1090
957void 1091void
958rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
959{ 1093{
960 SET_R (this); 1094 make_current ();
961 SET_LOCALE (locale);
962 1095
963 display->flush (); 1096 display->flush ();
964 1097
965 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
966 flush_ev.start (NOW + 0.01); 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
967} 1100}
968 1101
969void 1102void
970rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
971{ 1104{
972 SET_R (this); 1105 make_current ();
973 SET_LOCALE (locale);
974 1106
975 refresh_limit = 1; 1107 refresh_limit = 1;
976 refresh_count = 0; 1108 refresh_count = 0;
977 flush (); 1109 flush ();
978} 1110}
… …
982rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
983{ 1115{
984 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
985 want_refresh = 1; 1117 want_refresh = 1;
986 1118
987 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
988} 1120}
989#endif 1121#endif
990 1122
991#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
992void 1124void
… …
1006rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1007{ 1139{
1008 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1009 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1010 { 1142 {
1011 refresh_type |= SMOOTH_REFRESH;
1012 want_refresh = 1; 1143 want_refresh = 1;
1013 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1014 } 1145 }
1015} 1146}
1016#endif 1147#endif
… …
1020rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1021{ 1152{
1022 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1023 { 1154 {
1024 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1025 refresh_type |= SMOOTH_REFRESH;
1026 want_refresh = 1; 1156 want_refresh = 1;
1027 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1028 } 1158 }
1029} 1159}
1030#endif 1160#endif
… …
1035{ 1165{
1036 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1037 || 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)
1038 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1169 {
1040 if (view_start == nscrolled || 1170 if (view_start == top_row || view_start == 0)
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1043 1172
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1173 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1175 }
1048} 1176}
1049#endif 1177#endif
1050 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
1051bool 1204bool
1052rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1053{ 1206{
1054 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1055 1208
1056 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1057 { 1210 {
1058 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");
1059 n = 0; 1212 n = 0;
1060 } 1213 }
1061 1214
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1065 1218
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1067 1220
1068 if (n > 0) 1221 if (r > 0)
1069 { 1222 {
1070 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
1071 return true; 1224 return true;
1072 } 1225 }
1073 else if (n < 0 && errno != EAGAIN) 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
1234 {
1235 pty_ev.stop ();
1236
1237 if (!OPTION (Opt_hold))
1074 destroy (); 1238 destroy ();
1239 }
1075 1240
1076 return false; 1241 return false;
1077} 1242}
1078 1243
1079void 1244void
1080rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1081{ 1246{
1082 SET_R (this); 1247 make_current ();
1083 SET_LOCALE (locale);
1084 1248
1085 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1086 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1087 while (pty_fill ()) 1251 while (pty_fill ())
1088 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1093} 1257}
1094 1258
1095void 1259void
1096rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1097{ 1261{
1098 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1099 recolour_cursor (); 1263 recolour_cursor ();
1100 1264
1101#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1266 hidden_pointer = 0;
1103 1267
1104 if (options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1270#endif
1107} 1271}
1108 1272
1109#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1110void 1274void
1111rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1112{ 1276{
1113 if (! (options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1114 return; 1278 return;
1115 1279
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1117 XFlush (display->display); 1281 XFlush (dpy);
1118 1282
1119 hidden_pointer = 1; 1283 hidden_pointer = 1;
1120} 1284}
1121 1285
1122void 1286void
1123rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1124{ 1288{
1125 SET_R (this); 1289 make_current ();
1126 SET_LOCALE (locale);
1127 1290
1128 pointer_blank (); 1291 pointer_blank ();
1129} 1292}
1130#endif 1293#endif
1131 1294
… …
1196 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1197 (32 + x + 1), 1360 (32 + x + 1),
1198 (32 + y + 1)); 1361 (32 + y + 1));
1199} 1362}
1200 1363
1201#ifdef USING_W11LIB
1202void
1203rxvt_W11_process_x_event (XEvent *ev)
1204{
1205 rxvt_t *r = rxvt_get_r ();
1206
1207 x_cb (*ev);
1208}
1209#endif
1210
1211/*{{{ process an X event */ 1364/*{{{ process an X event */
1212void 1365void
1213rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1214{ 1367{
1215 dDisp; 1368 make_current ();
1216 1369
1217 SET_R (this); 1370 dLocal (Display *, dpy);
1218 SET_LOCALE (locale);
1219 1371
1220#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1222 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1223 if (hidden_cursor) 1375 return;
1224 {
1225 hidden_cursor = 0;
1226 want_refresh = 1;
1227 }
1228 1376
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1230 }
1231#endif
1232
1233#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1235 {
1236 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease)
1239 if (hidden_pointer)
1240 pointer_unblank ();
1241
1242 if (ev.type == KeyPress && hidden_pointer == 0)
1243 pointer_blank ();
1244 }
1245#endif
1246
1247 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1248 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1249 unsigned int unused_mask; 1380 unsigned int unused_mask;
1250 1381
1251 switch (ev.type) 1382 switch (ev.type)
1252 { 1383 {
1253 case KeyPress: 1384 case KeyPress:
1254#if ISO_14755 1385 key_press (ev.xkey);
1255 if (!(iso14755buf & ISO_14755_52))
1256#endif
1257 lookup_key (ev.xkey);
1258
1259 break; 1386 break;
1260 1387
1261 case KeyRelease: 1388 case KeyRelease:
1262 { 1389 key_release (ev.xkey);
1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1264 KeySym ks;
1265
1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1267#endif
1268
1269#if ENABLE_FRILLS || ISO_14755
1270 // ISO 14755 support
1271 if (iso14755buf)
1272 if (iso14755buf & ISO_14755_52)
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277# if ISO_14755
1278 // iso14755 part 5.2 handling: release time
1279 // first: controls
1280 if ((ev.xkey.state & ControlMask)
1281 && ((ks >= 0x40 && ks <= 0x5f)
1282 || (ks >= 0x61 && ks <= 0x7f)))
1283 {
1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1290 if (i[0] == ks)
1291 {
1292 iso14755buf = ISO_14755_51 | i[1];
1293 commit_iso14755 ();
1294 return; // case-break;
1295 }
1296
1297 scr_bell ();
1298# endif
1299 iso14755buf = 0;
1300 break;
1301 }
1302 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1303 {
1304# if ENABLE_OVERLAY
1305 scr_overlay_off ();
1306# endif
1307 if (iso14755buf & ISO_14755_51)
1308 commit_iso14755 ();
1309#if ISO_14755
1310 else if (iso14755buf & ISO_14755_STARTED)
1311 {
1312 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1313
1314 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1315 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1316 }
1317# endif
1318 else
1319 iso14755buf = 0;
1320 }
1321#endif
1322
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R)
1327 mouse_slip_wheel_speed = 0;
1328#endif
1329 break; 1390 break;
1330 }
1331 1391
1332 case ButtonPress: 1392 case ButtonPress:
1333 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1334 break; 1394 break;
1335 1395
… …
1337 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1338 break; 1398 break;
1339 1399
1340 case ClientMessage: 1400 case ClientMessage:
1341 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1343 { 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 {
1344 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)))
1345 destroy (); 1411 destroy ();
1412 }
1346#if ENABLE_EWMH 1413#if ENABLE_EWMH
1347 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])
1348 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &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 }
1351#endif 1429#endif
1352 } 1430 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1362#ifdef OFFIX_DND
1363 /* OffiX Dnd (drag 'n' drop) protocol */
1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1365 && (ev.xclient.data.l[0] == DndFile
1366 || ev.xclient.data.l[0] == DndDir
1367 || ev.xclient.data.l[0] == DndLink))
1368 {
1369 /* Get Dnd data */
1370 Atom ActualType;
1371 int ActualFormat;
1372 unsigned char *data;
1373 unsigned long Size, RemainingBytes;
1374
1375 XGetWindowProperty (disp, display->root,
1376 xa[XA_DNDSELECTION],
1377 0L, 1000000L,
1378 False, AnyPropertyType,
1379 &ActualType, &ActualFormat,
1380 &Size, &RemainingBytes,
1381 &data);
1382 set_string_property (XA_CUT_BUFFER0, data);
1383 XFree (data);
1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1386 }
1387#endif /* OFFIX_DND */
1388 break; 1431 break;
1389 1432
1390 case MappingNotify: 1433 case MappingNotify:
1391 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1392 break; 1435 break;
… …
1425 break; 1468 break;
1426 1469
1427 case ConfigureNotify: 1470 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1429 { 1472 {
1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1474 ;
1432 1475
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1477 {
1435 seen_resize = 1; 1478 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1480 }
1438 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1485 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1486 check_our_parents ();
1442#endif 1487#endif
1443 } 1488 }
1444 break; 1489 break;
1445 1490
1446 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450 1496
1451 break; 1497 break;
1452 1498
1453 case SelectionClear: 1499 case SelectionClear:
1454 selection_clear (); 1500 selection_clear ();
… …
1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1460 break; 1506 break;
1461 1507
1462 case SelectionRequest: 1508 case SelectionRequest:
1463 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));
1464 break; 1518 break;
1465 1519
1466 case UnmapNotify: 1520 case UnmapNotify:
1467 mapped = 0; 1521 mapped = 0;
1468#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1470#endif 1524#endif
1471 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1526 break;
1479 1527
1480#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1481 case ReparentNotify: 1529 case ReparentNotify:
1482 rootwin_cb (ev); 1530 rootwin_cb (ev);
… …
1488 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1489 { 1537 {
1490 do 1538 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1494 1542
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1544
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1500 1548
1501 scr_refresh (refresh_type); 1549 want_refresh = 1;
1502 } 1550 }
1503 else 1551 else
1504 { 1552 {
1505 XEvent unused_event; 1553 XEvent unused_event;
1506 1554
1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1508 ; 1556 ;
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1510 ; 1558 ;
1511 1559
1512 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1513 { 1561 {
1514 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1515 scrollbar_show (0); 1563 scrollbar_show (0);
1516 } 1564 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1565
1522#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1525#endif 1569#endif
1526 } 1570 }
1527 break; 1571 break;
1528 1572
1529 case MotionNotify: 1573 case MotionNotify:
1530#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1575 if (hidden_pointer)
1532 pointer_unblank (); 1576 pointer_unblank ();
1533#endif 1577#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1579 break;
1543 1580
1544 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1545 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1587 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1549 ; 1589 ;
1550 1590
1551 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1552 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1595 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1601 } 1641 }
1602 1642
1603 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1645 + 1;
1606 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1608 } 1648 }
1609 else 1649 else
1610 { 1650 {
1611 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1620#endif 1660#endif
1621 } 1661 }
1622 } 1662 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1624 { 1664 {
1625 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1627 ; 1667 ;
1628 1668
1629 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1673 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1675 scrollbar_size ());
1636 scr_refresh (refresh_type); 1676 want_refresh = 1;
1637 refresh_limit = 0; 1677 refresh_limit = 0;
1638 scrollbar_show (1); 1678 scrollbar_show (1);
1639 } 1679 }
1640 break; 1680 break;
1641 } 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
1642} 1709}
1643 1710
1644void 1711void
1645rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1646{ 1713{
1647 if (!focus) 1714 if (!focus)
1648 { 1715 {
1649 focus = 1; 1716 focus = 1;
1650 want_refresh = 1; 1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1651#if USE_XIM 1721#if USE_XIM
1652 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1653 { 1723 {
1654 IMSetStatusPosition (); 1724 IMSetPosition ();
1655 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1656 } 1726 }
1657#endif 1727#endif
1658#if CURSOR_BLINK 1728#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1729 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661#endif 1731#endif
1662#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1664 { 1734 {
1665 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
… …
1675 if (focus) 1745 if (focus)
1676 { 1746 {
1677 focus = 0; 1747 focus = 0;
1678 want_refresh = 1; 1748 want_refresh = 1;
1679 1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1680#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1681 iso14755buf = 0; 1755 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1756# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1757 scr_overlay_off ();
1758# endif
1759 }
1685#endif 1760#endif
1686#if USE_XIM 1761#if USE_XIM
1687 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1689#endif 1764#endif
1690#if CURSOR_BLINK 1765#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1766 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1767 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1768 hidden_cursor = 0;
1694#endif 1769#endif
1695#if OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
… …
1704 1779
1705#if TRANSPARENT 1780#if TRANSPARENT
1706void 1781void
1707rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1783{
1709 SET_R (this); 1784 make_current ();
1710 SET_LOCALE (locale);
1711 1785
1712 switch (ev.type) 1786 switch (ev.type)
1713 { 1787 {
1714 case PropertyNotify: 1788 case PropertyNotify:
1715 /* 1789 /*
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1795 return;
1722 1796
1723 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1724 case ReparentNotify: 1798 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1727 break; 1801 break;
1728 } 1802 }
1729} 1803}
1730#endif 1804#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1734{ 1808{
1735 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1736 1810
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1738 if (!bypass_keystate) 1813 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1815
1741 /* 1816 /*
1742 * VT window processing of button press 1817 * VT window processing of button press
1743 */ 1818 */
1744 if (ev.window == vt) 1819 if (ev.window == vt)
1745 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1746#if ISO_14755 1824#if ISO_14755
1747 // 5.4 1825 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1827 {
1750 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1764 { 1842 {
1765 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1766 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1767 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1768 { 1847 {
1769 /* only report double clicks */ 1848 /* only report double clicks */
1770 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1771 mouse_report (ev); 1850 mouse_report (ev);
… …
1803#else 1882#else
1804 selection.rect = false; 1883 selection.rect = false;
1805#endif 1884#endif
1806 1885
1807 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1888 {
1810 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1812 else 1891 else
1813 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1978 } 2057 }
1979 2058
1980 break; 2059 break;
1981 } 2060 }
1982 } 2061 }
2062
1983 return; 2063 return;
1984 } 2064 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2065}
1993 2066
1994void 2067void
1995rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1996{ 2069{
… …
2002 2075
2003 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2004 { 2077 {
2005 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2006 scrollbar_show (0); 2079 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2080 }
2011 2081
2012#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2015#endif 2085#endif
2016 2086
2017 if (ev.window == vt) 2087 if (ev.window == vt)
2018 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2019#if ISO_14755 2092#if ISO_14755
2020 // 5.4 2093 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2095 return;
2023#endif 2096#endif
2097
2024 if (reportmode) 2098 if (reportmode)
2025 { 2099 {
2026 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2027 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2028 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2058 { 2132 {
2059 case Button1: 2133 case Button1:
2060 case Button3: 2134 case Button3:
2061 selection_make (ev.time); 2135 selection_make (ev.time);
2062 break; 2136 break;
2137
2063 case Button2: 2138 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2065 break; 2141 break;
2142
2066#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2067 case Button4: 2144 case Button4:
2068 case Button5: 2145 case Button5:
2069 { 2146 {
2070 int i; 2147 int i;
… …
2072 2149
2073 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2074 2151
2075 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2076 i = 1; 2153 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2155 i = nrow - 1;
2079 else 2156 else
2080 i = 5; 2157 i = 5;
2081 2158
2082# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
… …
2092 slip_wheel_ev.start (); 2169 slip_wheel_ev.start ();
2093 } 2170 }
2094 else 2171 else
2095 { 2172 {
2096# endif 2173# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2174 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2175 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2176# ifdef MOUSE_SLIP_WHEELING
2110 } 2177 }
2111#endif 2178# endif
2112 } 2179 }
2113 break; 2180 break;
2114#endif 2181#endif
2115 } 2182 }
2116 } 2183 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2184}
2122 2185
2123#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2124#if TINTING 2187#if TINTING
2125/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2126 2189
2127typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2128 2191
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{ 2193{
2131 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i; 2199 int i;
2137 2200
2138 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2139 2202
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141 2204
2142 /* for convenience */ 2205 /* for convenience */
2143 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2364 Atom atype; 2427 Atom atype;
2365 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2366 Window root, oldp, *list; 2429 Window root, oldp, *list;
2367 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2368 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2370 2432
2371 pchanged = 0; 2433 pchanged = 0;
2372 2434
2373 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2375 2437
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2378 2440
2379 XGetWindowAttributes (disp, parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2380 2442
2381 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2382 { 2444 {
2383 if (am_transparent) 2445 if (am_transparent)
2384 { 2446 {
2385 pchanged = 1; 2447 pchanged = 1;
2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2388 } 2450 }
2389 2451
2390 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2391 } 2453 }
2392 2454
2393 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2394 XSync (disp, False); 2456 XSync (dpy, False);
2395 2457
2396 /* 2458 /*
2397 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2398 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2399 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2400 */ 2462 */
2401 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2404 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2405 2467
2406 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2411 2473
2412 if (!i || prop == NULL 2474 if (!i || prop == NULL
2413#if TINTING 2475#if TINTING
2414 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2415#endif 2477#endif
2416 ) 2478 )
2417 have_pixmap = 0; 2479 have_pixmap = 0;
2418 else 2480 else
2419 { 2481 {
… …
2432 Window cr; 2494 Window cr;
2433 XImage *image; 2495 XImage *image;
2434 GC gc; 2496 GC gc;
2435 XGCValues gcvalue; 2497 XGCValues gcvalue;
2436 2498
2437 XTranslateCoordinates (disp, parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2503 nx = ny = 0;
2442 2504
… …
2452 nh += sy; 2514 nh += sy;
2453 ny = -sy; 2515 ny = -sy;
2454 sy = 0; 2516 sy = 0;
2455 } 2517 }
2456 2518
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2521
2460 XSync (disp, False); 2522 XSync (dpy, False);
2461 allowedxerror = -1; 2523 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2525
2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2465 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2466 allowedxerror = 0; 2528 allowedxerror = 0;
2467 2529
… …
2470 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2471 { 2533 {
2472 pchanged = 1; 2534 pchanged = 1;
2473 if (pixmap != None) 2535 if (pixmap != None)
2474 { 2536 {
2475 XFreePixmap (disp, pixmap); 2537 XFreePixmap (dpy, pixmap);
2476 pixmap = None; 2538 pixmap = None;
2477 } 2539 }
2478 } 2540 }
2479 2541
2480 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2481 } 2543 }
2482 else 2544 else
2483 { 2545 {
2484 if (pixmap != None) 2546 if (pixmap != None)
2485 XFreePixmap (disp, pixmap); 2547 XFreePixmap (dpy, pixmap);
2486 2548
2487#if TINTING 2549#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2551 {
2490 unsigned short rm, gm, bm;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492 2553
2554 rgba c;
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2494 2556
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2496 } 2558 }
2497#endif 2559#endif
2498 2560
2499 pixmap = XCreatePixmap (disp, vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2500 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2502 XPutImage (disp, pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2505 XDestroyImage (image); 2566 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2507 XClearWindow (disp, parent[0]); 2568 XClearWindow (dpy, parent[0]);
2508 2569
2509 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2571 pchanged = 1;
2511 2572
2512 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2513 } 2574 }
2514 } 2575 }
2515 2576
2516 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 else 2579 else
2519 { 2580 {
2520 unsigned int n; 2581 unsigned int n;
2521 /* 2582 /*
2522 * InheritPixmap transparency 2583 * InheritPixmap transparency
2523 */ 2584 */
2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2586 {
2526 oldp = parent[i]; 2587 oldp = parent[i];
2527 XQueryTree (disp, parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2528 &parent[i], &list, &n);
2529 XFree (list); 2589 XFree (list);
2530 2590
2531 if (parent[i] == display->root) 2591 if (parent[i] == display->root)
2532 { 2592 {
2533 if (oldp != None) 2593 if (oldp != None)
… …
2541 } 2601 }
2542 2602
2543 n = 0; 2603 n = 0;
2544 2604
2545 if (pchanged) 2605 if (pchanged)
2546 {
2547 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2548 { 2607 {
2549 XGetWindowAttributes (disp, parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2611 {
2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2613 break;
2554 } 2614 }
2555 } 2615 }
2556 }
2557 2616
2558 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2559 { 2618 {
2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2621 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2564 } 2623 }
2565 else 2624 else
2566 { 2625 {
2567#if WAIT_FOR_WM
2568 /* wait (an arbitrary period) for the WM to do its thing
2569 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1);
2571#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2573 { 2627 {
2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2575 XClearWindow (disp, parent[n]); 2629 XClearWindow (dpy, parent[n]);
2576 } 2630 }
2577 2631
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 am_transparent = 1; 2633 am_transparent = 1;
2580 } 2634 }
2581 2635
2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 parent[i] = None; 2637 parent[i] = None;
2584 } 2638 }
2585 2639
2586 if (scrollBar.win) 2640 if (scrollBar.win)
2587 { 2641 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2590 scrollbar_show (0); 2644 scrollbar_show (0);
2591 } 2645 }
2592 2646
2593 if (am_transparent) 2647 if (am_transparent)
… …
2605 2659
2606bool 2660bool
2607rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2608{ 2662{
2609 bool flag = false; 2663 bool flag = false;
2610 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2612 2666
2613 for (;;) 2667 for (;;)
2614 { 2668 {
2615 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
2616 { 2670 {
2617 seq_begin = cmdbuf_ptr; 2671 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2672 ch = next_char ();
2619 }
2620 2673
2621 if (ch == NOCHAR) // TODO: improve 2674 if (ch == NOCHAR)
2622 break; 2675 break;
2676 }
2623 2677
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2679 {
2626 if (!seen_input) 2680 if (!seen_input)
2627 { 2681 {
… …
2636 if (seen_resize && cmd_pid) 2690 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2691 kill (-cmd_pid, SIGWINCH);
2638 } 2692 }
2639 2693
2640 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2696 bool refreshnow = false;
2643 int nlines = 0; 2697 int nlines = 0;
2644 unicode_t *str = buf; 2698 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2700
2647 for (;;) 2701 for (;;)
2648 { 2702 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2650 break; 2704 break;
… …
2656 if (ch == C0_LF) 2710 if (ch == C0_LF)
2657 nlines++; 2711 nlines++;
2658 2712
2659 refresh_count++; 2713 refresh_count++;
2660 2714
2661 if (!(options & Opt_jumpScroll) 2715 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2717 {
2664 refreshnow = true; 2718 refreshnow = true;
2719 refresh_count = 0;
2665 ch = NOCHAR; 2720 ch = NOCHAR;
2666 break; 2721 break;
2667 } 2722 }
2668 2723
2669 // scr_add_lines only works for nlines <= nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2725 if (nlines >= nrow - 1)
2671 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2672 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2730
2673 nlines = 0; 2731 nlines = 0;
2674 str = buf; 2732 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2733 eol = str + min (ncol, UBUFSIZ);
2676 } 2734 }
2677 2735
… …
2690 2748
2691 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2750 ch = next_char ();
2693 } 2751 }
2694 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2695 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2696 2756
2697 /* 2757 /*
2698 * If there have been a lot of new lines, then update the screen 2758 * If there have been a lot of new lines, then update the screen
2699 * What the heck I'll cheat and only refresh less than every page-full. 2759 * What the heck I'll cheat and only refresh less than every page-full.
2700 * the number of pages between refreshes is refresh_limit, which 2760 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2761 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2762 */
2703 if (refreshnow) 2763 if (refreshnow)
2704 { 2764 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2766 refresh_limit++;
2707 else 2767 else
2708 { 2768 {
2709 flag = true; 2769 flag = true;
2710 scr_refresh (refresh_type); 2770 scr_refresh ();
2771 want_refresh = 1;
2711 } 2772 }
2712 } 2773 }
2713 2774
2714 } 2775 }
2715 else 2776 else
… …
2730 } 2791 }
2731 2792
2732 return flag; 2793 return flag;
2733} 2794}
2734 2795
2735// read the next octet
2736unicode_t
2737rxvt_term::next_octet ()
2738{
2739 return cmdbuf_ptr < cmdbuf_endp
2740 ? *cmdbuf_ptr++
2741 : NOCHAR;
2742}
2743
2744// read the next character 2796// read the next character
2745unicode_t 2797wchar_t
2746rxvt_term::next_char () 2798rxvt_term::next_char () NOTHROW
2747{ 2799{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2800 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2801 {
2750 // assume 7-bit to be ascii ALWAYS 2802 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2803 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2752 return *cmdbuf_ptr++; 2804 return *cmdbuf_ptr++;
2753 2805
2754 wchar_t wc; 2806 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2807 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2808
2757 if (len == (size_t)-2) 2809 if (len == (size_t)-2)
2758 { 2810 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2811 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2812 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2813 break;
2762 } 2814 }
2763 2815
2764 if (len == (size_t)-1) 2816 if (len == (size_t)-1)
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2817 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2766 2818
2767 // assume wchar == unicode 2819 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2820 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2821 return wc & UNICODE_MASK;
2770 } 2822 }
2771 2823
2772 return NOCHAR; 2824 return NOCHAR;
2773} 2825}
2826
2827// read the next octet
2828uint32_t
2829rxvt_term::next_octet () NOTHROW
2830{
2831 return cmdbuf_ptr < cmdbuf_endp
2832 ? (unsigned char)*cmdbuf_ptr++
2833 : NOCHAR;
2834}
2835
2836static class out_of_input out_of_input;
2774 2837
2775/* rxvt_cmd_getc () - Return next input character */ 2838/* rxvt_cmd_getc () - Return next input character */
2776/* 2839/*
2777 * Return the next input character after first passing any keyboard input 2840 * Return the next input character after first passing any keyboard input
2778 * to the command. 2841 * to the command.
2779 */ 2842 */
2780unicode_t 2843wchar_t
2781rxvt_term::cmd_getc () 2844rxvt_term::cmd_getc () THROW ((class out_of_input))
2782{ 2845{
2783 unicode_t c = next_char (); 2846 wchar_t c = next_char ();
2784 2847
2785 if (c == NOCHAR) 2848 if (c == NOCHAR)
2786 throw out_of_input; 2849 throw out_of_input;
2787 2850
2788 return c; 2851 return c;
2789} 2852}
2790 2853
2791unicode_t 2854uint32_t
2792rxvt_term::cmd_get8 () 2855rxvt_term::cmd_get8 () THROW ((class out_of_input))
2793{ 2856{
2794 unicode_t c = next_octet (); 2857 uint32_t c = next_octet ();
2795 2858
2796 if (c == NOCHAR) 2859 if (c == NOCHAR)
2797 throw out_of_input; 2860 throw out_of_input;
2798 2861
2799 return c; 2862 return c;
… …
2899 case C0_ESC: 2962 case C0_ESC:
2900 process_escape_seq (); 2963 process_escape_seq ();
2901 break; 2964 break;
2902 case C0_ENQ: /* terminal Status */ 2965 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 2966 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2967 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 2968 else
2907 tt_write ((unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 2970 break;
2910 case C0_BEL: /* bell */ 2971 case C0_BEL: /* bell */
2911 scr_bell (); 2972 scr_bell ();
2912 break; 2973 break;
2913 case C0_BS: /* backspace */ 2974 case C0_BS: /* backspace */
… …
3037 scr_charset_set (2, (unsigned int)cmd_getc ()); 3098 scr_charset_set (2, (unsigned int)cmd_getc ());
3038 break; 3099 break;
3039 case '+': 3100 case '+':
3040 scr_charset_set (3, (unsigned int)cmd_getc ()); 3101 scr_charset_set (3, (unsigned int)cmd_getc ());
3041 break; 3102 break;
3042#if ENABLE_FRILLS 3103#if !ENABLE_MINIMAL
3043 case '6': 3104 case '6':
3044 scr_backindex (); 3105 scr_backindex ();
3045 break; 3106 break;
3046#endif 3107#endif
3047 case '7': 3108 case '7':
3048 scr_cursor (SAVE); 3109 scr_cursor (SAVE);
3049 break; 3110 break;
3050 case '8': 3111 case '8':
3051 scr_cursor (RESTORE); 3112 scr_cursor (RESTORE);
3052 break; 3113 break;
3053#if ENABLE_FRILLS 3114#if !ENABLE_MINIMAL
3054 case '9': 3115 case '9':
3055 scr_forwardindex (); 3116 scr_forwardindex ();
3056 break; 3117 break;
3057#endif 3118#endif
3058 case '=': 3119 case '=':
… …
3068 break; 3129 break;
3069 3130
3070 /* 8.3.87: NEXT LINE */ 3131 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 3132 case C1_NEL: /* ESC E */
3072 { 3133 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 3134 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 3135 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 3136 }
3076 break; 3137 break;
3077 3138
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 3139 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 3140 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 3162 process_dcs_seq ();
3102 break; 3163 break;
3103 3164
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3165 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 3166 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 3167 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 3168 break; /* steal obsolete ESC [ c */
3109 3169
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3170 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3111 case C1_CSI: /* ESC [ */ 3171 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 3172 process_csi_seq ();
… …
3221 ndef = get_byte_array_bit (csi_defaults, i); 3281 ndef = get_byte_array_bit (csi_defaults, i);
3222 for (p = 0; p < nargs; p++) 3282 for (p = 0; p < nargs; p++)
3223 if (arg[p] == -1) 3283 if (arg[p] == -1)
3224 arg[p] = ndef; 3284 arg[p] = ndef;
3225 3285
3226#ifdef DEBUG_CMD
3227 fprintf (stderr, "CSI ");
3228 for (p = 0; p < nargs; p++)
3229 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3230 fprintf (stderr, "%c\n", ch);
3231#endif
3232
3233 /* 3286 /*
3234 * private mode handling 3287 * private mode handling
3235 */ 3288 */
3236 if (priv) 3289 if (priv)
3237 { 3290 {
3238 switch (priv) 3291 switch (priv)
3239 { 3292 {
3240 case '>': 3293 case '>':
3241 if (ch == CSI_DA) /* secondary device attributes */ 3294 if (ch == CSI_DA) /* secondary device attributes */
3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3295 {
3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 //
3299 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3300 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3301 // that we do not support xterm mouse reporting (should be 95 when we do).
3302 //
3303 tt_printf ("\033[>%d;94;0c", 'U');
3304 }
3243 break; 3305 break;
3244 case '?': 3306 case '?':
3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3246 process_terminal_mode (ch, priv, nargs, arg); 3308 process_terminal_mode (ch, priv, nargs, arg);
3247 break; 3309 break;
… …
3352 3414
3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3415 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3354 arg[0] = -arg[0]; 3416 arg[0] = -arg[0];
3355 /* FALLTHROUGH */ 3417 /* FALLTHROUGH */
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3418 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3419 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3420 break;
3359 3421
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3422 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3423 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 3424 break;
3364 3425
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3426 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 3427 process_sgr_mode (nargs, arg);
3367 break; 3428 break;
… …
3374 break; 3435 break;
3375 case 6: /* CPR requested */ 3436 case 6: /* CPR requested */
3376 scr_report_position (); 3437 scr_report_position ();
3377 break; 3438 break;
3378 case 7: /* unofficial extension */ 3439 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3440 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3441 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3442 break;
3382 case 8: /* unofficial extension */ 3443 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3445 break;
… …
3451 break; 3512 break;
3452 case CSI_75: 3513 case CSI_75:
3453 scr_cursor (RESTORE); 3514 scr_cursor (RESTORE);
3454 break; 3515 break;
3455 3516
3456#if ENABLE_FRILLS 3517#if !ENABLE_MINIMAL
3457 case CSI_74: 3518 case CSI_74:
3458 process_window_ops (arg, nargs); 3519 process_window_ops (arg, nargs);
3459 break; 3520 break;
3460#endif 3521#endif
3461 3522
… …
3468 break; 3529 break;
3469 } 3530 }
3470} 3531}
3471/*}}} */ 3532/*}}} */
3472 3533
3473#if ENABLE_FRILLS 3534#if !ENABLE_MINIMAL
3474/* ARGSUSED */ 3535/* ARGSUSED */
3475void 3536void
3476rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3537rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3477{ 3538{
3478 int x, y; 3539 int x, y;
3479 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
3480 Window wdummy; 3541 Window wdummy;
3481 dDisp; 3542
3543 dLocal (Display *, dpy);
3482 3544
3483 if (nargs == 0) 3545 if (nargs == 0)
3484 return; 3546 return;
3485 3547
3486 switch (args[0]) 3548 switch (args[0])
3487 { 3549 {
3488 /* 3550 /*
3489 * commands 3551 * commands
3490 */ 3552 */
3491 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
3492 XMapWindow (disp, parent[0]); 3554 XMapWindow (dpy, parent[0]);
3493 break; 3555 break;
3494 case 2: /* iconify window */ 3556 case 2: /* iconify window */
3495 XIconifyWindow (disp, parent[0], display->screen); 3557 XIconifyWindow (dpy, parent[0], display->screen);
3496 break; 3558 break;
3497 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
3498 XMoveWindow (disp, parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
3499 break; 3561 break;
3500 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3502 break; 3564 break;
3503 case 5: /* raise window */ 3565 case 5: /* raise window */
3504 XRaiseWindow (disp, parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
3505 break; 3567 break;
3506 case 6: /* lower window */ 3568 case 6: /* lower window */
3507 XLowerWindow (disp, parent[0]); 3569 XLowerWindow (dpy, parent[0]);
3508 break; 3570 break;
3509 case 7: /* refresh window */ 3571 case 7: /* refresh window */
3510 scr_touch (true); 3572 scr_touch (true);
3511 break; 3573 break;
3512 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
… …
3519 if (args[0] >= 24) /* set height (chars) */ 3581 if (args[0] >= 24) /* set height (chars) */
3520 set_widthheight ((unsigned int)width, 3582 set_widthheight ((unsigned int)width,
3521 (unsigned int) (args[1] * fheight)); 3583 (unsigned int) (args[1] * fheight));
3522 break; 3584 break;
3523 3585
3524
3525 /* 3586 /*
3526 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
3527 */ 3588 */
3528 case 11: /* report window state */ 3589 case 11: /* report window state */
3529 XGetWindowAttributes (disp, parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3531 break; 3592 break;
3532 case 13: /* report window position */ 3593 case 13: /* report window position */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 XTranslateCoordinates (disp, parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
3535 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
3536 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
3537 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
3538 break; 3599 break;
3539 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
3540 XGetWindowAttributes (disp, parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3542 break; 3603 break;
3543 case 18: /* report text area size (chars) */ 3604 case 18: /* report text area size (chars) */
3544 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3545 break; 3606 break;
… …
3547 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3548 break; 3609 break;
3549 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3550 { 3611 {
3551 char *s; 3612 char *s;
3552 XGetIconName (disp, parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3615 XFree (s);
3555 } 3616 }
3556 break; 3617 break;
3557 case 21: /* report window title */ 3618 case 21: /* report window title */
3558 { 3619 {
3559 char *s; 3620 char *s;
3560 XFetchName (disp, parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3623 XFree (s);
3563 } 3624 }
3564 break; 3625 break;
3565 } 3626 }
3566} 3627}
… …
3569/*----------------------------------------------------------------------*/ 3630/*----------------------------------------------------------------------*/
3570/* 3631/*
3571 * get input up until STRING TERMINATOR (or BEL) 3632 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3633 * ends_how is terminator used. returned input must be free()'d
3573 */ 3634 */
3574unsigned char * 3635char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3636rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3637{
3577 unicode_t ch; 3638 unicode_t ch;
3578 bool seen_esc = false; 3639 bool seen_esc = false;
3579 unsigned int n = 0; 3640 unsigned int n = 0;
… …
3612 3673
3613 string[n++] = '\0'; 3674 string[n++] = '\0';
3614 3675
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3676 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3677
3617 return (unsigned char *)rxvt_wcstombs (string); 3678 return rxvt_wcstombs (string);
3618} 3679}
3619 3680
3620/*----------------------------------------------------------------------*/ 3681/*----------------------------------------------------------------------*/
3621/* 3682/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3683 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3684 */
3624void 3685void
3625rxvt_term::process_dcs_seq () 3686rxvt_term::process_dcs_seq ()
3626{ 3687{
3627 unsigned char *s; 3688 char *s;
3628 unicode_t eh; 3689 unicode_t eh;
3629 3690
3630 /* 3691 /*
3631 * Not handled yet 3692 * Not handled yet
3632 */ 3693 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3712 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3713 arg = arg * 10 + (ch - '0');
3653 3714
3654 if (ch == ';') 3715 if (ch == ';')
3655 { 3716 {
3656 unsigned char *s = get_to_st (eh); 3717 char *s = get_to_st (eh);
3657 3718
3658 if (s) 3719 if (s)
3659 { 3720 {
3660 process_xterm_seq (arg, (char *)s, eh); 3721 process_xterm_seq (arg, s, eh);
3661 free (s); 3722 free (s);
3662 } 3723 }
3663 } 3724 }
3664} 3725}
3665 3726
3666void 3727void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3728rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3729{
3669 if (str[0] == '?' && !str[1]) 3730 if (str[0] == '?' && !str[1])
3670 { 3731 {
3671 unsigned short r, g, b; 3732 rgba c;
3672 pix_colors_focused[color].get (display, r, g, b); 3733 pix_colors_focused[color].get (c);
3734
3735#if XFT
3736 if (c.a != rgba::MAX_CC)
3737 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3738 else
3739#endif
3673 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3674 } 3741 }
3675 else 3742 else
3676 set_window_color (color, str); 3743 set_window_color (color, str);
3677} 3744}
3678 3745
3679/* 3746/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3748 */
3682void 3749void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3751{
3685 int changed = 0;
3686 int color; 3752 int color;
3687 char *buf, *name; 3753 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3689 int saveop = op; 3755 int saveop = op;
3690 dDisp; 3756
3757 dLocal (Display *, dpy);
3691 3758
3692 assert (str != NULL); 3759 assert (str != NULL);
3693 switch (op) 3760 switch (op)
3694 { 3761 {
3695 case XTerm_name: 3762 case XTerm_name:
… …
3711 unsigned long bytes_after; 3778 unsigned long bytes_after;
3712 unsigned char *value = 0; 3779 unsigned char *value = 0;
3713 const char *str = ""; 3780 const char *str = "";
3714 3781
3715 if (prop 3782 if (prop
3716 && XGetWindowProperty (disp, parent[0], 3783 && XGetWindowProperty (dpy, parent[0],
3717 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3718 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3719 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3720 && actual_type != None 3787 && actual_type != None
3721 && actual_format == 8) 3788 && actual_format == 8)
3722 str = (const char *)(value); 3789 str = (const char *)(value);
3723 3790
3724 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3791 tt_printf ("\033]%d;%s%c", op, str, resp);
3725 3792
3726 XFree (value); 3793 XFree (value);
3727 } 3794 }
3728 else 3795 else
3729 { 3796 {
… …
3733 { 3800 {
3734 *eq = 0; 3801 *eq = 0;
3735 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3736 } 3803 }
3737 else 3804 else
3738 XDeleteProperty (disp, parent[0], 3805 XDeleteProperty (dpy, parent[0],
3739 display->atom (str)); 3806 display->atom (str));
3740 } 3807 }
3741 break; 3808 break;
3742 3809
3743 case XTerm_Color: 3810 case XTerm_Color:
… …
3745 { 3812 {
3746 if ((name = strchr (buf, ';')) == NULL) 3813 if ((name = strchr (buf, ';')) == NULL)
3747 break; 3814 break;
3748 3815
3749 *name++ = '\0'; 3816 *name++ = '\0';
3750 color = atoi (buf); 3817 color = atoi (buf) + minCOLOR;
3751 3818
3752 if (color < 0 || color >= TOTAL_COLORS) 3819 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3753 break; 3820 break;
3754 3821
3755 if ((buf = strchr (name, ';')) != NULL) 3822 if ((buf = strchr (name, ';')) != NULL)
3756 *buf++ = '\0'; 3823 *buf++ = '\0';
3757 3824
3758 if (name[0] == '?' && !name[1]) 3825 process_color_seq (op, color, name, resp);
3759 {
3760 unsigned short r, g, b;
3761 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3762 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3763 }
3764 else
3765 set_window_color (color + minCOLOR, name);
3766 } 3826 }
3767 break; 3827 break;
3768 case XTerm_Color00: 3828 case XTerm_Color00:
3769 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3829 process_color_seq (op, Color_fg, str, resp);
3770 break; 3830 break;
3771 case XTerm_Color01: 3831 case XTerm_Color01:
3772 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3832 process_color_seq (op, Color_bg, str, resp);
3773 break; 3833 break;
3774#ifndef NO_CURSORCOLOR 3834#ifndef NO_CURSORCOLOR
3775 case XTerm_Color_cursor: 3835 case XTerm_Color_cursor:
3776 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3836 process_color_seq (op, Color_cursor, str, resp);
3777 break; 3837 break;
3778#endif 3838#endif
3779 case XTerm_Color_pointer_fg: 3839 case XTerm_Color_pointer_fg:
3780 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3840 process_color_seq (op, Color_pointer_fg, str, resp);
3781 break; 3841 break;
3782 case XTerm_Color_pointer_bg: 3842 case XTerm_Color_pointer_bg:
3783 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3843 process_color_seq (op, Color_pointer_bg, str, resp);
3784 break; 3844 break;
3785#ifndef NO_BOLD_UNDERLINE_REVERSE 3845#ifndef NO_BOLD_UNDERLINE_REVERSE
3786 case XTerm_Color_BD:
3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3788 break;
3789 case XTerm_Color_UL:
3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3791 break;
3792 case XTerm_Color_RV: 3846 case XTerm_Color_RV:
3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3847 process_color_seq (op, Color_RV, str, resp);
3848 break;
3849 case Rxvt_Color_BD:
3850 case URxvt_Color_BD:
3851 process_color_seq (op, Color_BD, str, resp);
3852 break;
3853 case Rxvt_Color_UL:
3854 case URxvt_Color_UL:
3855 process_color_seq (op, Color_UL, str, resp);
3794 break; 3856 break;
3795 case URxvt_Color_IT: 3857 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3858 process_color_seq (op, Color_IT, str, resp);
3797 break; 3859 break;
3798#endif 3860#endif
3799#if TRANSPARENT && TINTING 3861#if TRANSPARENT && TINTING
3800 case URxvt_Color_tint: 3862 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3863 process_color_seq (op, Color_tint, str, resp);
3864
3802 check_our_parents (); 3865 check_our_parents ();
3866
3803 if (am_transparent) 3867 if (am_transparent)
3804 want_full_refresh = want_refresh = 1; 3868 want_full_refresh = want_refresh = 1;
3805 break;
3806#endif
3807 3869
3870 break;
3871#endif
3872
3808 case XTerm_Pixmap: 3873 case Rxvt_Pixmap:
3874 {
3809 if (*str != ';') 3875 if (*str != ';')
3810 { 3876 {
3811#if XPM_BACKGROUND 3877#if XPM_BACKGROUND
3812 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3813 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3814#endif
3815 scr_touch (true); 3880 scr_touch (true);
3881#endif
3816 } 3882 }
3883
3884 int changed = 0;
3885
3817 while ((str = strchr (str, ';')) != NULL) 3886 while ((str = strchr (str, ';')) != NULL)
3818 { 3887 {
3819 str++; 3888 str++;
3820#if XPM_BACKGROUND 3889#if XPM_BACKGROUND
3821 changed += scale_pixmap (str); 3890 changed += scale_pixmap (str);
3822#endif 3891#endif
3823 } 3892 }
3824 3893
3825 if (changed) 3894 if (changed)
3826 { 3895 {
3827#ifdef XPM_BACKGROUND 3896#ifdef XPM_BACKGROUND
3828 resize_pixmap (); 3897 resize_pixmap ();
3829#endif
3830 scr_touch (true); 3898 scr_touch (true);
3899#endif
3831 } 3900 }
3901 }
3832 break; 3902 break;
3833 3903
3834 case XTerm_restoreFG: 3904 case Rxvt_restoreFG:
3835 set_window_color (Color_fg, str); 3905 set_window_color (Color_fg, str);
3836 break; 3906 break;
3837 case XTerm_restoreBG: 3907 case Rxvt_restoreBG:
3838 set_window_color (Color_bg, str); 3908 set_window_color (Color_bg, str);
3839 break; 3909 break;
3840 3910
3841 case XTerm_logfile: 3911 case XTerm_logfile:
3842 // TODO, when secure mode? 3912 // TODO, when secure mode?
3843 break; 3913 break;
3844 3914
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0 3915#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3916 case Rxvt_dumpscreen: /* no error notices */
3853 { 3917 {
3854 int fd; 3918 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3920 {
3857 scr_dump (fd); 3921 scr_dump (fd);
… …
3868 case URxvt_italicFont: 3932 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3933 case URxvt_boldItalicFont:
3870#endif 3934#endif
3871 if (query) 3935 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3938 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3939 resp);
3876 else 3940 else
3877 { 3941 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3881 allocated.push_back ((void *)res); 3945 allocated.push_back ((void *)res);
3882 set_fonts (); 3946 set_fonts ();
3883 } 3947 }
3884 break; 3948 break;
3885 3949
3886#if ENABLE_FRILLS 3950 case URxvt_version:
3951 if (query)
3952 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3953 op,
3954 rs[Rs_name], VERSION[0], VERSION[2],
3955 resp);
3956 break;
3957
3958#if !ENABLE_MINIMAL
3887 case URxvt_locale: 3959 case URxvt_locale:
3888 if (query) 3960 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 3962 else
3891 { 3963 {
3892 set_locale (str); 3964 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3966 init_xlocale ();
3895 } 3967 }
3896 break; 3968 break;
3897 3969
3898 case URxvt_view_up: 3970 case URxvt_view_up:
3899 case URxvt_view_down: 3971 case URxvt_view_down:
3972 {
3900 int lines = atoi (str); 3973 int lines = atoi (str);
3901 3974
3902 if (lines) 3975 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 3976 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 3977 else
3905 {
3906 scr_erase_savelines (); 3978 scr_erase_savelines ();
3907 } 3979 }
3908 3980
3981 break;
3982#endif
3983
3984#if ENABLE_PERL
3985 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3987 ; // no responses yet
3909 break; 3988 break;
3910#endif 3989#endif
3911 } 3990 }
3912} 3991}
3913/*----------------------------------------------------------------------*/ 3992/*----------------------------------------------------------------------*/
… …
3944 return state; 4023 return state;
3945} 4024}
3946 4025
3947/* we're not using priv _yet_ */ 4026/* we're not using priv _yet_ */
3948void 4027void
3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3950{ 4029{
3951 unsigned int i, j; 4030 unsigned int i, j;
3952 int state; 4031 int state;
3953 4032
3954 static const struct 4033 static const struct
… …
3965 { 5, PrivMode_rVideo }, 4044 { 5, PrivMode_rVideo },
3966 { 6, PrivMode_relOrigin }, 4045 { 6, PrivMode_relOrigin },
3967 { 7, PrivMode_Autowrap }, 4046 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode 4047 // 8, bi-directional support mode
3969 { 9, PrivMode_MouseX10 }, 4048 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc
3971 { menuBar_esc, PrivMode_menuBar },
3972#endif
3973 // 18, 19 printing-related 4049 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 4050 { 25, PrivMode_VisibleCursor },
3975#ifdef scrollBar_esc 4051#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 4052 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 4053#endif
… …
4022 } 4098 }
4023 4099
4024 /* extra handling for values with state unkept */ 4100 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4101 switch (arg[i])
4026 { 4102 {
4103#if ENABLE_STYLES
4104 case 1021:
4105 set_option (Opt_intensityStyles, mode);
4106
4107 scr_touch (true);
4108 break;
4109#endif
4027 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
4028 case 1049: 4111 case 1049:
4029 if (options & Opt_secondaryScreen) 4112 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4113 if (mode == 0)
4031 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
4032 else if (mode == 1) 4115 else if (mode == 1)
4033 scr_cursor (SAVE); 4116 scr_cursor (SAVE);
4034 break; 4117 break;
… …
4049 case 3: /* 80/132 */ 4132 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4133 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4134 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4135 break;
4053 case 4: /* smooth scrolling */ 4136 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4137 set_option (Opt_jumpScroll, !state);
4058 break; 4138 break;
4059 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4061 break; 4141 break;
4062 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
4068 /* case 8: - auto repeat, can't do on a per window basis */ 4148 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 4151 priv_modes &= ~PrivMode_MouseX11;
4072 break; 4152 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 4153#ifdef scrollBar_esc
4081 case scrollBar_esc: 4154 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 4155 if (scrollbar_mapping (state))
4083 { 4156 {
4084 resize_all_windows (0, 0, 0); 4157 resize_all_windows (0, 0, 0);
… …
4103#if 0 4176#if 0
4104 case 1001: 4177 case 1001:
4105 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4106#endif 4179#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4181 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4182 break;
4113 case 1011: /* scroll to bottom on key press */ 4183 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4184 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4185 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4186 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4187 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4188 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4189 scr_erase_screen (2);
4123 scr_change_screen (state); 4190 scr_change_screen (state);
4124 break; 4191 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4192 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4193 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4196 scr_erase_screen (2);
4130 break; 4197 break;
4131 default: 4198 default:
4132 break; 4199 break;
… …
4260 scr_color (Color_bg, Color_bg); 4327 scr_color (Color_bg, Color_bg);
4261 break; 4328 break;
4262 4329
4263 //case 50: // not variable spacing 4330 //case 50: // not variable spacing
4264 4331
4265#ifndef NO_BRIGHTCOLOR 4332#if !ENABLE_MINIMAL
4266 case 90: 4333 case 90:
4267 case 91: /* set bright fg color */ 4334 case 91: /* set bright fg color */
4268 case 92: 4335 case 92:
4269 case 93: 4336 case 93:
4270 case 94: 4337 case 94:
… …
4282 case 106: 4349 case 106:
4283 case 107: 4350 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4351 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4352 break;
4286#endif 4353#endif
4287
4288 } 4354 }
4289 } 4355 }
4290} 4356}
4291/*}}} */ 4357/*}}} */
4292 4358
… …
4316 */ 4382 */
4317void 4383void
4318rxvt_term::tt_printf (const char *fmt,...) 4384rxvt_term::tt_printf (const char *fmt,...)
4319{ 4385{
4320 va_list arg_ptr; 4386 va_list arg_ptr;
4321 unsigned char buf[256]; 4387 char buf[256];
4322 4388
4323 va_start (arg_ptr, fmt); 4389 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4390 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4391 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4392 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4397 * or generated by us in response to a query ESC sequence.
4332 */ 4398 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4400
4335void 4401void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4402rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4403{
4404 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4405 return;
4406
4407 if (pty->pty < 0)
4408 return;
4409
4338 if (v_buflen == 0) 4410 if (v_buflen == 0)
4339 { 4411 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4412 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 4413
4342 if ((unsigned int)written == len) 4414 if ((unsigned int)written == len)
4343 return; 4415 return;
4344 4416
4345 data += written; 4417 data += written;
4346 len -= written; 4418 len -= written;
4347 } 4419 }
4348 4420
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4422
4351 memcpy (v_buffer + v_buflen, data, len); 4423 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4424 v_buflen += len;
4353 4425
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355} 4427}
4356 4428
4357void rxvt_term::pty_write () 4429void rxvt_term::pty_write ()
4358{ 4430{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4432
4361 if (written > 0) 4433 if (written > 0)
4362 { 4434 {
4363 v_buflen -= written; 4435 v_buflen -= written;
4364 4436
… …
4373 } 4445 }
4374 4446
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4448 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4451}
4381 4452
4382/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4383 4454

Diff Legend

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