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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.319 by ayin, Fri Feb 16 21:46:05 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
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 && errno != EINTR) || n == 0) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1227 {
1228#if LINUX_YIELD_HACK
1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1231#endif
1232 }
1233 else
1073 { 1234 {
1074 pty_ev.stop (); 1235 pty_ev.stop ();
1075 1236
1076 if (!(options & Opt_hold)) 1237 if (!OPTION (Opt_hold))
1077 destroy (); 1238 destroy ();
1078 } 1239 }
1079 1240
1080 return false; 1241 return false;
1081} 1242}
1082 1243
1083void 1244void
1084rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1085{ 1246{
1086 SET_R (this); 1247 make_current ();
1087 SET_LOCALE (locale);
1088 1248
1089 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1090 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1091 while (pty_fill ()) 1251 while (pty_fill ())
1092 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1097} 1257}
1098 1258
1099void 1259void
1100rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1101{ 1261{
1102 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1103 recolour_cursor (); 1263 recolour_cursor ();
1104 1264
1105#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1266 hidden_pointer = 0;
1107 1267
1108 if (options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1110#endif 1270#endif
1111} 1271}
1112 1272
1113#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1114void 1274void
1115rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1116{ 1276{
1117 if (! (options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1118 return; 1278 return;
1119 1279
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1121 XFlush (display->display); 1281 XFlush (dpy);
1122 1282
1123 hidden_pointer = 1; 1283 hidden_pointer = 1;
1124} 1284}
1125 1285
1126void 1286void
1127rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1128{ 1288{
1129 SET_R (this); 1289 make_current ();
1130 SET_LOCALE (locale);
1131 1290
1132 pointer_blank (); 1291 pointer_blank ();
1133} 1292}
1134#endif 1293#endif
1135 1294
… …
1200 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1201 (32 + x + 1), 1360 (32 + x + 1),
1202 (32 + y + 1)); 1361 (32 + y + 1));
1203} 1362}
1204 1363
1205#ifdef USING_W11LIB
1206void
1207rxvt_W11_process_x_event (XEvent *ev)
1208{
1209 rxvt_t *r = rxvt_get_r ();
1210
1211 x_cb (*ev);
1212}
1213#endif
1214
1215/*{{{ process an X event */ 1364/*{{{ process an X event */
1216void 1365void
1217rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1218{ 1367{
1219 dDisp; 1368 make_current ();
1220 1369
1221 SET_R (this); 1370 dLocal (Display *, dpy);
1222 SET_LOCALE (locale);
1223 1371
1224#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1226 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1227 if (hidden_cursor) 1375 return;
1228 {
1229 hidden_cursor = 0;
1230 want_refresh = 1;
1231 }
1232 1376
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1234 }
1235#endif
1236
1237#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1239 {
1240 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease)
1243 if (hidden_pointer)
1244 pointer_unblank ();
1245
1246 if (ev.type == KeyPress && hidden_pointer == 0)
1247 pointer_blank ();
1248 }
1249#endif
1250
1251 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1252 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1253 unsigned int unused_mask; 1380 unsigned int unused_mask;
1254 1381
1255 switch (ev.type) 1382 switch (ev.type)
1256 { 1383 {
1257 case KeyPress: 1384 case KeyPress:
1258#if ISO_14755 1385 key_press (ev.xkey);
1259 if (!(iso14755buf & ISO_14755_52))
1260#endif
1261 lookup_key (ev.xkey);
1262
1263 break; 1386 break;
1264 1387
1265 case KeyRelease: 1388 case KeyRelease:
1266 { 1389 key_release (ev.xkey);
1267#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1268 KeySym ks;
1269
1270 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1271#endif
1272
1273#if ENABLE_FRILLS || ISO_14755
1274 // ISO 14755 support
1275 if (iso14755buf)
1276 if (iso14755buf & ISO_14755_52)
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281# if ISO_14755
1282 // iso14755 part 5.2 handling: release time
1283 // first: controls
1284 if ((ev.xkey.state & ControlMask)
1285 && ((ks >= 0x40 && ks <= 0x5f)
1286 || (ks >= 0x61 && ks <= 0x7f)))
1287 {
1288 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1289 commit_iso14755 ();
1290 return; // case-break;
1291 }
1292
1293 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1294 if (i[0] == ks)
1295 {
1296 iso14755buf = ISO_14755_51 | i[1];
1297 commit_iso14755 ();
1298 return; // case-break;
1299 }
1300
1301 scr_bell ();
1302# endif
1303 iso14755buf = 0;
1304 break;
1305 }
1306 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311 if (iso14755buf & ISO_14755_51)
1312 commit_iso14755 ();
1313#if ISO_14755
1314 else if (iso14755buf & ISO_14755_STARTED)
1315 {
1316 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1317
1318 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1319 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1320 }
1321# endif
1322 else
1323 iso14755buf = 0;
1324 }
1325#endif
1326
1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1328 if (!(ev.xkey.state & ControlMask))
1329 slip_wheel_ev.stop ();
1330 else if (ks == XK_Control_L || ks == XK_Control_R)
1331 mouse_slip_wheel_speed = 0;
1332#endif
1333 break; 1390 break;
1334 }
1335 1391
1336 case ButtonPress: 1392 case ButtonPress:
1337 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1338 break; 1394 break;
1339 1395
… …
1341 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1342 break; 1398 break;
1343 1399
1344 case ClientMessage: 1400 case ClientMessage:
1345 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1347 { 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 {
1348 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)))
1349 destroy (); 1411 destroy ();
1412 }
1350#if ENABLE_EWMH 1413#if ENABLE_EWMH
1351 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])
1352 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &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 }
1355#endif 1429#endif
1356 } 1430 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1366#ifdef OFFIX_DND
1367 /* OffiX Dnd (drag 'n' drop) protocol */
1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1369 && (ev.xclient.data.l[0] == DndFile
1370 || ev.xclient.data.l[0] == DndDir
1371 || ev.xclient.data.l[0] == DndLink))
1372 {
1373 /* Get Dnd data */
1374 Atom ActualType;
1375 int ActualFormat;
1376 unsigned char *data;
1377 unsigned long Size, RemainingBytes;
1378
1379 XGetWindowProperty (disp, display->root,
1380 xa[XA_DNDSELECTION],
1381 0L, 1000000L,
1382 False, AnyPropertyType,
1383 &ActualType, &ActualFormat,
1384 &Size, &RemainingBytes,
1385 &data);
1386 set_string_property (XA_CUT_BUFFER0, data);
1387 XFree (data);
1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1390 }
1391#endif /* OFFIX_DND */
1392 break; 1431 break;
1393 1432
1394 case MappingNotify: 1433 case MappingNotify:
1395 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1396 break; 1435 break;
… …
1419 break; 1458 break;
1420 } 1459 }
1421 break; 1460 break;
1422 1461
1423 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1424 focus_in (); 1464 focus_in ();
1425 break; 1465 break;
1426 1466
1427 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1428 focus_out (); 1469 focus_out ();
1429 break; 1470 break;
1430 1471
1431 case ConfigureNotify: 1472 case ConfigureNotify:
1432 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1433 { 1474 {
1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ; 1476 ;
1436 1477
1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1438 { 1479 {
1439 seen_resize = 1; 1480 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1482 }
1442 1483
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1444 if (options & Opt_transparent) 1487 if (OPTION (Opt_transparent))
1445 check_our_parents (); 1488 check_our_parents ();
1446#endif 1489#endif
1447 } 1490 }
1448 break; 1491 break;
1449 1492
1450 case PropertyNotify: 1493 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1451 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1452 && ev.xproperty.state == PropertyNewValue) 1496 && ev.xproperty.state == PropertyNewValue)
1453 selection_property (ev.xproperty.window, ev.xproperty.atom); 1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1454 1498
1455 break; 1499 break;
1456 1500
1457 case SelectionClear: 1501 case SelectionClear:
1458 selection_clear (); 1502 selection_clear ();
… …
1463 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1464 break; 1508 break;
1465 1509
1466 case SelectionRequest: 1510 case SelectionRequest:
1467 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1512 break;
1513
1514 case MapNotify:
1515 mapped = 1;
1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 break; 1520 break;
1469 1521
1470 case UnmapNotify: 1522 case UnmapNotify:
1471 mapped = 0; 1523 mapped = 0;
1472#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1473 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1474#endif 1526#endif
1475 break; 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1481#endif
1482 break; 1528 break;
1483 1529
1484#ifdef TRANSPARENT 1530#ifdef TRANSPARENT
1485 case ReparentNotify: 1531 case ReparentNotify:
1486 rootwin_cb (ev); 1532 rootwin_cb (ev);
… …
1492 if (ev.xany.window == vt) 1538 if (ev.xany.window == vt)
1493 { 1539 {
1494 do 1540 do
1495 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1496 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1498 1544
1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1500 1546
1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1504 1550
1505 scr_refresh (refresh_type); 1551 want_refresh = 1;
1506 } 1552 }
1507 else 1553 else
1508 { 1554 {
1509 XEvent unused_event; 1555 XEvent unused_event;
1510 1556
1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1512 ; 1558 ;
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1514 ; 1560 ;
1515 1561
1516 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1517 { 1563 {
1518 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1519 scrollbar_show (0); 1565 scrollbar_show (0);
1520 } 1566 }
1521#ifdef MENUBAR
1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1523 menubar_expose ();
1524#endif
1525 1567
1526#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1527 if (am_transparent && ev.xany.window == parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1528 XClearWindow (disp, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1529#endif 1571#endif
1530 } 1572 }
1531 break; 1573 break;
1532 1574
1533 case MotionNotify: 1575 case MotionNotify:
1534#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1535 if (hidden_pointer) 1577 if (hidden_pointer)
1536 pointer_unblank (); 1578 pointer_unblank ();
1537#endif 1579#endif
1538#if MENUBAR
1539 if (isMenuBarWindow (ev.xany.window))
1540 {
1541 menubar_control (ev.xbutton);
1542 break;
1543 }
1544#endif
1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 break; 1581 break;
1547 1582
1548 if (ev.xany.window == vt) 1583 if (ev.xany.window == vt)
1549 { 1584 {
1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1587 ; // nop
1550 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1551 { 1589 {
1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1553 ; 1591 ;
1554 1592
1555 XQueryPointer (disp, vt, 1593 XQueryPointer (dpy, vt,
1556 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1557 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1558 &ev.xbutton.x, &ev.xbutton.y, 1596 &ev.xbutton.x, &ev.xbutton.y,
1559 &ev.xbutton.state); 1597 &ev.xbutton.state);
1560#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
… …
1624#endif 1662#endif
1625 } 1663 }
1626 } 1664 }
1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1628 { 1666 {
1629 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1630 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1631 ; 1669 ;
1632 1670
1633 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1634 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1637 &unused_mask); 1675 &unused_mask);
1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1639 scrollbar_size ()); 1677 scrollbar_size ());
1640 scr_refresh (refresh_type); 1678 want_refresh = 1;
1641 refresh_limit = 0; 1679 refresh_limit = 0;
1642 scrollbar_show (1); 1680 scrollbar_show (1);
1643 } 1681 }
1644 break; 1682 break;
1645 } 1683 }
1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1646} 1711}
1647 1712
1648void 1713void
1649rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1650{ 1715{
1651 if (!focus) 1716 if (!focus)
1652 { 1717 {
1653 focus = 1; 1718 focus = 1;
1654 want_refresh = 1; 1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1655#if USE_XIM 1723#if USE_XIM
1656 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1657 { 1725 {
1658 IMSetStatusPosition (); 1726 IMSetPosition ();
1659 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1660 } 1728 }
1661#endif 1729#endif
1662#if CURSOR_BLINK 1730#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1731 if (OPTION (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1665#endif 1733#endif
1666#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1668 { 1736 {
1669 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
… …
1679 if (focus) 1747 if (focus)
1680 { 1748 {
1681 focus = 0; 1749 focus = 0;
1682 want_refresh = 1; 1750 want_refresh = 1;
1683 1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1684#if ENABLE_FRILLS || ISO_14755 1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1685 iso14755buf = 0; 1757 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY 1758# if ENABLE_OVERLAY
1688 scr_overlay_off (); 1759 scr_overlay_off ();
1760# endif
1761 }
1689#endif 1762#endif
1690#if USE_XIM 1763#if USE_XIM
1691 if (Input_Context != NULL) 1764 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1765 XUnsetICFocus (Input_Context);
1693#endif 1766#endif
1694#if CURSOR_BLINK 1767#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1768 if (OPTION (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1769 cursor_blink_ev.stop ();
1697 hidden_cursor = 0; 1770 hidden_cursor = 0;
1698#endif 1771#endif
1699#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
… …
1704 } 1777 }
1705#endif 1778#endif
1706 } 1779 }
1707} 1780}
1708 1781
1709#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1710void 1796void
1711rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1712{ 1798{
1713 SET_R (this); 1799 make_current ();
1714 SET_LOCALE (locale);
1715 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1716 switch (ev.type) 1806 switch (ev.type)
1717 { 1807 {
1718 case PropertyNotify: 1808 case PropertyNotify:
1719 /* 1809 /*
1720 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
… …
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1725 return; 1815 return;
1726 1816
1727 /* FALLTHROUGH */ 1817 /* FALLTHROUGH */
1728 case ReparentNotify: 1818 case ReparentNotify:
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1731 break; 1821 break;
1732 } 1822 }
1823# endif
1733} 1824}
1734#endif 1825#endif
1735 1826
1736void 1827void
1737rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1738{ 1829{
1739 int reportmode = 0, clickintime; 1830 int reportmode = 0, clickintime;
1740 1831
1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1832 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1833
1742 if (!bypass_keystate) 1834 if (!bypass_keystate)
1743 reportmode = !! (priv_modes & PrivMode_mouse_report); 1835 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744 1836
1745 /* 1837 /*
1746 * VT window processing of button press 1838 * VT window processing of button press
1747 */ 1839 */
1748 if (ev.window == vt) 1840 if (ev.window == vt)
1749 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1750#if ISO_14755 1845#if ISO_14755
1751 // 5.4 1846 // 5.4
1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1753 { 1848 {
1754 iso14755_54 (ev.x, ev.y); 1849 iso14755_54 (ev.x, ev.y);
… …
1766#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1767 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1768 { 1863 {
1769 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1770 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1771 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1772 { 1868 {
1773 /* only report double clicks */ 1869 /* only report double clicks */
1774 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1775 mouse_report (ev); 1871 mouse_report (ev);
… …
1807#else 1903#else
1808 selection.rect = false; 1904 selection.rect = false;
1809#endif 1905#endif
1810 1906
1811 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1813 { 1909 {
1814 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1815 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1816 else 1912 else
1817 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
1982 } 2078 }
1983 2079
1984 break; 2080 break;
1985 } 2081 }
1986 } 2082 }
2083
1987 return; 2084 return;
1988 } 2085 }
1989#if MENUBAR
1990 /*
1991 * Menubar window processing of button press
1992 */
1993 if (isMenuBarWindow (ev.window))
1994 menubar_control (ev);
1995#endif
1996} 2086}
1997 2087
1998void 2088void
1999rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2000{ 2090{
… …
2006 2096
2007 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2008 { 2098 {
2009 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2010 scrollbar_show (0); 2100 scrollbar_show (0);
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2012 refresh_type &= ~SMOOTH_REFRESH;
2013#endif
2014 } 2101 }
2015 2102
2016#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2017 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2018 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
2019#endif 2106#endif
2020 2107
2021 if (ev.window == vt) 2108 if (ev.window == vt)
2022 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2023#if ISO_14755 2113#if ISO_14755
2024 // 5.4 2114 // 5.4
2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2026 return; 2116 return;
2027#endif 2117#endif
2118
2028 if (reportmode) 2119 if (reportmode)
2029 { 2120 {
2030 /* mouse report from vt window */ 2121 /* mouse report from vt window */
2031 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
2032 if (ev.button >= 4) 2123 if (ev.button >= 4)
… …
2062 { 2153 {
2063 case Button1: 2154 case Button1:
2064 case Button3: 2155 case Button3:
2065 selection_make (ev.time); 2156 selection_make (ev.time);
2066 break; 2157 break;
2158
2067 case Button2: 2159 case Button2:
2068 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2069 break; 2162 break;
2163
2070#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
2071 case Button4: 2165 case Button4:
2072 case Button5: 2166 case Button5:
2073 { 2167 {
2074 int i; 2168 int i;
… …
2076 2170
2077 v = ev.button == Button4 ? UP : DN; 2171 v = ev.button == Button4 ? UP : DN;
2078 2172
2079 if (ev.state & ShiftMask) 2173 if (ev.state & ShiftMask)
2080 i = 1; 2174 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2175 else if (OPTION (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2176 i = nrow - 1;
2083 else 2177 else
2084 i = 5; 2178 i = 5;
2085 2179
2086# ifdef MOUSE_SLIP_WHEELING 2180# ifdef MOUSE_SLIP_WHEELING
… …
2096 slip_wheel_ev.start (); 2190 slip_wheel_ev.start ();
2097 } 2191 }
2098 else 2192 else
2099 { 2193 {
2100# endif 2194# endif
2101# ifdef JUMP_MOUSE_WHEEL
2102 scr_page (v, i); 2195 scr_page (v, i);
2103 scr_refresh (SMOOTH_REFRESH);
2104 scrollbar_show (1); 2196 scrollbar_show (1);
2105# else
2106 while (i--)
2107 {
2108 scr_page (v, 1);
2109 scr_refresh (SMOOTH_REFRESH);
2110 scrollbar_show (1);
2111 }
2112# endif
2113# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
2114 } 2198 }
2115#endif 2199# endif
2116 } 2200 }
2117 break; 2201 break;
2118#endif 2202#endif
2119 } 2203 }
2120 } 2204 }
2121#ifdef MENUBAR
2122 else if (isMenuBarWindow (ev.window))
2123 menubar_control (ev);
2124#endif
2125} 2205}
2126 2206
2127#ifdef TRANSPARENT 2207#ifdef TRANSPARENT
2128#if TINTING 2208#if TINTING
2129/* taken from aterm-0.4.2 */ 2209/* taken from aterm-0.4.2 */
2130 2210
2131typedef uint32_t RUINT32T; 2211typedef uint32_t RUINT32T;
2132 2212
2133void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2134{ 2214{
2135 int sh_r, sh_g, sh_b; 2215 int sh_r, sh_g, sh_b;
2136 RUINT32T mask_r, mask_g, mask_b; 2216 RUINT32T mask_r, mask_g, mask_b;
2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2140 int i; 2220 int i;
2141 2221
2142 Visual *visual = display->visual; 2222 Visual *visual = term->visual;
2143 2223
2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2145 2225
2146 /* for convenience */ 2226 /* for convenience */
2147 mask_r = visual->red_mask; 2227 mask_r = visual->red_mask;
… …
2368 Atom atype; 2448 Atom atype;
2369 unsigned char *prop = NULL; 2449 unsigned char *prop = NULL;
2370 Window root, oldp, *list; 2450 Window root, oldp, *list;
2371 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
2372 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2374 2453
2375 pchanged = 0; 2454 pchanged = 0;
2376 2455
2377 if (!(options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2378 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2379 2458
2380 XGetWindowAttributes (disp, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2382 2461
2383 XGetWindowAttributes (disp, parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2384 2463
2385 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2386 { 2465 {
2387 if (am_transparent) 2466 if (am_transparent)
2388 { 2467 {
2389 pchanged = 1; 2468 pchanged = 1;
2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2391 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2392 } 2471 }
2393 2472
2394 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2395 } 2474 }
2396 2475
2397 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2398 XSync (disp, False); 2477 XSync (dpy, False);
2399 2478
2400 /* 2479 /*
2401 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2402 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2403 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2404 */ 2483 */
2405 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2408 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2409 2488
2410 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2411 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2414 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2415 2494
2416 if (!i || prop == NULL 2495 if (!i || prop == NULL
2417#if TINTING 2496#if TINTING
2418 || !rs[Rs_color + Color_tint] 2497 || !ISSET_PIXCOLOR (Color_tint)
2419#endif 2498#endif
2420 ) 2499 )
2421 have_pixmap = 0; 2500 have_pixmap = 0;
2422 else 2501 else
2423 { 2502 {
… …
2436 Window cr; 2515 Window cr;
2437 XImage *image; 2516 XImage *image;
2438 GC gc; 2517 GC gc;
2439 XGCValues gcvalue; 2518 XGCValues gcvalue;
2440 2519
2441 XTranslateCoordinates (disp, parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2442 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2443 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2444 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2445 nx = ny = 0; 2524 nx = ny = 0;
2446 2525
… …
2459 } 2538 }
2460 2539
2461 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2462 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2463 2542
2464 XSync (disp, False); 2543 XSync (dpy, False);
2465 allowedxerror = -1; 2544 allowedxerror = -1;
2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2467 2546
2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2469 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2470 allowedxerror = 0; 2549 allowedxerror = 0;
2471 2550
… …
2474 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2475 { 2554 {
2476 pchanged = 1; 2555 pchanged = 1;
2477 if (pixmap != None) 2556 if (pixmap != None)
2478 { 2557 {
2479 XFreePixmap (disp, pixmap); 2558 XFreePixmap (dpy, pixmap);
2480 pixmap = None; 2559 pixmap = None;
2481 } 2560 }
2482 } 2561 }
2483 2562
2484 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2485 } 2564 }
2486 else 2565 else
2487 { 2566 {
2488 if (pixmap != None) 2567 if (pixmap != None)
2489 XFreePixmap (disp, pixmap); 2568 XFreePixmap (dpy, pixmap);
2490 2569
2491#if TINTING 2570#if TINTING
2492 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2493 { 2572 {
2494 unsigned short rm, gm, bm;
2495 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2496 2574
2575 rgba c;
2497 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused [Color_tint].get (c);
2498 2577
2499 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2500 } 2579 }
2501#endif 2580#endif
2502 2581
2503 pixmap = XCreatePixmap (disp, vt, 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2504 szHint.width, szHint.height, image->depth);
2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2506 XPutImage (disp, pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2507 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2508 XFreeGC (disp, gc); 2586 XFreeGC (dpy, gc);
2509 XDestroyImage (image); 2587 XDestroyImage (image);
2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2511 XClearWindow (disp, parent[0]); 2589 XClearWindow (dpy, parent[0]);
2512 2590
2513 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2514 pchanged = 1; 2592 pchanged = 1;
2515 2593
2516 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2517 } 2595 }
2518 } 2596 }
2519 2597
2520 if (am_pixmap_trans) 2598 if (am_pixmap_trans)
2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2522 else 2600 else
2523 { 2601 {
2524 unsigned int n; 2602 unsigned int n;
2525 /* 2603 /*
2526 * InheritPixmap transparency 2604 * InheritPixmap transparency
2527 */ 2605 */
2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2529 { 2607 {
2530 oldp = parent[i]; 2608 oldp = parent[i];
2531 XQueryTree (disp, parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2532 &parent[i], &list, &n);
2533 XFree (list); 2610 XFree (list);
2534 2611
2535 if (parent[i] == display->root) 2612 if (parent[i] == display->root)
2536 { 2613 {
2537 if (oldp != None) 2614 if (oldp != None)
… …
2545 } 2622 }
2546 2623
2547 n = 0; 2624 n = 0;
2548 2625
2549 if (pchanged) 2626 if (pchanged)
2550 {
2551 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2552 { 2628 {
2553 XGetWindowAttributes (disp, parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2555 { 2632 {
2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2557 break; 2634 break;
2558 } 2635 }
2559 } 2636 }
2560 }
2561 2637
2562 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2563 { 2639 {
2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2566 am_transparent = 0; 2642 am_transparent = 0;
2567 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2568 } 2644 }
2569 else 2645 else
2570 { 2646 {
2571#if WAIT_FOR_WM
2572 /* wait (an arbitrary period) for the WM to do its thing
2573 * needed for fvwm2.2.2 (and before?) */
2574 sleep (1);
2575#endif
2576 for (n = 0; n < (unsigned int)i; n++) 2647 for (n = 0; n < (unsigned int)i; n++)
2577 { 2648 {
2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2579 XClearWindow (disp, parent[n]); 2650 XClearWindow (dpy, parent[n]);
2580 } 2651 }
2581 2652
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2583 am_transparent = 1; 2654 am_transparent = 1;
2584 } 2655 }
2585 2656
2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 parent[i] = None; 2658 parent[i] = None;
2588 } 2659 }
2589 2660
2590 if (scrollBar.win) 2661 if (scrollBar.win)
2591 { 2662 {
2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2593 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2594 scrollbar_show (0); 2665 scrollbar_show (0);
2595 } 2666 }
2596 2667
2597 if (am_transparent) 2668 if (am_transparent)
… …
2609 2680
2610bool 2681bool
2611rxvt_term::cmd_parse () 2682rxvt_term::cmd_parse ()
2612{ 2683{
2613 bool flag = false; 2684 bool flag = false;
2614 unicode_t ch = NOCHAR; 2685 wchar_t ch = NOCHAR;
2615 unsigned char *seq_begin; // remember start of esc-sequence here 2686 char *seq_begin; // remember start of esc-sequence here
2616 2687
2617 for (;;) 2688 for (;;)
2618 { 2689 {
2619 if (ch == NOCHAR) 2690 if (ch == NOCHAR)
2620 { 2691 {
2621 seq_begin = cmdbuf_ptr; 2692 seq_begin = cmdbuf_ptr;
2622 ch = next_char (); 2693 ch = next_char ();
2623 }
2624 2694
2625 if (ch == NOCHAR) // TODO: improve 2695 if (ch == NOCHAR)
2626 break; 2696 break;
2697 }
2627 2698
2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2629 { 2700 {
2630 if (!seen_input) 2701 if (!seen_input)
2631 { 2702 {
… …
2640 if (seen_resize && cmd_pid) 2711 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH); 2712 kill (-cmd_pid, SIGWINCH);
2642 } 2713 }
2643 2714
2644 /* Read a text string from the input buffer */ 2715 /* Read a text string from the input buffer */
2645 unicode_t buf[UBUFSIZ]; 2716 wchar_t buf[UBUFSIZ];
2646 bool refreshnow = false; 2717 bool refreshnow = false;
2647 int nlines = 0; 2718 int nlines = 0;
2648 unicode_t *str = buf; 2719 wchar_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ); 2720 wchar_t *eol = str + min (ncol, UBUFSIZ);
2650 2721
2651 for (;;) 2722 for (;;)
2652 { 2723 {
2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2654 break; 2725 break;
… …
2660 if (ch == C0_LF) 2731 if (ch == C0_LF)
2661 nlines++; 2732 nlines++;
2662 2733
2663 refresh_count++; 2734 refresh_count++;
2664 2735
2665 if (!(options & Opt_jumpScroll) 2736 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (nrow - 1))) 2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2738 {
2668 refreshnow = true; 2739 refreshnow = true;
2740 refresh_count = 0;
2669 ch = NOCHAR; 2741 ch = NOCHAR;
2670 break; 2742 break;
2671 } 2743 }
2672 2744
2673 // scr_add_lines only works for nlines <= nrow - 1. 2745 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= nrow - 1) 2746 if (nlines >= nrow - 1)
2675 { 2747 {
2748 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2749 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2676 scr_add_lines (buf, nlines, str - buf); 2750 scr_add_lines (buf, str - buf, nlines);
2751
2677 nlines = 0; 2752 nlines = 0;
2678 str = buf; 2753 str = buf;
2679 eol = str + min (ncol, UBUFSIZ); 2754 eol = str + min (ncol, UBUFSIZ);
2680 } 2755 }
2681 2756
… …
2694 2769
2695 seq_begin = cmdbuf_ptr; 2770 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2771 ch = next_char ();
2697 } 2772 }
2698 2773
2774 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2699 scr_add_lines (buf, nlines, str - buf); 2776 scr_add_lines (buf, str - buf, nlines);
2700 2777
2701 /* 2778 /*
2702 * If there have been a lot of new lines, then update the screen 2779 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2780 * What the heck I'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2781 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2782 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2783 */
2707 if (refreshnow) 2784 if (refreshnow)
2708 { 2785 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2787 refresh_limit++;
2711 else 2788 else
2712 { 2789 {
2713 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2714 scr_refresh (refresh_type); 2792 scr_refresh ();
2793 want_refresh = 1;
2715 } 2794 }
2716 } 2795 }
2717 2796
2718 } 2797 }
2719 else 2798 else
… …
2734 } 2813 }
2735 2814
2736 return flag; 2815 return flag;
2737} 2816}
2738 2817
2739// read the next octet
2740unicode_t
2741rxvt_term::next_octet ()
2742{
2743 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++
2745 : NOCHAR;
2746}
2747
2748// read the next character 2818// read the next character
2749unicode_t 2819wchar_t
2750rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2751{ 2821{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2823 {
2754 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2826 return *cmdbuf_ptr++;
2757 2827
2758 wchar_t wc; 2828 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2830
2761 if (len == (size_t)-2) 2831 if (len == (size_t)-2)
2762 { 2832 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2833 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2834 cmdbuf_ptr = cmdbuf_endp;
2765 break; 2835 break;
2766 } 2836 }
2767 2837
2768 if (len == (size_t)-1) 2838 if (len == (size_t)-1)
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2770 2840
2771 // assume wchar == unicode 2841 // assume wchar == unicode
2772 cmdbuf_ptr += len; 2842 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK; 2843 return wc & UNICODE_MASK;
2774 } 2844 }
2775 2845
2776 return NOCHAR; 2846 return NOCHAR;
2777} 2847}
2848
2849// read the next octet
2850uint32_t
2851rxvt_term::next_octet () NOTHROW
2852{
2853 return cmdbuf_ptr < cmdbuf_endp
2854 ? (unsigned char)*cmdbuf_ptr++
2855 : NOCHAR;
2856}
2857
2858static class out_of_input out_of_input;
2778 2859
2779/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2780/* 2861/*
2781 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2782 * to the command. 2863 * to the command.
2783 */ 2864 */
2784unicode_t 2865wchar_t
2785rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2786{ 2867{
2787 unicode_t c = next_char (); 2868 wchar_t c = next_char ();
2788 2869
2789 if (c == NOCHAR) 2870 if (c == NOCHAR)
2790 throw out_of_input; 2871 throw out_of_input;
2791 2872
2792 return c; 2873 return c;
2793} 2874}
2794 2875
2795unicode_t 2876uint32_t
2796rxvt_term::cmd_get8 () 2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2797{ 2878{
2798 unicode_t c = next_octet (); 2879 uint32_t c = next_octet ();
2799 2880
2800 if (c == NOCHAR) 2881 if (c == NOCHAR)
2801 throw out_of_input; 2882 throw out_of_input;
2802 2883
2803 return c; 2884 return c;
… …
2903 case C0_ESC: 2984 case C0_ESC:
2904 process_escape_seq (); 2985 process_escape_seq ();
2905 break; 2986 break;
2906 case C0_ENQ: /* terminal Status */ 2987 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 2988 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2989 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 2990 else
2911 tt_write ((unsigned char *)VT100_ANS, 2991 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 2992 break;
2914 case C0_BEL: /* bell */ 2993 case C0_BEL: /* bell */
2915 scr_bell (); 2994 scr_bell ();
2916 break; 2995 break;
2917 case C0_BS: /* backspace */ 2996 case C0_BS: /* backspace */
… …
3041 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
3042 break; 3121 break;
3043 case '+': 3122 case '+':
3044 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
3045 break; 3124 break;
3046#if ENABLE_FRILLS 3125#if !ENABLE_MINIMAL
3047 case '6': 3126 case '6':
3048 scr_backindex (); 3127 scr_backindex ();
3049 break; 3128 break;
3050#endif 3129#endif
3051 case '7': 3130 case '7':
3052 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
3053 break; 3132 break;
3054 case '8': 3133 case '8':
3055 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
3056 break; 3135 break;
3057#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3058 case '9': 3137 case '9':
3059 scr_forwardindex (); 3138 scr_forwardindex ();
3060 break; 3139 break;
3061#endif 3140#endif
3062 case '=': 3141 case '=':
… …
3072 break; 3151 break;
3073 3152
3074 /* 8.3.87: NEXT LINE */ 3153 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 3154 case C1_NEL: /* ESC E */
3076 { 3155 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 3156 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 3158 }
3080 break; 3159 break;
3081 3160
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 3161 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 3162 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 3184 process_dcs_seq ();
3106 break; 3185 break;
3107 3186
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 3188 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 3190 break; /* steal obsolete ESC [ c */
3113 3191
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 3193 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 3194 process_csi_seq ();
… …
3225 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
3226 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
3227 if (arg[p] == -1) 3305 if (arg[p] == -1)
3228 arg[p] = ndef; 3306 arg[p] = ndef;
3229 3307
3230#ifdef DEBUG_CMD
3231 fprintf (stderr, "CSI ");
3232 for (p = 0; p < nargs; p++)
3233 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3234 fprintf (stderr, "%c\n", ch);
3235#endif
3236
3237 /* 3308 /*
3238 * private mode handling 3309 * private mode handling
3239 */ 3310 */
3240 if (priv) 3311 if (priv)
3241 { 3312 {
3242 switch (priv) 3313 switch (priv)
3243 { 3314 {
3244 case '>': 3315 case '>':
3245 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
3247 break; 3327 break;
3248 case '?': 3328 case '?':
3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3250 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
3251 break; 3331 break;
… …
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3440 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3441 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3442 break;
3363 3443
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3444 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3445 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 3446 break;
3368 3447
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3448 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 3449 process_sgr_mode (nargs, arg);
3371 break; 3450 break;
… …
3378 break; 3457 break;
3379 case 6: /* CPR requested */ 3458 case 6: /* CPR requested */
3380 scr_report_position (); 3459 scr_report_position ();
3381 break; 3460 break;
3382 case 7: /* unofficial extension */ 3461 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3462 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3463 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3464 break;
3386 case 8: /* unofficial extension */ 3465 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3467 break;
… …
3455 break; 3534 break;
3456 case CSI_75: 3535 case CSI_75:
3457 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3458 break; 3537 break;
3459 3538
3460#if ENABLE_FRILLS 3539#if !ENABLE_MINIMAL
3461 case CSI_74: 3540 case CSI_74:
3462 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3463 break; 3542 break;
3464#endif 3543#endif
3465 3544
… …
3472 break; 3551 break;
3473 } 3552 }
3474} 3553}
3475/*}}} */ 3554/*}}} */
3476 3555
3477#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3478/* ARGSUSED */ 3557/* ARGSUSED */
3479void 3558void
3480rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3481{ 3560{
3482 int x, y; 3561 int x, y;
3483 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3484 Window wdummy; 3563 Window wdummy;
3485 dDisp; 3564
3565 dLocal (Display *, dpy);
3486 3566
3487 if (nargs == 0) 3567 if (nargs == 0)
3488 return; 3568 return;
3489 3569
3490 switch (args[0]) 3570 switch (args[0])
3491 { 3571 {
3492 /* 3572 /*
3493 * commands 3573 * commands
3494 */ 3574 */
3495 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3496 XMapWindow (disp, parent[0]); 3576 XMapWindow (dpy, parent[0]);
3497 break; 3577 break;
3498 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3499 XIconifyWindow (disp, parent[0], display->screen); 3579 XIconifyWindow (dpy, parent[0], display->screen);
3500 break; 3580 break;
3501 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3503 break; 3583 break;
3504 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3586 break;
3507 case 5: /* raise window */ 3587 case 5: /* raise window */
3508 XRaiseWindow (disp, parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3509 break; 3589 break;
3510 case 6: /* lower window */ 3590 case 6: /* lower window */
3511 XLowerWindow (disp, parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3512 break; 3592 break;
3513 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3514 scr_touch (true); 3594 scr_touch (true);
3515 break; 3595 break;
3516 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
… …
3523 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)width, 3604 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * fheight)); 3605 (unsigned int) (args[1] * fheight));
3526 break; 3606 break;
3527 3607
3528
3529 /* 3608 /*
3530 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3531 */ 3610 */
3532 case 11: /* report window state */ 3611 case 11: /* report window state */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3614 break;
3536 case 13: /* report window position */ 3615 case 13: /* report window position */
3537 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3538 XTranslateCoordinates (disp, parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3621 break;
3543 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3625 break;
3547 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3628 break;
… …
3551 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3631 break;
3553 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3554 { 3633 {
3555 char *s; 3634 char *s;
3556 XGetIconName (disp, parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3637 XFree (s);
3559 } 3638 }
3560 break; 3639 break;
3561 case 21: /* report window title */ 3640 case 21: /* report window title */
3562 { 3641 {
3563 char *s; 3642 char *s;
3564 XFetchName (disp, parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3645 XFree (s);
3567 } 3646 }
3568 break; 3647 break;
3569 } 3648 }
3570} 3649}
… …
3573/*----------------------------------------------------------------------*/ 3652/*----------------------------------------------------------------------*/
3574/* 3653/*
3575 * get input up until STRING TERMINATOR (or BEL) 3654 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3655 * ends_how is terminator used. returned input must be free()'d
3577 */ 3656 */
3578unsigned char * 3657char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3658rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3659{
3581 unicode_t ch; 3660 unicode_t ch;
3582 bool seen_esc = false; 3661 bool seen_esc = false;
3583 unsigned int n = 0; 3662 unsigned int n = 0;
… …
3597 seen_esc = true; 3676 seen_esc = true;
3598 continue; 3677 continue;
3599 } 3678 }
3600 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3601 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3602 else if (ch < 0x20) 3683 else if (ch < 0x20)
3603 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3604 3685
3605 seen_esc = false; 3686 seen_esc = false;
3606 3687
3607 if (n >= STRING_MAX - 1) 3688 if (n >= STRING_MAX - 1)
3608 // stop at some sane length 3689 // stop at some sane length
3609 return NULL; 3690 return NULL;
3610 3691
3611 if (ch == C0_SYN)
3612 string[n++] = cmd_get8 ();
3613 else
3614 string[n++] = ch; 3692 string[n++] = ch;
3615 } 3693 }
3616 3694
3617 string[n++] = '\0'; 3695 string[n++] = '\0';
3618 3696
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3698
3621 return (unsigned char *)rxvt_wcstombs (string); 3699 return rxvt_wcstombs (string);
3622} 3700}
3623 3701
3624/*----------------------------------------------------------------------*/ 3702/*----------------------------------------------------------------------*/
3625/* 3703/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3705 */
3628void 3706void
3629rxvt_term::process_dcs_seq () 3707rxvt_term::process_dcs_seq ()
3630{ 3708{
3631 unsigned char *s; 3709 char *s;
3632 unicode_t eh; 3710 unicode_t eh;
3633 3711
3634 /* 3712 /*
3635 * Not handled yet 3713 * Not handled yet
3636 */ 3714 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3733 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3734 arg = arg * 10 + (ch - '0');
3657 3735
3658 if (ch == ';') 3736 if (ch == ';')
3659 { 3737 {
3660 unsigned char *s = get_to_st (eh); 3738 char *s = get_to_st (eh);
3661 3739
3662 if (s) 3740 if (s)
3663 { 3741 {
3664 process_xterm_seq (arg, (char *)s, eh); 3742 process_xterm_seq (arg, s, eh);
3665 free (s); 3743 free (s);
3666 } 3744 }
3667 } 3745 }
3668} 3746}
3669 3747
3670void 3748void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3750{
3673 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3674 { 3752 {
3675 unsigned short r, g, b; 3753 rgba c;
3676 pix_colors_focused[color].get (display, r, g, b); 3754 pix_colors_focused[color].get (c);
3755
3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3678 } 3762 }
3679 else 3763 else
3680 set_window_color (color, str); 3764 set_window_color (color, str);
3681} 3765}
3682 3766
3683/* 3767/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3769 */
3686void 3770void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3772{
3689 int changed = 0;
3690 int color; 3773 int color;
3691 char *buf, *name; 3774 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3693 int saveop = op; 3776 int saveop = op;
3694 dDisp; 3777
3778 dLocal (Display *, dpy);
3695 3779
3696 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3697 switch (op) 3785 switch (op)
3698 { 3786 {
3699 case XTerm_name: 3787 case XTerm_name:
3700 set_title (str); 3788 set_title (str);
3701 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
3715 unsigned long bytes_after; 3803 unsigned long bytes_after;
3716 unsigned char *value = 0; 3804 unsigned char *value = 0;
3717 const char *str = ""; 3805 const char *str = "";
3718 3806
3719 if (prop 3807 if (prop
3720 && XGetWindowProperty (disp, parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3812 && actual_type != None
3725 && actual_format == 8) 3813 && actual_format == 8)
3726 str = (const char *)(value); 3814 str = (const char *)(value);
3727 3815
3728 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3729 3817
3730 XFree (value); 3818 XFree (value);
3731 } 3819 }
3732 else 3820 else
3733 { 3821 {
… …
3737 { 3825 {
3738 *eq = 0; 3826 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3827 set_utf8_property (display->atom (str), eq + 1);
3740 } 3828 }
3741 else 3829 else
3742 XDeleteProperty (disp, parent[0], 3830 XDeleteProperty (dpy, parent[0],
3743 display->atom (str)); 3831 display->atom (str));
3744 } 3832 }
3745 break; 3833 break;
3746 3834
3747 case XTerm_Color: 3835 case XTerm_Color:
… …
3749 { 3837 {
3750 if ((name = strchr (buf, ';')) == NULL) 3838 if ((name = strchr (buf, ';')) == NULL)
3751 break; 3839 break;
3752 3840
3753 *name++ = '\0'; 3841 *name++ = '\0';
3754 color = atoi (buf); 3842 color = atoi (buf) + minCOLOR;
3755 3843
3756 if (color < 0 || color >= TOTAL_COLORS) 3844 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3757 break; 3845 break;
3758 3846
3759 if ((buf = strchr (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
3760 *buf++ = '\0'; 3848 *buf++ = '\0';
3761 3849
3762 if (name[0] == '?' && !name[1]) 3850 process_color_seq (op, color, name, resp);
3763 {
3764 unsigned short r, g, b;
3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3767 }
3768 else
3769 set_window_color (color + minCOLOR, name);
3770 } 3851 }
3771 break; 3852 break;
3772 case XTerm_Color00: 3853 case XTerm_Color00:
3773 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (op, Color_fg, str, resp);
3774 break; 3855 break;
3775 case XTerm_Color01: 3856 case XTerm_Color01:
3776 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (op, Color_bg, str, resp);
3777 break; 3858 break;
3778#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3779 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3780 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (op, Color_cursor, str, resp);
3781 break; 3862 break;
3782#endif 3863#endif
3783 case XTerm_Color_pointer_fg: 3864 case XTerm_Color_pointer_fg:
3784 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3785 break; 3866 break;
3786 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3787 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (op, Color_pointer_bg, str, resp);
3788 break; 3869 break;
3789#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3790 case XTerm_Color_BD:
3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3792 break;
3793 case XTerm_Color_UL:
3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3795 break;
3796 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (op, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3798 break; 3881 break;
3799 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (op, Color_IT, str, resp);
3801 break; 3884 break;
3802#endif 3885#endif
3803#if TRANSPARENT && TINTING 3886#if TRANSPARENT && TINTING
3804 case URxvt_Color_tint: 3887 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3888 process_color_seq (op, Color_tint, str, resp);
3889
3806 check_our_parents (); 3890 check_our_parents ();
3891
3807 if (am_transparent) 3892 if (am_transparent)
3808 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3809 break;
3810#endif
3811 3894
3895 break;
3896#endif
3897
3812 case XTerm_Pixmap: 3898 case Rxvt_Pixmap:
3899 {
3813 if (*str != ';') 3900 if (*str != ';')
3814 { 3901 {
3815#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3816 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3817 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3818#endif
3819 scr_touch (true); 3905 scr_touch (true);
3906#endif
3820 } 3907 }
3908
3909 int changed = 0;
3910
3821 while ((str = strchr (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3822 { 3912 {
3823 str++; 3913 str++;
3824#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3825 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3826#endif 3916#endif
3827 } 3917 }
3828 3918
3829 if (changed) 3919 if (changed)
3830 { 3920 {
3831#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3832 resize_pixmap (); 3922 resize_pixmap ();
3833#endif
3834 scr_touch (true); 3923 scr_touch (true);
3924#endif
3835 } 3925 }
3926 }
3836 break; 3927 break;
3837 3928
3838 case XTerm_restoreFG: 3929 case Rxvt_restoreFG:
3839 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3840 break; 3931 break;
3841 case XTerm_restoreBG: 3932 case Rxvt_restoreBG:
3842 set_window_color (Color_bg, str); 3933 set_window_color (Color_bg, str);
3843 break; 3934 break;
3844 3935
3845 case XTerm_logfile: 3936 case XTerm_logfile:
3846 // TODO, when secure mode? 3937 // TODO, when secure mode?
3847 break; 3938 break;
3848 3939
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0 3940#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3941 case Rxvt_dumpscreen: /* no error notices */
3857 { 3942 {
3858 int fd; 3943 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3944 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3945 {
3861 scr_dump (fd); 3946 scr_dump (fd);
… …
3872 case URxvt_italicFont: 3957 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3958 case URxvt_boldItalicFont:
3874#endif 3959#endif
3875 if (query) 3960 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3961 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3963 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3964 resp);
3880 else 3965 else
3881 { 3966 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3967 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3885 allocated.push_back ((void *)res); 3970 allocated.push_back ((void *)res);
3886 set_fonts (); 3971 set_fonts ();
3887 } 3972 }
3888 break; 3973 break;
3889 3974
3890#if ENABLE_FRILLS 3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
3891 case URxvt_locale: 3984 case URxvt_locale:
3892 if (query) 3985 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 3987 else
3895 { 3988 {
3896 set_locale (str); 3989 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3990 pty->set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3991 init_xlocale ();
3899 } 3992 }
3900 break; 3993 break;
3901 3994
3902 case URxvt_view_up: 3995 case URxvt_view_up:
3903 case URxvt_view_down: 3996 case URxvt_view_down:
3997 {
3904 int lines = atoi (str); 3998 int lines = atoi (str);
3905 3999
3906 if (lines) 4000 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 4001 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 4002 else
3909 {
3910 scr_erase_savelines (); 4003 scr_erase_savelines ();
3911 } 4004 }
3912 4005
4006 break;
4007#endif
4008
4009#if ENABLE_PERL
4010 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4012 ; // no responses yet
3913 break; 4013 break;
3914#endif 4014#endif
3915 } 4015 }
3916} 4016}
3917/*----------------------------------------------------------------------*/ 4017/*----------------------------------------------------------------------*/
… …
3948 return state; 4048 return state;
3949} 4049}
3950 4050
3951/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
3952void 4052void
3953rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3954{ 4054{
3955 unsigned int i, j; 4055 unsigned int i, j;
3956 int state; 4056 int state;
3957 4057
3958 static const struct 4058 static const struct
… …
3969 { 5, PrivMode_rVideo }, 4069 { 5, PrivMode_rVideo },
3970 { 6, PrivMode_relOrigin }, 4070 { 6, PrivMode_relOrigin },
3971 { 7, PrivMode_Autowrap }, 4071 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode 4072 // 8, bi-directional support mode
3973 { 9, PrivMode_MouseX10 }, 4073 { 9, PrivMode_MouseX10 },
3974#ifdef menuBar_esc
3975 { menuBar_esc, PrivMode_menuBar },
3976#endif
3977 // 18, 19 printing-related 4074 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor }, 4075 { 25, PrivMode_VisibleCursor },
3979#ifdef scrollBar_esc 4076#ifdef scrollBar_esc
3980 { scrollBar_esc, PrivMode_scrollBar }, 4077 { scrollBar_esc, PrivMode_scrollBar },
3981#endif 4078#endif
… …
4026 } 4123 }
4027 4124
4028 /* extra handling for values with state unkept */ 4125 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4126 switch (arg[i])
4030 { 4127 {
4128#if ENABLE_STYLES
4129 case 1021:
4130 set_option (Opt_intensityStyles, mode);
4131
4132 scr_touch (true);
4133 break;
4134#endif
4031 case 1048: /* alternative cursor save */ 4135 case 1048: /* alternative cursor save */
4032 case 1049: 4136 case 1049:
4033 if (options & Opt_secondaryScreen) 4137 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4138 if (mode == 0)
4035 scr_cursor (RESTORE); 4139 scr_cursor (RESTORE);
4036 else if (mode == 1) 4140 else if (mode == 1)
4037 scr_cursor (SAVE); 4141 scr_cursor (SAVE);
4038 break; 4142 break;
… …
4053 case 3: /* 80/132 */ 4157 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4158 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 4159 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4160 break;
4057 case 4: /* smooth scrolling */ 4161 case 4: /* smooth scrolling */
4058 if (state)
4059 options &= ~Opt_jumpScroll;
4060 else
4061 options |= Opt_jumpScroll; 4162 set_option (Opt_jumpScroll, !state);
4062 break; 4163 break;
4063 case 5: /* reverse video */ 4164 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4165 scr_rvideo_mode (state);
4065 break; 4166 break;
4066 case 6: /* relative/absolute origins */ 4167 case 6: /* relative/absolute origins */
… …
4072 /* case 8: - auto repeat, can't do on a per window basis */ 4173 /* case 8: - auto repeat, can't do on a per window basis */
4073 case 9: /* X10 mouse reporting */ 4174 case 9: /* X10 mouse reporting */
4074 if (state) /* orthogonal */ 4175 if (state) /* orthogonal */
4075 priv_modes &= ~PrivMode_MouseX11; 4176 priv_modes &= ~PrivMode_MouseX11;
4076 break; 4177 break;
4077#ifdef menuBar_esc
4078 case menuBar_esc:
4079#ifdef MENUBAR
4080 map_menuBar (state);
4081#endif
4082 break;
4083#endif
4084#ifdef scrollBar_esc 4178#ifdef scrollBar_esc
4085 case scrollBar_esc: 4179 case scrollBar_esc:
4086 if (scrollbar_mapping (state)) 4180 if (scrollbar_mapping (state))
4087 { 4181 {
4088 resize_all_windows (0, 0, 0); 4182 resize_all_windows (0, 0, 0);
… …
4107#if 0 4201#if 0
4108 case 1001: 4202 case 1001:
4109 break; /* X11 mouse highlighting */ 4203 break; /* X11 mouse highlighting */
4110#endif 4204#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4205 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state)
4113 options &= ~Opt_scrollTtyOutput;
4114 else
4115 options |= Opt_scrollTtyOutput; 4206 set_option (Opt_scrollTtyOutput, !state);
4116 break; 4207 break;
4117 case 1011: /* scroll to bottom on key press */ 4208 case 1011: /* scroll to bottom on key press */
4118 if (state)
4119 options |= Opt_scrollTtyKeypress; 4209 set_option (Opt_scrollTtyKeypress, state);
4120 else
4121 options &= ~Opt_scrollTtyKeypress;
4122 break; 4210 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4211 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4212 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4213 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4214 scr_erase_screen (2);
4127 scr_change_screen (state); 4215 scr_change_screen (state);
4128 break; 4216 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4217 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4218 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4219 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4220 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4221 scr_erase_screen (2);
4134 break; 4222 break;
4135 default: 4223 default:
4136 break; 4224 break;
… …
4264 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
4265 break; 4353 break;
4266 4354
4267 //case 50: // not variable spacing 4355 //case 50: // not variable spacing
4268 4356
4269#ifndef NO_BRIGHTCOLOR 4357#if !ENABLE_MINIMAL
4270 case 90: 4358 case 90:
4271 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
4272 case 92: 4360 case 92:
4273 case 93: 4361 case 93:
4274 case 94: 4362 case 94:
… …
4286 case 106: 4374 case 106:
4287 case 107: 4375 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4376 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4377 break;
4290#endif 4378#endif
4291
4292 } 4379 }
4293 } 4380 }
4294} 4381}
4295/*}}} */ 4382/*}}} */
4296 4383
… …
4320 */ 4407 */
4321void 4408void
4322rxvt_term::tt_printf (const char *fmt,...) 4409rxvt_term::tt_printf (const char *fmt,...)
4323{ 4410{
4324 va_list arg_ptr; 4411 va_list arg_ptr;
4325 unsigned char buf[256]; 4412 char buf[256];
4326 4413
4327 va_start (arg_ptr, fmt); 4414 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4415 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 4416 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 4417 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 4422 * or generated by us in response to a query ESC sequence.
4336 */ 4423 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 4425
4339void 4426void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 4428{
4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4430 return;
4431
4432 if (pty->pty < 0)
4433 return;
4434
4342 if (v_buflen == 0) 4435 if (v_buflen == 0)
4343 { 4436 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4345 4438
4346 if ((unsigned int)written == len) 4439 if ((unsigned int)written == len)
4347 return; 4440 return;
4348 4441
4349 data += written; 4442 data += written;
4350 len -= written; 4443 len -= written;
4351 } 4444 }
4352 4445
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 4447
4355 memcpy (v_buffer + v_buflen, data, len); 4448 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 4449 v_buflen += len;
4357 4450
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4359} 4452}
4360 4453
4361void rxvt_term::pty_write () 4454void rxvt_term::pty_write ()
4362{ 4455{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364 4457
4365 if (written > 0) 4458 if (written > 0)
4366 { 4459 {
4367 v_buflen -= written; 4460 v_buflen -= written;
4368 4461

Diff Legend

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