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.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.256 by root, Wed Jan 11 05:14:26 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
… …
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
136{ 142{
137 x = Pixel2Col (x); 143 x = Pixel2Col (x);
138 y = Pixel2Row (y); 144 y = Pixel2Row (y);
139 145
140 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
147 155
148 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
149 { 157 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
153 break; 160 break;
154 } 161 }
155 162
156 x--; 163 x--;
157 } 164 }
158
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; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
175 fname = rxvt_utf8towcs (f->name);
176
171#if ENABLE_COMBINING 177# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
173 { 179 {
174 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
177 } 183 }
178 else 184 else
179#endif 185# endif
180 { 186 {
181 ch2 = ch; 187 ch2 = ch;
182 188
183 alloc = 0; 189 alloc = 0;
184 chr = &ch2; 190 chr = &ch2;
185 len = 1; 191 len = 1;
186 } 192 }
187 193
188 int width = strlen (f->name); 194 char attr[80]; // plenty
189 195
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
191 218
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 220
194 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
195 { 222 {
… …
198 ch = *chr++; 225 ch = *chr++;
199 226
200 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
203#if !UNICODE3 230# if !UNICODE3
204 if (ch >= 0x10000) 231 if (ch >= 0x10000)
205 ch = 0xfffd; 232 ch = 0xfffd;
206#endif 233# endif
207 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
209 } 236 }
210 237
238 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
212 240
241 free (fname);
242
213#if ENABLE_COMBINING 243# if ENABLE_COMBINING
214 if (alloc) 244 if (alloc)
215 delete [] alloc; 245 delete [] alloc;
216#endif 246# endif
217} 247}
218#endif 248#endif
219 249
220void 250void
221rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
238 mb[0] = ch[0]; 268 mb[0] = ch[0];
239 len = 1; 269 len = 1;
240 } 270 }
241 271
242 if (len > 0) 272 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
244 else 274 else
245 scr_bell (); 275 scr_bell ();
246 } 276 }
247 277
248 iso14755buf = 0; 278 iso14755buf = 0;
… …
276 KeySym keysym; 306 KeySym keysym;
277#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
279#endif 309#endif
280 int valid_keysym; 310 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
282 312
283 /* 313 /*
284 * 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
285 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
286 * 316 *
… …
304 Status status_return; 334 Status status_return;
305 335
306#if 0 336#if 0
307#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
308 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
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
311 else 341 else
312#endif 342#endif
313#endif 343#endif
314 { 344 {
… …
316 346
317 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
321 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
324 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 357 SET_LOCALE (locale);
326 358
327 if (status_return == XLookupChars 359 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
350 } 382 }
351 else 383 else
352#endif 384#endif
353 { 385 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
356 } 388 }
357 389
358 if (valid_keysym) 390 if (valid_keysym)
359 { 391 {
360#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 394 return;
363#endif 395#endif
364 396
365 if (TermWin.saveLines) 397 if (saveLines)
366 { 398 {
367#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 400 if (!ctrl && !meta)
369#else 401#else
370 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
371#endif 403#endif
372 { 404 {
373 int lnsppg; 405 int lnsppg;
374 406
375#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 409#else
378 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
379#endif 411#endif
380 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
381 { 413 {
382 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
383 return; 415 return;
… …
823 { 855 {
824#ifdef META8_OPTION 856#ifdef META8_OPTION
825 /* set 8-bit on */ 857 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
827 { 859 {
828 unsigned char *ch; 860 char *ch;
829 861
830 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 863 *ch |= 0x80;
832 864
833 meta = 0; 865 meta = 0;
… …
835#endif 867#endif
836 /* nil */ ; 868 /* nil */ ;
837 } 869 }
838 } 870 }
839 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
840 if (len <= 0) 875 if (len <= 0)
841 return; /* not mapped */ 876 return; /* not mapped */
842 877
843 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 879 if (view_start)
845 { 880 {
846 TermWin.view_start = 0; 881 view_start = 0;
847 want_refresh = 1; 882 want_refresh = 1;
848 } 883 }
849 884
850 /* 885 /*
851 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 901#ifdef META8_OPTION
867 && meta_char == C0_ESC 902 && meta_char == C0_ESC
868#endif 903#endif
869 ) 904 )
870 { 905 {
871 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
872 tt_write (&ch, 1); 907 tt_write (&ch, 1);
873 } 908 }
874 909
875#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
888 923
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
892unsigned int 927unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 929{
895 unsigned int n, s; 930 unsigned int n, s;
896 931
897 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 970 }
936#endif 971#endif
937 972
938 if (want_refresh) 973 if (want_refresh)
939 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
940 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
941 scrollbar_show (1); 1014 scrollbar_show (1);
942#ifdef USE_XIM 1015#ifdef USE_XIM
943 IMSendSpot (); 1016 IMSendSpot ();
944#endif 1017#endif
… …
954 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
955 1028
956 display->flush (); 1029 display->flush ();
957 1030
958 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1033}
961 1034
962void 1035void
963rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
964{ 1037{
… …
1028{ 1101{
1029 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1105 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1106 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1107 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1108 mouse_slip_wheel_speed = 0;
1036 1109
1037 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1111 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1113 }
1041} 1114}
1042#endif 1115#endif
1043 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1044bool 1135bool
1045rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1046{ 1137{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1139
1049 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1050 { 1141 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1143 n = 0;
1053 } 1144 }
1054 1145
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1058 1149
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1151
1061 if (n > 0) 1152 if (r > 0)
1062 { 1153 {
1063 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1064 return true; 1155 return true;
1065 } 1156 }
1066 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
1067 destroy (); 1169 destroy ();
1170 }
1068 1171
1069 return false; 1172 return false;
1070} 1173}
1071 1174
1072void 1175void
… …
1086} 1189}
1087 1190
1088void 1191void
1089rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
1090{ 1193{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1195 recolour_cursor ();
1093 1196
1094#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1198 hidden_pointer = 0;
1096 1199
1097 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1202#endif
1100} 1203}
1101 1204
1102#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1103void 1206void
1104rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1105{ 1208{
1106 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1107 return; 1210 return;
1108 1211
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1213 XFlush (display->display);
1111 1214
1112 hidden_pointer = 1; 1215 hidden_pointer = 1;
1113} 1216}
1114 1217
… …
1208 dDisp; 1311 dDisp;
1209 1312
1210 SET_R (this); 1313 SET_R (this);
1211 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1212 1315
1213#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1215 {
1216 if (hidden_cursor)
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 }
1224#endif
1225
1226#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1228 {
1229 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease)
1232 if (hidden_pointer)
1233 pointer_unblank ();
1234
1235 if (ev.type == KeyPress && hidden_pointer == 0)
1236 pointer_blank ();
1237 }
1238#endif
1239
1240 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1318 unsigned int unused_mask;
1243 1319
1244 switch (ev.type) 1320 switch (ev.type)
… …
1251 1327
1252 break; 1328 break;
1253 1329
1254 case KeyRelease: 1330 case KeyRelease:
1255 { 1331 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1257 KeySym ks; 1333 KeySym keysym;
1258 1334
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif 1336#endif
1261 1337
1262#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support 1339 // ISO 14755 support
1264 if (iso14755buf) 1340 if (iso14755buf)
… …
1269# endif 1345# endif
1270# if ISO_14755 1346# if ISO_14755
1271 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1272 // first: controls 1348 // first: controls
1273 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1276 { 1352 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1278 commit_iso14755 (); 1354 commit_iso14755 ();
1279 return; // case-break; 1355 goto skip_switch;
1280 } 1356 }
1281 1357
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks) 1359 if (i[0] == keysym)
1284 { 1360 {
1285 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 (); 1362 commit_iso14755 ();
1287 return; // case-break; 1363 goto skip_switch;
1288 } 1364 }
1289 1365
1290 scr_bell (); 1366 scr_bell ();
1291# endif 1367# endif
1292 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1311 else 1387 else
1312 iso14755buf = 0; 1388 iso14755buf = 0;
1313 } 1389 }
1314#endif 1390#endif
1315 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1320 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1321#endif 1401#endif
1322 break; 1402 break;
1323 } 1403 }
1324 1404
… …
1416 case FocusOut: 1496 case FocusOut:
1417 focus_out (); 1497 focus_out ();
1418 break; 1498 break;
1419 1499
1420 case ConfigureNotify: 1500 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1501 if (ev.xconfigure.window == parent[0])
1422 { 1502 {
1423 int height, width;
1424
1425 do
1426 { /* Wrap lots of configures into one */
1427 width = ev.xconfigure.width;
1428 height = ev.xconfigure.height;
1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430 }
1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ;
1432 1505
1433 if (szHint.width != width || szHint.height != height) 1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1507 {
1435 seen_resize = 1; 1508 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1510 }
1438 1511
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1513 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1514 check_our_parents ();
1442#endif 1515#endif
1443 } 1516 }
1444 break; 1517 break;
1445 1518
… …
1461 1534
1462 case SelectionRequest: 1535 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1464 break; 1537 break;
1465 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1466 case UnmapNotify: 1547 case UnmapNotify:
1467 TermWin.mapped = 0; 1548 mapped = 0;
1468#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1470#endif 1551#endif
1471 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 TermWin.mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1553 break;
1479 1554
1480#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1481 case ReparentNotify: 1556 case ReparentNotify:
1482 rootwin_cb (ev); 1557 rootwin_cb (ev);
1483 break; 1558 break;
1484#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1485 1560
1486 case GraphicsExpose: 1561 case GraphicsExpose:
1487 case Expose: 1562 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1489 { 1564 {
1490 do 1565 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1569
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1571
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1500 1575
1501 scr_refresh (refresh_type); 1576 want_refresh = 1;
1502 } 1577 }
1503 else 1578 else
1504 { 1579 {
1505 XEvent unused_event; 1580 XEvent unused_event;
1506 1581
… …
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose (); 1594 menubar_expose ();
1520#endif 1595#endif
1521 1596
1522#ifdef TRANSPARENT 1597#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1598 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1599 XClearWindow (disp, ev.xany.window);
1525#endif 1600#endif
1526 } 1601 }
1527 break; 1602 break;
1528 1603
… …
1539 } 1614 }
1540#endif 1615#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1617 break;
1543 1618
1544 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1545 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1624 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1626 ;
1550 1627
1551 XQueryPointer (disp, TermWin.vt, 1628 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1632 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
… …
1568#endif 1645#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1646 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1647 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1648
1572#ifdef SELECTION_SCROLLING 1649#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1650 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1651 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1652 {
1576 int dist; 1653 int dist;
1577 1654
1578 /* don't clobber the current delay if we are 1655 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1656 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1664 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1665 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1666 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1667
1591 /* calc number of lines to scroll */ 1668 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1669 if (ev.xbutton.y < int_bwidth)
1593 { 1670 {
1594 scroll_selection_dir = UP; 1671 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1672 dist = int_bwidth - ev.xbutton.y;
1596 } 1673 }
1597 else 1674 else
1598 { 1675 {
1599 scroll_selection_dir = DN; 1676 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1677 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1678 }
1602 1679
1603 scroll_selection_lines = Pixel2Height (dist) 1680 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1681 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1682 + 1;
1606 MIN_IT (scroll_selection_lines, 1683 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1684 SELECTION_SCROLL_MAX_LINES);
1608 } 1685 }
1609 else 1686 else
1610 { 1687 {
1611 /* we are within the text window, so we 1688 /* we are within the text window, so we
… …
1631 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1710 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1712 scrollbar_size ());
1636 scr_refresh (refresh_type); 1713 want_refresh = 1;
1637 refresh_limit = 0; 1714 refresh_limit = 0;
1638 scrollbar_show (1); 1715 scrollbar_show (1);
1639 } 1716 }
1640 break; 1717 break;
1641 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1642} 1748}
1643 1749
1644void 1750void
1645rxvt_term::focus_in () 1751rxvt_term::focus_in ()
1646{ 1752{
1647 if (!TermWin.focus) 1753 if (!focus)
1648 { 1754 {
1649 TermWin.focus = 1; 1755 focus = 1;
1650 want_refresh = 1; 1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1651#ifdef USE_XIM 1760#if USE_XIM
1652 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1653 { 1762 {
1654 IMSetStatusPosition (); 1763 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1656 } 1765 }
1657#endif 1766#endif
1658#ifdef CURSOR_BLINK 1767#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1768 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1770#endif
1662#ifdef OFF_FOCUS_FADING 1771#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1772 if (rs[Rs_fade])
1664 { 1773 {
1665 pix_colors = pix_colors_focused; 1774 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1775 scr_recolour ();
1667 } 1776 }
… …
1670} 1779}
1671 1780
1672void 1781void
1673rxvt_term::focus_out () 1782rxvt_term::focus_out ()
1674{ 1783{
1675 if (TermWin.focus) 1784 if (focus)
1676 { 1785 {
1677 TermWin.focus = 0; 1786 focus = 0;
1678 want_refresh = 1; 1787 want_refresh = 1;
1679 1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1680#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1681 iso14755buf = 0; 1794 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1795# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1796 scr_overlay_off ();
1685#endif 1797# endif
1798 }
1799#endif
1686#ifdef USE_XIM 1800#if USE_XIM
1687 if (Input_Context != NULL) 1801 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1689#endif 1803#endif
1690#ifdef CURSOR_BLINK 1804#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1805 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1806 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1807 hidden_cursor = 0;
1694#endif 1808#endif
1695#ifdef OFF_FOCUS_FADING 1809#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1810 if (rs[Rs_fade])
1697 { 1811 {
1698 pix_colors = pix_colors_unfocused; 1812 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1813 scr_recolour ();
1700 } 1814 }
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1835 return;
1722 1836
1723 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1724 case ReparentNotify: 1838 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1727 break; 1841 break;
1728 } 1842 }
1729} 1843}
1730#endif 1844#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1734{ 1848{
1735 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1736 1850
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1738 if (!bypass_keystate) 1853 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1855
1741 /* 1856 /*
1742 * VT window processing of button press 1857 * VT window processing of button press
1743 */ 1858 */
1744 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1745 { 1860 {
1746#if ISO_14755 1861#if ISO_14755
1747 // 5.4 1862 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1864 {
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1764 { 1879 {
1765 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1766 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1767 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1768 { 1884 {
1769 /* only report double clicks */ 1885 /* only report double clicks */
1770 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1771 mouse_report (ev); 1887 mouse_report (ev);
… …
1791 else 1907 else
1792 { 1908 {
1793 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1795 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1913 switch (ev.button)
1797 { 1914 {
1798 case Button1: 1915 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1920#else
1804 selection.rect = false; 1921 selection.rect = false;
1805#endif 1922#endif
1806 1923
1807 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1809 { 1926 {
1810 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1812 else 1929 else
1813 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1814 } 1931 }
1815 else 1932 else
1816 { 1933 {
1817 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1935 MEvent.clicks++;
1819 else 1936 else
1820 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1821 1938
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1940 }
1824 1941
1825 MEvent.button = Button1; 1942 MEvent.button = Button1;
1826 break; 1943 break;
1827 1944
1828 case Button3: 1945 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1831 else 1948 else
1832 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1833 1950
1834 MEvent.button = Button3; 1951 MEvent.button = Button3;
1835 break; 1952 break;
1836 } 1953 }
1837 } 1954 }
1838 1955
1839 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1840 return; 1957 return;
1841 } 1958 }
1842 1959
… …
1954 case Button3: 2071 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1956 { 2073 {
1957 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1960# else 2077# else
1961 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1962# endif 2079# endif
1963 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1966# else 2083# else
1967 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1968# endif 2085# endif
1969 else 2086 else
1970 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1971 } 2088 }
1972 else 2089 else
1973 { 2090 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2092 (nrow
1976 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2094 / scrollbar_size ()));
1978 } 2095 }
1979 2096
1980 break; 2097 break;
1981 } 2098 }
1982 } 2099 }
2100
1983 return; 2101 return;
1984 } 2102 }
2103
1985#if MENUBAR 2104#if MENUBAR
1986 /* 2105 /*
1987 * Menubar window processing of button press 2106 * Menubar window processing of button press
1988 */ 2107 */
1989 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2012#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2132 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2133 sel_scroll_ev.stop();
2015#endif 2134#endif
2016 2135
2017 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
2018 { 2137 {
2019#if ISO_14755 2138#if ISO_14755
2020 // 5.4 2139 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2141 return;
… …
2052 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2053 && bypass_keystate 2172 && bypass_keystate
2054 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2055 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2056 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2057 switch (ev.button) 2179 switch (ev.button)
2058 { 2180 {
2059 case Button1: 2181 case Button1:
2060 case Button3: 2182 case Button3:
2061 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2072 2194
2073 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2074 2196
2075 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
2076 i = 1; 2198 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2200 i = nrow - 1;
2079 else 2201 else
2080 i = 5; 2202 i = 5;
2081 2203
2082# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
2084 { 2206 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2087 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2210
2089 if (slip_wheel_ev.at < NOW) 2211 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2213
2092 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2093 } 2215 }
2094 else 2216 else
2095 { 2217 {
2096# endif 2218# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2219 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2220 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2110 } 2222 }
2111#endif 2223# endif
2112 } 2224 }
2113 break; 2225 break;
2114#endif 2226#endif
2115 } 2227 }
2116 } 2228 }
… …
2368 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2481 dDisp;
2370 2482
2371 pchanged = 0; 2483 pchanged = 0;
2372 2484
2373 if (!(options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
2375 2487
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
2378 2490
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2491 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2492
2381 if (rootdepth != wattr.depth) 2493 if (rootdepth != wattr.depth)
2382 { 2494 {
2383 if (am_transparent) 2495 if (am_transparent)
2384 { 2496 {
2385 pchanged = 1; 2497 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2499 am_transparent = am_pixmap_trans = 0;
2388 } 2500 }
2389 2501
2390 return pchanged; /* Don't try any more */ 2502 return pchanged; /* Don't try any more */
2391 } 2503 }
… …
2432 Window cr; 2544 Window cr;
2433 XImage *image; 2545 XImage *image;
2434 GC gc; 2546 GC gc;
2435 XGCValues gcvalue; 2547 XGCValues gcvalue;
2436 2548
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2549 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2550 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2551 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2552 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2553 nx = ny = 0;
2442 2554
… …
2452 nh += sy; 2564 nh += sy;
2453 ny = -sy; 2565 ny = -sy;
2454 sy = 0; 2566 sy = 0;
2455 } 2567 }
2456 2568
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2571
2460 XSync (disp, False); 2572 XSync (disp, False);
2461 allowedxerror = -1; 2573 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2575
… …
2468 if (image == NULL) 2580 if (image == NULL)
2469 { 2581 {
2470 if (am_transparent && am_pixmap_trans) 2582 if (am_transparent && am_pixmap_trans)
2471 { 2583 {
2472 pchanged = 1; 2584 pchanged = 1;
2473 if (TermWin.pixmap != None) 2585 if (pixmap != None)
2474 { 2586 {
2475 XFreePixmap (disp, TermWin.pixmap); 2587 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2588 pixmap = None;
2477 } 2589 }
2478 } 2590 }
2479 2591
2480 am_pixmap_trans = 0; 2592 am_pixmap_trans = 0;
2481 } 2593 }
2482 else 2594 else
2483 { 2595 {
2484 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2486 2598
2487#if TINTING 2599#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2600 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2601 {
2490 unsigned short rm, gm, bm; 2602 unsigned short rm, gm, bm;
… …
2494 2606
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2607 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2608 }
2497#endif 2609#endif
2498 2610
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2611 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2612 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2615 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2616 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2617 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2619 XClearWindow (disp, parent[0]);
2508 2620
2509 if (!am_transparent || !am_pixmap_trans) 2621 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2622 pchanged = 1;
2511 2623
2512 am_transparent = am_pixmap_trans = 1; 2624 am_transparent = am_pixmap_trans = 1;
2513 } 2625 }
2514 } 2626 }
2515 2627
2516 if (am_pixmap_trans) 2628 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2630 else
2519 { 2631 {
2520 unsigned int n; 2632 unsigned int n;
2521 /* 2633 /*
2522 * InheritPixmap transparency 2634 * InheritPixmap transparency
2523 */ 2635 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2637 {
2526 oldp = TermWin.parent[i]; 2638 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2639 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2640 &parent[i], &list, &n);
2529 XFree (list); 2641 XFree (list);
2530 2642
2531 if (TermWin.parent[i] == display->root) 2643 if (parent[i] == display->root)
2532 { 2644 {
2533 if (oldp != None) 2645 if (oldp != None)
2534 pchanged = 1; 2646 pchanged = 1;
2535 2647
2536 break; 2648 break;
2537 } 2649 }
2538 2650
2539 if (oldp != TermWin.parent[i]) 2651 if (oldp != parent[i])
2540 pchanged = 1; 2652 pchanged = 1;
2541 } 2653 }
2542 2654
2543 n = 0; 2655 n = 0;
2544 2656
2545 if (pchanged) 2657 if (pchanged)
2546 { 2658 {
2547 for (; n < (unsigned int)i; n++) 2659 for (; n < (unsigned int)i; n++)
2548 { 2660 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2661 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2663 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2665 break;
2554 } 2666 }
2555 } 2667 }
2556 } 2668 }
2557 2669
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2671 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2674 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2675 /* XXX: also turn off Opt_transparent? */
2564 } 2676 }
2565 else 2677 else
2566 { 2678 {
… …
2569 * needed for fvwm2.2.2 (and before?) */ 2681 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2682 sleep (1);
2571#endif 2683#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2684 for (n = 0; n < (unsigned int)i; n++)
2573 { 2685 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2687 XClearWindow (disp, parent[n]);
2576 } 2688 }
2577 2689
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2691 am_transparent = 1;
2580 } 2692 }
2581 2693
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2695 parent[i] = None;
2584 } 2696 }
2585 2697
2586 if (scrollBar.win) 2698 if (scrollBar.win)
2587 { 2699 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2605 2717
2606bool 2718bool
2607rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2608{ 2720{
2609 bool flag = false; 2721 bool flag = false;
2610 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2612 2724
2613 for (;;) 2725 for (;;)
2614 { 2726 {
2615 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2616 { 2728 {
2617 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2730 ch = next_char ();
2619 }
2620 2731
2621 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2622 break; 2733 break;
2734 }
2623 2735
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2737 {
2626 if (!seen_input) 2738 if (!seen_input)
2627 { 2739 {
… …
2636 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2638 } 2750 }
2639 2751
2640 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2754 bool refreshnow = false;
2643 int nlines = 0; 2755 int nlines = 0;
2644 unicode_t *str = buf; 2756 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2758
2646 for (;;) 2759 for (;;)
2647 { 2760 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2762 break;
2650 2763
2651 *str++ = ch; 2764 *str++ = ch;
2652 2765
2653 if (ch == C0_LF) 2766 if (ch == C0_LF || str >= eol)
2654 { 2767 {
2768 if (ch == C0_LF)
2655 nlines++; 2769 nlines++;
2770
2656 refresh_count++; 2771 refresh_count++;
2657 2772
2658 if (!(options & Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2775 {
2661 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2662 ch = NOCHAR; 2778 ch = NOCHAR;
2663 break; 2779 break;
2664 } 2780 }
2665 2781
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2783 if (nlines >= nrow - 1)
2668 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2669 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2670 nlines = 0; 2788 nlines = 0;
2671 str = buf; 2789 str = buf;
2790 eol = str + min (ncol, UBUFSIZ);
2672 } 2791 }
2673 }
2674 2792
2675 if (str >= buf + UBUFSIZ) 2793 if (str >= eol)
2676 { 2794 {
2795 if (eol >= buf + UBUFSIZ)
2796 {
2677 ch = NOCHAR; 2797 ch = NOCHAR;
2678 break; 2798 break;
2799 }
2800 else
2801 eol = min (eol + ncol, buf + UBUFSIZ);
2802 }
2803
2679 } 2804 }
2680 2805
2681 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2807 ch = next_char ();
2683 } 2808 }
2684 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2685 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2686 2812
2687 /* 2813 /*
2688 * If there have been a lot of new lines, then update the screen 2814 * If there have been a lot of new lines, then update the screen
2689 * What the heck I'll cheat and only refresh less than every page-full. 2815 * What the heck I'll cheat and only refresh less than every page-full.
2690 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2817 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2818 */
2693 if (refreshnow) 2819 if (refreshnow)
2694 { 2820 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2822 refresh_limit++;
2697 else 2823 else
2698 { 2824 {
2699 flag = true; 2825 flag = true;
2700 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 want_refresh = 1;
2701 } 2828 }
2702 } 2829 }
2703 2830
2704 } 2831 }
2705 else 2832 else
… …
2720 } 2847 }
2721 2848
2722 return flag; 2849 return flag;
2723} 2850}
2724 2851
2725// read the next octet
2726unicode_t
2727rxvt_term::next_octet ()
2728{
2729 return cmdbuf_ptr < cmdbuf_endp
2730 ? *cmdbuf_ptr++
2731 : NOCHAR;
2732}
2733
2734// read the next character 2852// read the next character
2735unicode_t 2853wchar_t
2736rxvt_term::next_char () 2854rxvt_term::next_char ()
2737{ 2855{
2738 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2739 { 2857 {
2740 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2741 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2742 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2743 2861
2744 wchar_t wc; 2862 wchar_t wc;
2745 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2746 2864
2747 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2748 { 2866 {
2749 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2750 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2751 break; 2869 break;
2752 } 2870 }
2753 2871
2754 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2756 2874
2757 // assume wchar == unicode 2875 // assume wchar == unicode
2758 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2759 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2760 } 2878 }
2761 2879
2762 return NOCHAR; 2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2763} 2890}
2764 2891
2765/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2766/* 2893/*
2767 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2768 * to the command. 2895 * to the command.
2769 */ 2896 */
2770unicode_t 2897wchar_t
2771rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2772{ 2899{
2773 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2774 2901
2775 if (c == NOCHAR) 2902 if (c == NOCHAR)
2776 throw out_of_input; 2903 throw out_of_input;
2777 2904
2778 return c; 2905 return c;
2779} 2906}
2780 2907
2781unicode_t 2908uint32_t
2782rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2783{ 2910{
2784 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2785 2912
2786 if (c == NOCHAR) 2913 if (c == NOCHAR)
2787 throw out_of_input; 2914 throw out_of_input;
2788 2915
2789 return c; 2916 return c;
… …
2889 case C0_ESC: 3016 case C0_ESC:
2890 process_escape_seq (); 3017 process_escape_seq ();
2891 break; 3018 break;
2892 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2893 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2896 else 3022 else
2897 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2898 (unsigned int)strlen (VT100_ANS));
2899 break; 3024 break;
2900 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2901 scr_bell (); 3026 scr_bell ();
2902 break; 3027 break;
2903 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3058 break; 3183 break;
3059 3184
3060 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3061 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3062 { 3187 {
3063 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3064 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3065 } 3190 }
3066 break; 3191 break;
3067 3192
3068 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3069 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
3091 process_dcs_seq (); 3216 process_dcs_seq ();
3092 break; 3217 break;
3093 3218
3094 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3095 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3096 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3097 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3098 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3099 3223
3100 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3101 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3102 process_csi_seq (); 3226 process_csi_seq ();
… …
3342 3466
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3467 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3468 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3469 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3472 break;
3349 3473
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3352 (unsigned int) (sizeof (VT100_ANS) - 1));
3353 break; 3476 break;
3354 3477
3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3356 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3357 break; 3480 break;
… …
3364 break; 3487 break;
3365 case 6: /* CPR requested */ 3488 case 6: /* CPR requested */
3366 scr_report_position (); 3489 scr_report_position ();
3367 break; 3490 break;
3368 case 7: /* unofficial extension */ 3491 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3492 if (OPTION (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3493 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3494 break;
3372 case 8: /* unofficial extension */ 3495 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3497 break;
… …
3477 { 3600 {
3478 /* 3601 /*
3479 * commands 3602 * commands
3480 */ 3603 */
3481 case 1: /* deiconify window */ 3604 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3605 XMapWindow (disp, parent[0]);
3483 break; 3606 break;
3484 case 2: /* iconify window */ 3607 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3608 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3609 break;
3487 case 3: /* set position (pixels) */ 3610 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3611 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3612 break;
3490 case 4: /* set size (pixels) */ 3613 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3615 break;
3493 case 5: /* raise window */ 3616 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3617 XRaiseWindow (disp, parent[0]);
3495 break; 3618 break;
3496 case 6: /* lower window */ 3619 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3620 XLowerWindow (disp, parent[0]);
3498 break; 3621 break;
3499 case 7: /* refresh window */ 3622 case 7: /* refresh window */
3500 scr_touch (true); 3623 scr_touch (true);
3501 break; 3624 break;
3502 case 8: /* set size (chars) */ 3625 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3626 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3627 (unsigned int) (args[1] * fheight));
3505 break; 3628 break;
3506 3629
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3630 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3631 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3632 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3633 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3634 (unsigned int) (args[1] * fheight));
3512 break; 3635 break;
3513 3636
3514 3637
3515 /* 3638 /*
3516 * reports - some output format copied from XTerm 3639 * reports - some output format copied from XTerm
3517 */ 3640 */
3518 case 11: /* report window state */ 3641 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3642 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3644 break;
3522 case 13: /* report window position */ 3645 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3647 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3648 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3649 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3650 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3651 break;
3529 case 14: /* report window size (pixels) */ 3652 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3655 break;
3533 case 18: /* report text area size (chars) */ 3656 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3657 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3658 break;
3536 case 19: /* report window size (chars) */ 3659 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3660 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3661 break;
3539 case 20: /* report icon label */ 3662 case 20: /* report icon label */
3540 { 3663 {
3541 char *s; 3664 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3665 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3667 XFree (s);
3545 } 3668 }
3546 break; 3669 break;
3547 case 21: /* report window title */ 3670 case 21: /* report window title */
3548 { 3671 {
3549 char *s; 3672 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3673 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3675 XFree (s);
3553 } 3676 }
3554 break; 3677 break;
3555 } 3678 }
3556} 3679}
… …
3559/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3560/* 3683/*
3561 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3562 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3563 */ 3686 */
3564unsigned char * 3687char *
3565rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3566{ 3689{
3567 unicode_t ch; 3690 unicode_t ch;
3568 bool seen_esc = false; 3691 bool seen_esc = false;
3569 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3588 else if (ch < 0x20) 3711 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3712 return NULL; /* other control character - exit */
3590 3713
3591 seen_esc = false; 3714 seen_esc = false;
3592 3715
3593 if (n >= sizeof (string) - 1) 3716 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3717 // stop at some sane length
3595 return NULL; 3718 return NULL;
3596 3719
3597 if (ch == C0_SYN) 3720 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3721 string[n++] = cmd_get8 ();
… …
3602 3725
3603 string[n++] = '\0'; 3726 string[n++] = '\0';
3604 3727
3605 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3606 3729
3607 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3608} 3731}
3609 3732
3610/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3611/* 3734/*
3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3613 */ 3736 */
3614void 3737void
3615rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3616{ 3739{
3617 unsigned char *s; 3740 char *s;
3618 unicode_t eh; 3741 unicode_t eh;
3619 3742
3620 /* 3743 /*
3621 * Not handled yet 3744 * Not handled yet
3622 */ 3745 */
… …
3641 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3642 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3643 3766
3644 if (ch == ';') 3767 if (ch == ';')
3645 { 3768 {
3646 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3647 3770
3648 if (s) 3771 if (s)
3649 { 3772 {
3650 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3651 free (s); 3774 free (s);
3652 } 3775 }
3653 } 3776 }
3654} 3777}
3655 3778
3656void 3779void
3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3658{ 3781{
3659 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3660 { 3783 {
3661 unsigned short r, g, b; 3784 unsigned short r, g, b;
3662 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3666 set_window_color (color, str); 3789 set_window_color (color, str);
3667} 3790}
3668 3791
3669/* 3792/*
3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3671 * 0 = change iconName/title
3672 * 1 = change iconName
3673 * 2 = change title
3674 * 4 = change color
3675 * 10 = change fg color
3676 * 11 = change bg color
3677 * 12 = change text color
3678 * 13 = change mouse foreground color
3679 * 17 = change highlight character colour
3680 * 18 = change bold character color
3681 * 19 = change underlined character color
3682 * 46 = change logfile (not implemented)
3683 * 50 = change font
3684 *
3685 * rxvt extensions:
3686 * 20 = bg pixmap
3687 * 39 = change default fg color
3688 * 49 = change default bg color
3689 * 55 = dump scrollback buffer and all of screen
3690 * 701 = change locale
3691 * 702 = find font
3692 * 703 = menu
3693 */ 3794 */
3694void 3795void
3695rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3696{ 3797{
3697 int changed = 0; 3798 int changed = 0;
3698 int color; 3799 int color;
3699 char *buf, *name; 3800 char *buf, *name;
3700 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3723 unsigned long bytes_after; 3824 unsigned long bytes_after;
3724 unsigned char *value = 0; 3825 unsigned char *value = 0;
3725 const char *str = ""; 3826 const char *str = "";
3726 3827
3727 if (prop 3828 if (prop
3728 && XGetWindowProperty (disp, TermWin.parent[0], 3829 && XGetWindowProperty (disp, parent[0],
3729 prop, 0, 1<<16, 0, AnyPropertyType, 3830 prop, 0, 1<<16, 0, AnyPropertyType,
3730 &actual_type, &actual_format, 3831 &actual_type, &actual_format,
3731 &nitems, &bytes_after, &value) == Success 3832 &nitems, &bytes_after, &value) == Success
3732 && actual_type != None 3833 && actual_type != None
3733 && actual_format == 8) 3834 && actual_format == 8)
… …
3745 { 3846 {
3746 *eq = 0; 3847 *eq = 0;
3747 set_utf8_property (display->atom (str), eq + 1); 3848 set_utf8_property (display->atom (str), eq + 1);
3748 } 3849 }
3749 else 3850 else
3750 XDeleteProperty (disp, TermWin.parent[0], 3851 XDeleteProperty (disp, parent[0],
3751 display->atom (str)); 3852 display->atom (str));
3752 } 3853 }
3753 break; 3854 break;
3754 3855
3755 case XTerm_Color: 3856 case XTerm_Color:
… …
3757 { 3858 {
3758 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3759 break; 3860 break;
3760 3861
3761 *name++ = '\0'; 3862 *name++ = '\0';
3762 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3763 3864
3764 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS))
3765 break; 3866 break;
3766 3867
3767 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3768 *buf++ = '\0'; 3869 *buf++ = '\0';
3769 3870
3770 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3771 { 3872 {
3772 unsigned short r, g, b; 3873 unsigned short r, g, b;
3773 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3774 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3775 } 3876 }
3776 else 3877 else
3777 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3778 } 3879 }
3779 break; 3880 break;
3780 case XTerm_Color00: 3881 case XTerm_Color00:
3781 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3782 break; 3883 break;
3783 case XTerm_Color01: 3884 case XTerm_Color01:
3784 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3785 break; 3886 break;
3786#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3787 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3788 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3789 break; 3890 break;
… …
3796 break; 3897 break;
3797#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3798 case XTerm_Color_BD: 3899 case XTerm_Color_BD:
3799 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800 break; 3901 break;
3801 case XTerm_Color_IT:
3802 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3803 break;
3804 case XTerm_Color_UL: 3902 case XTerm_Color_UL:
3805 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3806 break; 3904 break;
3807 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3808 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3809 break; 3907 break;
3908 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break;
3810#endif 3911#endif
3811#if TRANSPARENT && TINTING 3912#if TRANSPARENT && TINTING
3812 case XTerm_Color_tint: 3913 case URxvt_Color_tint:
3813 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3814 check_our_parents (); 3915 check_our_parents ();
3815 if (am_transparent) 3916 if (am_transparent)
3816 want_full_refresh = want_refresh = 1; 3917 want_full_refresh = want_refresh = 1;
3817 break; 3918 break;
3818#endif 3919#endif
… …
3821 if (*str != ';') 3922 if (*str != ';')
3822 { 3923 {
3823#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3824 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3825 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3826#endif
3827 scr_touch (true); 3927 scr_touch (true);
3928#endif
3828 } 3929 }
3930
3829 while ((str = strchr (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3830 { 3932 {
3831 str++; 3933 str++;
3832#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3833 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
… …
3836 3938
3837 if (changed) 3939 if (changed)
3838 { 3940 {
3839#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3840 resize_pixmap (); 3942 resize_pixmap ();
3841#endif
3842 scr_touch (true); 3943 scr_touch (true);
3944#endif
3843 } 3945 }
3844 break; 3946 break;
3845 3947
3846 case XTerm_restoreFG: 3948 case XTerm_restoreFG:
3847 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);
… …
3852 3954
3853 case XTerm_logfile: 3955 case XTerm_logfile:
3854 // TODO, when secure mode? 3956 // TODO, when secure mode?
3855 break; 3957 break;
3856 3958
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0
3966 case XTerm_dumpscreen: /* no error notices */
3967 {
3968 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3970 {
3971 scr_dump (fd);
3972 close (fd);
3973 }
3974 }
3975 break;
3976#endif
3857 case XTerm_font: 3977 case XTerm_font:
3858 op = URxvt_font; 3978 op = URxvt_font;
3859 case URxvt_font: 3979 case URxvt_font:
3860#if ENABLE_STYLES 3980#if ENABLE_STYLES
3861 case URxvt_boldFont: 3981 case URxvt_boldFont:
3862 case URxvt_italicFont: 3982 case URxvt_italicFont:
3863 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3864#endif 3984#endif
3865 if (query) 3985 if (query)
3866 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3867 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3868 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3869 resp); 3989 resp);
3870 else 3990 else
3871 { 3991 {
3872 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3873 3993
… …
3876 set_fonts (); 3996 set_fonts ();
3877 } 3997 }
3878 break; 3998 break;
3879 3999
3880#if ENABLE_FRILLS 4000#if ENABLE_FRILLS
3881 case XTerm_locale: 4001 case URxvt_locale:
3882 if (query) 4002 if (query)
3883 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3884 else 4004 else
3885 { 4005 {
3886 set_locale (str); 4006 set_locale (str);
3887 pty.set_utf8_mode (enc_utf8); 4007 pty.set_utf8_mode (enc_utf8);
3888 init_xlocale (); 4008 init_xlocale ();
3889 } 4009 }
3890 break; 4010 break;
3891#endif
3892 4011
3893#ifdef MENUBAR 4012 case URxvt_view_up:
3894 case XTerm_Menu: 4013 case URxvt_view_down:
3895 if (options & Opt_insecure) 4014 {
3896 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4015 int lines = atoi (str);
4016
4017 if (lines)
4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
4019 else
4020 scr_erase_savelines ();
4021 }
4022
3897 break; 4023 break;
3898#endif 4024#endif
3899#if 0 4025
3900 case XTerm_dumpscreen: /* no error notices */ 4026#if ENABLE_PERL
3901 { 4027 case URxvt_perl:
3902 int fd; 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3903 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4029 ; // no responses yet
3904 {
3905 scr_dump (fd);
3906 close (fd);
3907 }
3908 }
3909 break; 4030 break;
3910#endif 4031#endif
3911 } 4032 }
3912} 4033}
3913/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
4022 } 4143 }
4023 4144
4024 /* extra handling for values with state unkept */ 4145 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4146 switch (arg[i])
4026 { 4147 {
4148#if ENABLE_STYLES
4149 case 1021:
4150 set_option (Opt_intensityStyles, mode);
4151
4152 scr_touch (true);
4153 break;
4154#endif
4027 case 1048: /* alternative cursor save */ 4155 case 1048: /* alternative cursor save */
4028 case 1049: 4156 case 1049:
4029 if (options & Opt_secondaryScreen) 4157 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4158 if (mode == 0)
4031 scr_cursor (RESTORE); 4159 scr_cursor (RESTORE);
4032 else if (mode == 1) 4160 else if (mode == 1)
4033 scr_cursor (SAVE); 4161 scr_cursor (SAVE);
4034 break; 4162 break;
… …
4046 */ 4174 */
4047 PrivMode (1, PrivMode_vt52); 4175 PrivMode (1, PrivMode_vt52);
4048 break; 4176 break;
4049 case 3: /* 80/132 */ 4177 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4178 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4179 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4180 break;
4053 case 4: /* smooth scrolling */ 4181 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4182 set_option (Opt_jumpScroll, !state);
4058 break; 4183 break;
4059 case 5: /* reverse video */ 4184 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4185 scr_rvideo_mode (state);
4061 break; 4186 break;
4062 case 6: /* relative/absolute origins */ 4187 case 6: /* relative/absolute origins */
… …
4103#if 0 4228#if 0
4104 case 1001: 4229 case 1001:
4105 break; /* X11 mouse highlighting */ 4230 break; /* X11 mouse highlighting */
4106#endif 4231#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4232 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4233 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4234 break;
4113 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4236 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4237 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4238 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4239 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4240 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4241 scr_erase_screen (2);
4123 scr_change_screen (state); 4242 scr_change_screen (state);
4124 break; 4243 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4244 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4245 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4246 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4248 scr_erase_screen (2);
4130 break; 4249 break;
4131 default: 4250 default:
4132 break; 4251 break;
… …
4260 scr_color (Color_bg, Color_bg); 4379 scr_color (Color_bg, Color_bg);
4261 break; 4380 break;
4262 4381
4263 //case 50: // not variable spacing 4382 //case 50: // not variable spacing
4264 4383
4265#ifndef NO_BRIGHTCOLOR 4384#if ENABLE_FRILLS
4266 case 90: 4385 case 90:
4267 case 91: /* set bright fg color */ 4386 case 91: /* set bright fg color */
4268 case 92: 4387 case 92:
4269 case 93: 4388 case 93:
4270 case 94: 4389 case 94:
… …
4282 case 106: 4401 case 106:
4283 case 107: 4402 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4404 break;
4286#endif 4405#endif
4287
4288 } 4406 }
4289 } 4407 }
4290} 4408}
4291/*}}} */ 4409/*}}} */
4292 4410
… …
4316 */ 4434 */
4317void 4435void
4318rxvt_term::tt_printf (const char *fmt,...) 4436rxvt_term::tt_printf (const char *fmt,...)
4319{ 4437{
4320 va_list arg_ptr; 4438 va_list arg_ptr;
4321 unsigned char buf[256]; 4439 char buf[256];
4322 4440
4323 va_start (arg_ptr, fmt); 4441 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4442 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4443 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4444 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4449 * or generated by us in response to a query ESC sequence.
4332 */ 4450 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4451const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4452
4335void 4453void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4454rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4455{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return;
4458
4459 if (pty.pty < 0)
4460 return;
4461
4338 if (v_buflen == 0) 4462 if (v_buflen == 0)
4339 { 4463 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4341 4465
4342 if ((unsigned int)written == len) 4466 if ((unsigned int)written == len)
… …
4344 4468
4345 data += written; 4469 data += written;
4346 len -= written; 4470 len -= written;
4347 } 4471 }
4348 4472
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4474
4351 memcpy (v_buffer + v_buflen, data, len); 4475 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4476 v_buflen += len;
4353 4477
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4373 } 4497 }
4374 4498
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4499 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4500 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4502 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4503}
4381 4504
4382/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
4383 4506

Diff Legend

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