ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC

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"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
141 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
147 153
148 text_t t = l.t[x]; 154 text_t t = l.t[x];
149 155
150 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
151 { 157 {
152 iso14755_51 (l.t[x], l.r[x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
154 break; 160 break;
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
189 193
190 char attr[80]; // plenty 194 char attr[80]; // plenty
191 195
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 197 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 198 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 199 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 200 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 201 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 202 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 203 r & RS_Uline ? " uline" : "",
202 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
207 scr_overlay_new (0, -1, width, len + 2); 217 scr_overlay_new (x, y, width, len + 2);
208 218
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 220
211 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
212 { 222 {
215 ch = *chr++; 225 ch = *chr++;
216 226
217 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
220#if !UNICODE3 230# if !UNICODE3
221 if (ch >= 0x10000) 231 if (ch >= 0x10000)
222 ch = 0xfffd; 232 ch = 0xfffd;
223#endif 233# endif
224 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
225 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
226 } 236 }
227 237
228 scr_overlay_set (0, len , attr); 238 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 239 scr_overlay_set (0, len + 1, fname);
230 240
231 free (fname); 241 free (fname);
232 242
233#if ENABLE_COMBINING 243# if ENABLE_COMBINING
234 if (alloc) 244 if (alloc)
235 delete [] alloc; 245 delete [] alloc;
236#endif 246# endif
237} 247}
238#endif 248#endif
239 249
240void 250void
241rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
258 mb[0] = ch[0]; 268 mb[0] = ch[0];
259 len = 1; 269 len = 1;
260 } 270 }
261 271
262 if (len > 0) 272 if (len > 0)
263 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
264 else 274 else
265 scr_bell (); 275 scr_bell ();
266 } 276 }
267 277
268 iso14755buf = 0; 278 iso14755buf = 0;
296 KeySym keysym; 306 KeySym keysym;
297#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
299#endif 309#endif
300 int valid_keysym; 310 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
302 312
303 /* 313 /*
304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
305 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
306 * 316 *
324 Status status_return; 334 Status status_return;
325 335
326#if 0 336#if 0
327#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
328 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
331 else 341 else
332#endif 342#endif
333#endif 343#endif
334 { 344 {
371 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
372 } 382 }
373 else 383 else
374#endif 384#endif
375 { 385 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
378 } 388 }
379 389
380 if (valid_keysym) 390 if (valid_keysym)
381 { 391 {
433 scr_move_to (0, 1); 443 scr_move_to (0, 1);
434 return; 444 return;
435 } 445 }
436 else if (keysym == XK_End) 446 else if (keysym == XK_End)
437 { 447 {
438 scr_move_to (1, 0); 448 scr_move_to (1, 1);
439 return; 449 return;
440 } 450 }
441 } 451 }
442#endif 452#endif
443 } 453 }
845 { 855 {
846#ifdef META8_OPTION 856#ifdef META8_OPTION
847 /* set 8-bit on */ 857 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
849 { 859 {
850 unsigned char *ch; 860 char *ch;
851 861
852 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 863 *ch |= 0x80;
854 864
855 meta = 0; 865 meta = 0;
857#endif 867#endif
858 /* nil */ ; 868 /* nil */ ;
859 } 869 }
860 } 870 }
861 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
862 if (len <= 0) 875 if (len <= 0)
863 return; /* not mapped */ 876 return; /* not mapped */
864 877
865 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 879 if (view_start)
867 { 880 {
868 view_start = 0; 881 view_start = 0;
869 want_refresh = 1; 882 want_refresh = 1;
870 } 883 }
888#ifdef META8_OPTION 901#ifdef META8_OPTION
889 && meta_char == C0_ESC 902 && meta_char == C0_ESC
890#endif 903#endif
891 ) 904 )
892 { 905 {
893 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
894 tt_write (&ch, 1); 907 tt_write (&ch, 1);
895 } 908 }
896 909
897#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
898 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
906#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
907 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
908} 921}
909/*}}} */ 922/*}}} */
910 923
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */
914unsigned int 925unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 927{
917 unsigned int n, s; 928 unsigned int n, s;
918 929
919 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
957 } 968 }
958#endif 969#endif
959 970
960 if (want_refresh) 971 if (want_refresh)
961 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
962 scr_refresh (refresh_type); 1011 scr_refresh ();
963 scrollbar_show (1); 1012 scrollbar_show (1);
964#ifdef USE_XIM 1013#ifdef USE_XIM
965 IMSendSpot (); 1014 IMSendSpot ();
966#endif 1015#endif
967 } 1016 }
970} 1019}
971 1020
972void 1021void
973rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
974{ 1023{
975 SET_R (this); 1024 make_current ();
976 SET_LOCALE (locale);
977 1025
978 display->flush (); 1026 display->flush ();
979 1027
980 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 1030}
983 1031
984void 1032void
985rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
986{ 1034{
987 SET_R (this); 1035 make_current ();
988 SET_LOCALE (locale);
989 1036
990 refresh_limit = 1; 1037 refresh_limit = 1;
991 refresh_count = 0; 1038 refresh_count = 0;
992 flush (); 1039 flush ();
993} 1040}
1021rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1022{ 1069{
1023 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1024 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1025 { 1072 {
1026 refresh_type |= SMOOTH_REFRESH;
1027 want_refresh = 1; 1073 want_refresh = 1;
1028 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1029 } 1075 }
1030} 1076}
1031#endif 1077#endif
1035rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1036{ 1082{
1037 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1038 { 1084 {
1039 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1040 refresh_type |= SMOOTH_REFRESH;
1041 want_refresh = 1; 1086 want_refresh = 1;
1042 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1043 } 1088 }
1044} 1089}
1045#endif 1090#endif
1050{ 1095{
1051 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1053 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1054 { 1099 {
1055 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1056 view_start == 0)
1057 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1058 1102
1059 refresh_type |= SMOOTH_REFRESH;
1060 want_refresh = 1; 1103 want_refresh = 1;
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1105 }
1063} 1106}
1064#endif 1107#endif
1065 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
1066bool 1127bool
1067rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
1068{ 1129{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1131
1071 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1072 { 1133 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1135 n = 0;
1075 } 1136 }
1076 1137
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1080 1141
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1082 1143
1083 if (n > 0) 1144 if (r > 0)
1084 { 1145 {
1085 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
1086 return true; 1147 return true;
1087 } 1148 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1089 { 1157 {
1090 pty_ev.stop (); 1158 pty_ev.stop ();
1091 1159
1092 if (!(options & Opt_hold)) 1160 if (!OPTION (Opt_hold))
1093 destroy (); 1161 destroy ();
1094 } 1162 }
1095 1163
1096 return false; 1164 return false;
1097} 1165}
1098 1166
1099void 1167void
1100rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1101{ 1169{
1102 SET_R (this); 1170 make_current ();
1103 SET_LOCALE (locale);
1104 1171
1105 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1106 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1107 while (pty_fill ()) 1174 while (pty_fill ())
1108 if (cmd_parse ()) 1175 if (cmd_parse ())
1119 recolour_cursor (); 1186 recolour_cursor ();
1120 1187
1121#ifdef POINTER_BLANK 1188#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1189 hidden_pointer = 0;
1123 1190
1124 if (options & Opt_pointerBlank) 1191 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1192 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1193#endif
1127} 1194}
1128 1195
1129#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1130void 1197void
1131rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1132{ 1199{
1133 if (! (options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1134 return; 1201 return;
1135 1202
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1137 XFlush (display->display); 1204 XFlush (display->display);
1138 1205
1140} 1207}
1141 1208
1142void 1209void
1143rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1144{ 1211{
1145 SET_R (this); 1212 make_current ();
1146 SET_LOCALE (locale);
1147 1213
1148 pointer_blank (); 1214 pointer_blank ();
1149} 1215}
1150#endif 1216#endif
1151 1217
1230 1296
1231/*{{{ process an X event */ 1297/*{{{ process an X event */
1232void 1298void
1233rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1234{ 1300{
1301 make_current ();
1302
1235 dDisp; 1303 dDisp;
1236 1304
1237 SET_R (this); 1305 if (ev.xany.window == vt
1238 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1239 1309
1240#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1242 {
1243 if (hidden_cursor)
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1250 }
1251#endif
1252
1253#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1255 {
1256 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease)
1259 if (hidden_pointer)
1260 pointer_unblank ();
1261
1262 if (ev.type == KeyPress && hidden_pointer == 0)
1263 pointer_blank ();
1264 }
1265#endif
1266
1267 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1313 unsigned int unused_mask;
1270 1314
1271 switch (ev.type) 1315 switch (ev.type)
1278 1322
1279 break; 1323 break;
1280 1324
1281 case KeyRelease: 1325 case KeyRelease:
1282 { 1326 {
1283#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1284 KeySym ks; 1328 KeySym keysym;
1285 1329
1286 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1287#endif 1331#endif
1288 1332
1289#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1290 // ISO 14755 support 1334 // ISO 14755 support
1291 if (iso14755buf) 1335 if (iso14755buf)
1296# endif 1340# endif
1297# if ISO_14755 1341# if ISO_14755
1298 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1299 // first: controls 1343 // first: controls
1300 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1301 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1302 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1303 { 1347 {
1304 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1305 commit_iso14755 (); 1349 commit_iso14755 ();
1306 return; // case-break; 1350 goto skip_switch;
1307 } 1351 }
1308 1352
1309 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1310 if (i[0] == ks) 1354 if (i[0] == keysym)
1311 { 1355 {
1312 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1313 commit_iso14755 (); 1357 commit_iso14755 ();
1314 return; // case-break; 1358 goto skip_switch;
1315 } 1359 }
1316 1360
1317 scr_bell (); 1361 scr_bell ();
1318# endif 1362# endif
1319 iso14755buf = 0; 1363 iso14755buf = 0;
1338 else 1382 else
1339 iso14755buf = 0; 1383 iso14755buf = 0;
1340 } 1384 }
1341#endif 1385#endif
1342 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1343#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1344 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1345 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1346 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1347 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1348#endif 1396#endif
1349 break; 1397 break;
1350 } 1398 }
1351 1399
1454 { 1502 {
1455 seen_resize = 1; 1503 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1505 }
1458 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1510 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1511 check_our_parents ();
1462#endif 1512#endif
1463 } 1513 }
1464 break; 1514 break;
1465 1515
1481 1531
1482 case SelectionRequest: 1532 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1484 break; 1534 break;
1485 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1486 case UnmapNotify: 1544 case UnmapNotify:
1487 mapped = 0; 1545 mapped = 0;
1488#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1490#endif 1548#endif
1491 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492
1493 case MapNotify:
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1497#endif
1498 break; 1550 break;
1499 1551
1500#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1501 case ReparentNotify: 1553 case ReparentNotify:
1502 rootwin_cb (ev); 1554 rootwin_cb (ev);
1516 1568
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1520 1572
1521 scr_refresh (refresh_type); 1573 want_refresh = 1;
1522 } 1574 }
1523 else 1575 else
1524 { 1576 {
1525 XEvent unused_event; 1577 XEvent unused_event;
1526 1578
1532 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1533 { 1585 {
1534 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1535 scrollbar_show (0); 1587 scrollbar_show (0);
1536 } 1588 }
1537#ifdef MENUBAR
1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1539 menubar_expose ();
1540#endif
1541 1589
1542#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1543 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1544 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1545#endif 1593#endif
1549 case MotionNotify: 1597 case MotionNotify:
1550#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1599 if (hidden_pointer)
1552 pointer_unblank (); 1600 pointer_unblank ();
1553#endif 1601#endif
1554#if MENUBAR
1555 if (isMenuBarWindow (ev.xany.window))
1556 {
1557 menubar_control (ev.xbutton);
1558 break;
1559 }
1560#endif
1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1603 break;
1563 1604
1564 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1565 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1611 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1569 ; 1613 ;
1570 1614
1571 XQueryPointer (disp, vt, 1615 XQueryPointer (disp, vt,
1651 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1652 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1653 &unused_mask); 1697 &unused_mask);
1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1655 scrollbar_size ()); 1699 scrollbar_size ());
1656 scr_refresh (refresh_type); 1700 want_refresh = 1;
1657 refresh_limit = 0; 1701 refresh_limit = 0;
1658 scrollbar_show (1); 1702 scrollbar_show (1);
1659 } 1703 }
1660 break; 1704 break;
1661 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1662} 1735}
1663 1736
1664void 1737void
1665rxvt_term::focus_in () 1738rxvt_term::focus_in ()
1666{ 1739{
1667 if (!focus) 1740 if (!focus)
1668 { 1741 {
1669 focus = 1; 1742 focus = 1;
1670 want_refresh = 1; 1743 want_refresh = 1;
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1746
1671#if USE_XIM 1747#if USE_XIM
1672 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1673 { 1749 {
1674 IMSetStatusPosition (); 1750 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1751 XSetICFocus (Input_Context);
1676 } 1752 }
1677#endif 1753#endif
1678#if CURSOR_BLINK 1754#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1755 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif 1757#endif
1682#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1684 { 1760 {
1695 if (focus) 1771 if (focus)
1696 { 1772 {
1697 focus = 0; 1773 focus = 0;
1698 want_refresh = 1; 1774 want_refresh = 1;
1699 1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777
1700#if ENABLE_FRILLS || ISO_14755 1778#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf)
1780 {
1701 iso14755buf = 0; 1781 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1782# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1783 scr_overlay_off ();
1784# endif
1785 }
1705#endif 1786#endif
1706#if USE_XIM 1787#if USE_XIM
1707 if (Input_Context != NULL) 1788 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1789 XUnsetICFocus (Input_Context);
1709#endif 1790#endif
1710#if CURSOR_BLINK 1791#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1792 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1793 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1794 hidden_cursor = 0;
1714#endif 1795#endif
1715#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1724 1805
1725#if TRANSPARENT 1806#if TRANSPARENT
1726void 1807void
1727rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1728{ 1809{
1729 SET_R (this); 1810 make_current ();
1730 SET_LOCALE (locale);
1731 1811
1732 switch (ev.type) 1812 switch (ev.type)
1733 { 1813 {
1734 case PropertyNotify: 1814 case PropertyNotify:
1735 /* 1815 /*
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1821 return;
1742 1822
1743 /* FALLTHROUGH */ 1823 /* FALLTHROUGH */
1744 case ReparentNotify: 1824 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1826 want_refresh = want_full_refresh = 1;
1747 break; 1827 break;
1748 } 1828 }
1749} 1829}
1750#endif 1830#endif
1753rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1754{ 1834{
1755 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1756 1836
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1758 if (!bypass_keystate) 1839 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1841
1761 /* 1842 /*
1762 * VT window processing of button press 1843 * VT window processing of button press
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1784 { 1865 {
1785 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1786 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1787 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1788 { 1870 {
1789 /* only report double clicks */ 1871 /* only report double clicks */
1790 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1791 mouse_report (ev); 1873 mouse_report (ev);
1811 else 1893 else
1812 { 1894 {
1813 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1814 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1815 1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 switch (ev.button) 1899 switch (ev.button)
1817 { 1900 {
1818 case Button1: 1901 case Button1:
1819 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1820 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1821#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1822 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1823#else 1906#else
1824 selection.rect = false; 1907 selection.rect = false;
1825#endif 1908#endif
1826 1909
1827 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1829 { 1912 {
1830 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1832 else 1915 else
1833 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1834 } 1917 }
1835 else 1918 else
1836 { 1919 {
1837 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1838 MEvent.clicks++; 1921 MEvent.clicks++;
1839 else 1922 else
1840 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1841 1924
1842 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1843 } 1926 }
1844 1927
1845 MEvent.button = Button1; 1928 MEvent.button = Button1;
1846 break; 1929 break;
1847 1930
1848 case Button3: 1931 case Button3:
1849 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1850 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1851 else 1934 else
1852 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1853 1936
1854 MEvent.button = Button3; 1937 MEvent.button = Button3;
1855 break; 1938 break;
1856 } 1939 }
1857 } 1940 }
1858 1941
1859 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1860 return; 1943 return;
1861 } 1944 }
1862 1945
1998 } 2081 }
1999 2082
2000 break; 2083 break;
2001 } 2084 }
2002 } 2085 }
2086
2003 return; 2087 return;
2004 } 2088 }
2005#if MENUBAR
2006 /*
2007 * Menubar window processing of button press
2008 */
2009 if (isMenuBarWindow (ev.window))
2010 menubar_control (ev);
2011#endif
2012} 2089}
2013 2090
2014void 2091void
2015rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2016{ 2093{
2022 2099
2023 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2024 { 2101 {
2025 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2026 scrollbar_show (0); 2103 scrollbar_show (0);
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 refresh_type &= ~SMOOTH_REFRESH;
2029#endif
2030 } 2104 }
2031 2105
2032#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2033 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2034 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
2072 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2073 && bypass_keystate 2147 && bypass_keystate
2074 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2075 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2076 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2077 switch (ev.button) 2154 switch (ev.button)
2078 { 2155 {
2079 case Button1: 2156 case Button1:
2080 case Button3: 2157 case Button3:
2081 selection_make (ev.time); 2158 selection_make (ev.time);
2092 2169
2093 v = ev.button == Button4 ? UP : DN; 2170 v = ev.button == Button4 ? UP : DN;
2094 2171
2095 if (ev.state & ShiftMask) 2172 if (ev.state & ShiftMask)
2096 i = 1; 2173 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2174 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2175 i = nrow - 1;
2099 else 2176 else
2100 i = 5; 2177 i = 5;
2101 2178
2102# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
2112 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2113 } 2190 }
2114 else 2191 else
2115 { 2192 {
2116# endif 2193# endif
2117# ifdef JUMP_MOUSE_WHEEL
2118 scr_page (v, i); 2194 scr_page (v, i);
2119 scr_refresh (SMOOTH_REFRESH);
2120 scrollbar_show (1); 2195 scrollbar_show (1);
2121# else
2122 while (i--)
2123 {
2124 scr_page (v, 1);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1);
2127 }
2128# endif
2129# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2130 } 2197 }
2131#endif 2198# endif
2132 } 2199 }
2133 break; 2200 break;
2134#endif 2201#endif
2135 } 2202 }
2136 } 2203 }
2137#ifdef MENUBAR
2138 else if (isMenuBarWindow (ev.window))
2139 menubar_control (ev);
2140#endif
2141} 2204}
2142 2205
2143#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2144#if TINTING 2207#if TINTING
2145/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
2388 XWindowAttributes wattr, wrootattr; 2451 XWindowAttributes wattr, wrootattr;
2389 dDisp; 2452 dDisp;
2390 2453
2391 pchanged = 0; 2454 pchanged = 0;
2392 2455
2393 if (!(options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2395 2458
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2398 2461
2625 2688
2626bool 2689bool
2627rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2628{ 2691{
2629 bool flag = false; 2692 bool flag = false;
2630 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2632 2695
2633 for (;;) 2696 for (;;)
2634 { 2697 {
2635 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2636 { 2699 {
2637 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2701 ch = next_char ();
2639 }
2640 2702
2641 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2642 break; 2704 break;
2705 }
2643 2706
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2708 {
2646 if (!seen_input) 2709 if (!seen_input)
2647 { 2710 {
2656 if (seen_resize && cmd_pid) 2719 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2658 } 2721 }
2659 2722
2660 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2725 bool refreshnow = false;
2663 int nlines = 0; 2726 int nlines = 0;
2664 unicode_t *str = buf; 2727 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2729
2667 for (;;) 2730 for (;;)
2668 { 2731 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2733 break;
2676 if (ch == C0_LF) 2739 if (ch == C0_LF)
2677 nlines++; 2740 nlines++;
2678 2741
2679 refresh_count++; 2742 refresh_count++;
2680 2743
2681 if (!(options & Opt_jumpScroll) 2744 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2746 {
2684 refreshnow = true; 2747 refreshnow = true;
2748 refresh_count = 0;
2685 ch = NOCHAR; 2749 ch = NOCHAR;
2686 break; 2750 break;
2687 } 2751 }
2688 2752
2689 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2691 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2692 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2693 nlines = 0; 2760 nlines = 0;
2694 str = buf; 2761 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
2696 } 2763 }
2697 2764
2710 2777
2711 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2779 ch = next_char ();
2713 } 2780 }
2714 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2716 2785
2717 /* 2786 /*
2718 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2719 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2720 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2790 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2791 */
2723 if (refreshnow) 2792 if (refreshnow)
2724 { 2793 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2795 refresh_limit++;
2727 else 2796 else
2728 { 2797 {
2729 flag = true; 2798 flag = true;
2730 scr_refresh (refresh_type); 2799 scr_refresh ();
2800 want_refresh = 1;
2731 } 2801 }
2732 } 2802 }
2733 2803
2734 } 2804 }
2735 else 2805 else
2750 } 2820 }
2751 2821
2752 return flag; 2822 return flag;
2753} 2823}
2754 2824
2755// read the next octet
2756unicode_t
2757rxvt_term::next_octet ()
2758{
2759 return cmdbuf_ptr < cmdbuf_endp
2760 ? *cmdbuf_ptr++
2761 : NOCHAR;
2762}
2763
2764// read the next character 2825// read the next character
2765unicode_t 2826wchar_t
2766rxvt_term::next_char () 2827rxvt_term::next_char ()
2767{ 2828{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2830 {
2770 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2773 2834
2774 wchar_t wc; 2835 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2837
2777 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2778 { 2839 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2842 break;
2782 } 2843 }
2783 2844
2784 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2847
2787 // assume wchar == unicode 2848 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2790 } 2851 }
2791 2852
2792 return NOCHAR; 2853 return NOCHAR;
2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet ()
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2793} 2863}
2794 2864
2795/* rxvt_cmd_getc () - Return next input character */ 2865/* rxvt_cmd_getc () - Return next input character */
2796/* 2866/*
2797 * Return the next input character after first passing any keyboard input 2867 * Return the next input character after first passing any keyboard input
2798 * to the command. 2868 * to the command.
2799 */ 2869 */
2800unicode_t 2870wchar_t
2801rxvt_term::cmd_getc () 2871rxvt_term::cmd_getc ()
2802{ 2872{
2803 unicode_t c = next_char (); 2873 wchar_t c = next_char ();
2804 2874
2805 if (c == NOCHAR) 2875 if (c == NOCHAR)
2806 throw out_of_input; 2876 throw out_of_input;
2807 2877
2808 return c; 2878 return c;
2809} 2879}
2810 2880
2811unicode_t 2881uint32_t
2812rxvt_term::cmd_get8 () 2882rxvt_term::cmd_get8 ()
2813{ 2883{
2814 unicode_t c = next_octet (); 2884 uint32_t c = next_octet ();
2815 2885
2816 if (c == NOCHAR) 2886 if (c == NOCHAR)
2817 throw out_of_input; 2887 throw out_of_input;
2818 2888
2819 return c; 2889 return c;
2919 case C0_ESC: 2989 case C0_ESC:
2920 process_escape_seq (); 2990 process_escape_seq ();
2921 break; 2991 break;
2922 case C0_ENQ: /* terminal Status */ 2992 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 2993 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2994 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 2995 else
2927 tt_write ((unsigned char *)VT100_ANS, 2996 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 2997 break;
2930 case C0_BEL: /* bell */ 2998 case C0_BEL: /* bell */
2931 scr_bell (); 2999 scr_bell ();
2932 break; 3000 break;
2933 case C0_BS: /* backspace */ 3001 case C0_BS: /* backspace */
3088 break; 3156 break;
3089 3157
3090 /* 8.3.87: NEXT LINE */ 3158 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 3159 case C1_NEL: /* ESC E */
3092 { 3160 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 3161 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 3162 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 3163 }
3096 break; 3164 break;
3097 3165
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 3166 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 3167 case C1_ESA: /* ESC G */
3121 process_dcs_seq (); 3189 process_dcs_seq ();
3122 break; 3190 break;
3123 3191
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3192 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3193 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3194 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3195 break; /* steal obsolete ESC [ c */
3129 3196
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3197 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3198 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3199 process_csi_seq ();
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3443 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3444 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3445 break;
3379 3446
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3447 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3448 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3449 break;
3384 3450
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3451 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3452 process_sgr_mode (nargs, arg);
3387 break; 3453 break;
3394 break; 3460 break;
3395 case 6: /* CPR requested */ 3461 case 6: /* CPR requested */
3396 scr_report_position (); 3462 scr_report_position ();
3397 break; 3463 break;
3398 case 7: /* unofficial extension */ 3464 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3465 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3466 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3467 break;
3402 case 8: /* unofficial extension */ 3468 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3470 break;
3568 break; 3634 break;
3569 case 20: /* report icon label */ 3635 case 20: /* report icon label */
3570 { 3636 {
3571 char *s; 3637 char *s;
3572 XGetIconName (disp, parent[0], &s); 3638 XGetIconName (disp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3639 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3640 XFree (s);
3575 } 3641 }
3576 break; 3642 break;
3577 case 21: /* report window title */ 3643 case 21: /* report window title */
3578 { 3644 {
3579 char *s; 3645 char *s;
3580 XFetchName (disp, parent[0], &s); 3646 XFetchName (disp, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3647 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3648 XFree (s);
3583 } 3649 }
3584 break; 3650 break;
3585 } 3651 }
3586} 3652}
3589/*----------------------------------------------------------------------*/ 3655/*----------------------------------------------------------------------*/
3590/* 3656/*
3591 * get input up until STRING TERMINATOR (or BEL) 3657 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3658 * ends_how is terminator used. returned input must be free()'d
3593 */ 3659 */
3594unsigned char * 3660char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3661rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3662{
3597 unicode_t ch; 3663 unicode_t ch;
3598 bool seen_esc = false; 3664 bool seen_esc = false;
3599 unsigned int n = 0; 3665 unsigned int n = 0;
3632 3698
3633 string[n++] = '\0'; 3699 string[n++] = '\0';
3634 3700
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3702
3637 return (unsigned char *)rxvt_wcstombs (string); 3703 return rxvt_wcstombs (string);
3638} 3704}
3639 3705
3640/*----------------------------------------------------------------------*/ 3706/*----------------------------------------------------------------------*/
3641/* 3707/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3708 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3709 */
3644void 3710void
3645rxvt_term::process_dcs_seq () 3711rxvt_term::process_dcs_seq ()
3646{ 3712{
3647 unsigned char *s; 3713 char *s;
3648 unicode_t eh; 3714 unicode_t eh;
3649 3715
3650 /* 3716 /*
3651 * Not handled yet 3717 * Not handled yet
3652 */ 3718 */
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3737 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3738 arg = arg * 10 + (ch - '0');
3673 3739
3674 if (ch == ';') 3740 if (ch == ';')
3675 { 3741 {
3676 unsigned char *s = get_to_st (eh); 3742 char *s = get_to_st (eh);
3677 3743
3678 if (s) 3744 if (s)
3679 { 3745 {
3680 process_xterm_seq (arg, (char *)s, eh); 3746 process_xterm_seq (arg, s, eh);
3681 free (s); 3747 free (s);
3682 } 3748 }
3683 } 3749 }
3684} 3750}
3685 3751
3686void 3752void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3754{
3689 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3690 { 3756 {
3691 unsigned short r, g, b; 3757 unsigned short r, g, b;
3692 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (display, r, g, b);
3698 3764
3699/* 3765/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3767 */
3702void 3768void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3770{
3705 int changed = 0;
3706 int color; 3771 int color;
3707 char *buf, *name; 3772 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3709 int saveop = op; 3774 int saveop = op;
3710 dDisp; 3775 dDisp;
3765 { 3830 {
3766 if ((name = strchr (buf, ';')) == NULL) 3831 if ((name = strchr (buf, ';')) == NULL)
3767 break; 3832 break;
3768 3833
3769 *name++ = '\0'; 3834 *name++ = '\0';
3770 color = atoi (buf); 3835 color = atoi (buf) + minCOLOR;
3771 3836
3772 if (color < 0 || color >= TOTAL_COLORS) 3837 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3773 break; 3838 break;
3774 3839
3775 if ((buf = strchr (name, ';')) != NULL) 3840 if ((buf = strchr (name, ';')) != NULL)
3776 *buf++ = '\0'; 3841 *buf++ = '\0';
3777 3842
3778 if (name[0] == '?' && !name[1]) 3843 if (name[0] == '?' && !name[1])
3779 { 3844 {
3780 unsigned short r, g, b; 3845 unsigned short r, g, b;
3781 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3846 pix_colors_focused[color].get (display, r, g, b);
3782 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3783 } 3848 }
3784 else 3849 else
3785 set_window_color (color + minCOLOR, name); 3850 set_window_color (color, name);
3786 } 3851 }
3787 break; 3852 break;
3788 case XTerm_Color00: 3853 case XTerm_Color00:
3789 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3790 break; 3855 break;
3791 case XTerm_Color01: 3856 case XTerm_Color01:
3792 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3793 break; 3858 break;
3794#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3795 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3796 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3797 break; 3862 break;
3801 break; 3866 break;
3802 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3803 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3804 break; 3869 break;
3805#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3806 case XTerm_Color_BD:
3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3808 break;
3809 case XTerm_Color_UL:
3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3811 break;
3812 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (XTerm_Color_RV, 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);
3814 break; 3881 break;
3815 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3817 break; 3884 break;
3818#endif 3885#endif
3823 if (am_transparent) 3890 if (am_transparent)
3824 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3825 break; 3892 break;
3826#endif 3893#endif
3827 3894
3828 case XTerm_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3829 if (*str != ';') 3897 if (*str != ';')
3830 { 3898 {
3831#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3832 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3833 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3834#endif
3835 scr_touch (true); 3902 scr_touch (true);
3903#endif
3836 } 3904 }
3905
3906 int changed = 0;
3907
3837 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3838 { 3909 {
3839 str++; 3910 str++;
3840#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3841 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3842#endif 3913#endif
3843 } 3914 }
3844 3915
3845 if (changed) 3916 if (changed)
3846 { 3917 {
3847#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3848 resize_pixmap (); 3919 resize_pixmap ();
3849#endif
3850 scr_touch (true); 3920 scr_touch (true);
3921#endif
3851 } 3922 }
3923 }
3852 break; 3924 break;
3853 3925
3854 case XTerm_restoreFG: 3926 case Rxvt_restoreFG:
3855 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3856 break; 3928 break;
3857 case XTerm_restoreBG: 3929 case Rxvt_restoreBG:
3858 set_window_color (Color_bg, str); 3930 set_window_color (Color_bg, str);
3859 break; 3931 break;
3860 3932
3861 case XTerm_logfile: 3933 case XTerm_logfile:
3862 // TODO, when secure mode? 3934 // TODO, when secure mode?
3863 break; 3935 break;
3864 3936
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0 3937#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3938 case Rxvt_dumpscreen: /* no error notices */
3873 { 3939 {
3874 int fd; 3940 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3941 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 { 3942 {
3877 scr_dump (fd); 3943 scr_dump (fd);
3888 case URxvt_italicFont: 3954 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3955 case URxvt_boldItalicFont:
3890#endif 3956#endif
3891 if (query) 3957 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3958 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3959 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3960 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3961 resp);
3896 else 3962 else
3897 { 3963 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3964 const char *&res = rs[Rs_font + (op - URxvt_font)];
3904 break; 3970 break;
3905 3971
3906#if ENABLE_FRILLS 3972#if ENABLE_FRILLS
3907 case URxvt_locale: 3973 case URxvt_locale:
3908 if (query) 3974 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3976 else
3911 { 3977 {
3912 set_locale (str); 3978 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3979 pty->set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3980 init_xlocale ();
3915 } 3981 }
3916 break; 3982 break;
3917 3983
3918 case URxvt_view_up: 3984 case URxvt_view_up:
3919 case URxvt_view_down: 3985 case URxvt_view_down:
3986 {
3920 int lines = atoi (str); 3987 int lines = atoi (str);
3921 3988
3922 if (lines) 3989 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 3990 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 3991 else
3925 {
3926 scr_erase_savelines (); 3992 scr_erase_savelines ();
3927 } 3993 }
3928 3994
3995 break;
3996#endif
3997
3998#if ENABLE_PERL
3999 case URxvt_perl:
4000 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4001 ; // no responses yet
3929 break; 4002 break;
3930#endif 4003#endif
3931 } 4004 }
3932} 4005}
3933/*----------------------------------------------------------------------*/ 4006/*----------------------------------------------------------------------*/
3985 { 5, PrivMode_rVideo }, 4058 { 5, PrivMode_rVideo },
3986 { 6, PrivMode_relOrigin }, 4059 { 6, PrivMode_relOrigin },
3987 { 7, PrivMode_Autowrap }, 4060 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode 4061 // 8, bi-directional support mode
3989 { 9, PrivMode_MouseX10 }, 4062 { 9, PrivMode_MouseX10 },
3990#ifdef menuBar_esc
3991 { menuBar_esc, PrivMode_menuBar },
3992#endif
3993 // 18, 19 printing-related 4063 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor }, 4064 { 25, PrivMode_VisibleCursor },
3995#ifdef scrollBar_esc 4065#ifdef scrollBar_esc
3996 { scrollBar_esc, PrivMode_scrollBar }, 4066 { scrollBar_esc, PrivMode_scrollBar },
3997#endif 4067#endif
4042 } 4112 }
4043 4113
4044 /* extra handling for values with state unkept */ 4114 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4115 switch (arg[i])
4046 { 4116 {
4117#if ENABLE_STYLES
4118 case 1021:
4119 set_option (Opt_intensityStyles, mode);
4120
4121 scr_touch (true);
4122 break;
4123#endif
4047 case 1048: /* alternative cursor save */ 4124 case 1048: /* alternative cursor save */
4048 case 1049: 4125 case 1049:
4049 if (options & Opt_secondaryScreen) 4126 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4127 if (mode == 0)
4051 scr_cursor (RESTORE); 4128 scr_cursor (RESTORE);
4052 else if (mode == 1) 4129 else if (mode == 1)
4053 scr_cursor (SAVE); 4130 scr_cursor (SAVE);
4054 break; 4131 break;
4069 case 3: /* 80/132 */ 4146 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4147 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4148 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4149 break;
4073 case 4: /* smooth scrolling */ 4150 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 4151 set_option (Opt_jumpScroll, !state);
4078 break; 4152 break;
4079 case 5: /* reverse video */ 4153 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4154 scr_rvideo_mode (state);
4081 break; 4155 break;
4082 case 6: /* relative/absolute origins */ 4156 case 6: /* relative/absolute origins */
4088 /* case 8: - auto repeat, can't do on a per window basis */ 4162 /* case 8: - auto repeat, can't do on a per window basis */
4089 case 9: /* X10 mouse reporting */ 4163 case 9: /* X10 mouse reporting */
4090 if (state) /* orthogonal */ 4164 if (state) /* orthogonal */
4091 priv_modes &= ~PrivMode_MouseX11; 4165 priv_modes &= ~PrivMode_MouseX11;
4092 break; 4166 break;
4093#ifdef menuBar_esc
4094 case menuBar_esc:
4095#ifdef MENUBAR
4096 map_menuBar (state);
4097#endif
4098 break;
4099#endif
4100#ifdef scrollBar_esc 4167#ifdef scrollBar_esc
4101 case scrollBar_esc: 4168 case scrollBar_esc:
4102 if (scrollbar_mapping (state)) 4169 if (scrollbar_mapping (state))
4103 { 4170 {
4104 resize_all_windows (0, 0, 0); 4171 resize_all_windows (0, 0, 0);
4123#if 0 4190#if 0
4124 case 1001: 4191 case 1001:
4125 break; /* X11 mouse highlighting */ 4192 break; /* X11 mouse highlighting */
4126#endif 4193#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4194 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 4195 set_option (Opt_scrollTtyOutput, !state);
4132 break; 4196 break;
4133 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 4198 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 4199 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4200 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4201 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4203 scr_erase_screen (2);
4143 scr_change_screen (state); 4204 scr_change_screen (state);
4144 break; 4205 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4206 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4207 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4208 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4209 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4210 scr_erase_screen (2);
4150 break; 4211 break;
4151 default: 4212 default:
4152 break; 4213 break;
4280 scr_color (Color_bg, Color_bg); 4341 scr_color (Color_bg, Color_bg);
4281 break; 4342 break;
4282 4343
4283 //case 50: // not variable spacing 4344 //case 50: // not variable spacing
4284 4345
4285#ifndef NO_BRIGHTCOLOR 4346#if ENABLE_FRILLS
4286 case 90: 4347 case 90:
4287 case 91: /* set bright fg color */ 4348 case 91: /* set bright fg color */
4288 case 92: 4349 case 92:
4289 case 93: 4350 case 93:
4290 case 94: 4351 case 94:
4302 case 106: 4363 case 106:
4303 case 107: 4364 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4365 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4366 break;
4306#endif 4367#endif
4307
4308 } 4368 }
4309 } 4369 }
4310} 4370}
4311/*}}} */ 4371/*}}} */
4312 4372
4336 */ 4396 */
4337void 4397void
4338rxvt_term::tt_printf (const char *fmt,...) 4398rxvt_term::tt_printf (const char *fmt,...)
4339{ 4399{
4340 va_list arg_ptr; 4400 va_list arg_ptr;
4341 unsigned char buf[256]; 4401 char buf[256];
4342 4402
4343 va_start (arg_ptr, fmt); 4403 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4404 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4405 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4406 tt_write (buf, strlen (buf));
4351 * or generated by us in response to a query ESC sequence. 4411 * or generated by us in response to a query ESC sequence.
4352 */ 4412 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4413const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4414
4355void 4415void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4417{
4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4419 return;
4420
4421 if (pty->pty < 0)
4422 return;
4423
4358 if (v_buflen == 0) 4424 if (v_buflen == 0)
4359 { 4425 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4361 4427
4362 if ((unsigned int)written == len) 4428 if ((unsigned int)written == len)
4363 return; 4429 return;
4364 4430
4365 data += written; 4431 data += written;
4366 len -= written; 4432 len -= written;
4367 } 4433 }
4368 4434
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4435 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4436
4371 memcpy (v_buffer + v_buflen, data, len); 4437 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4438 v_buflen += len;
4373 4439
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4375} 4441}
4376 4442
4377void rxvt_term::pty_write () 4443void rxvt_term::pty_write ()
4378{ 4444{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380 4446
4381 if (written > 0) 4447 if (written > 0)
4382 { 4448 {
4383 v_buflen -= written; 4449 v_buflen -= written;
4384 4450

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines