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.212 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

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

Diff Legend

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