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

Diff Legend

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