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.206 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.262 by root, Sun Jan 15 06:02:40 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, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
187 len = 1; 191 len = 1;
188 } 192 }
189 193
194 char attr[80]; // plenty
195
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
190 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
191 207
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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);
193 218
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 220
196 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
197 { 222 {
… …
200 ch = *chr++; 225 ch = *chr++;
201 226
202 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
205#if !UNICODE3 230# if !UNICODE3
206 if (ch >= 0x10000) 231 if (ch >= 0x10000)
207 ch = 0xfffd; 232 ch = 0xfffd;
208#endif 233# endif
209 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
211 } 236 }
212 237
238 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 239 scr_overlay_set (0, len + 1, fname);
214 240
215 free (fname); 241 free (fname);
216 242
217#if ENABLE_COMBINING 243# if ENABLE_COMBINING
218 if (alloc) 244 if (alloc)
219 delete [] alloc; 245 delete [] alloc;
220#endif 246# endif
221} 247}
222#endif 248#endif
223 249
224void 250void
225rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 268 mb[0] = ch[0];
243 len = 1; 269 len = 1;
244 } 270 }
245 271
246 if (len > 0) 272 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
248 else 274 else
249 scr_bell (); 275 scr_bell ();
250 } 276 }
251 277
252 iso14755buf = 0; 278 iso14755buf = 0;
… …
280 KeySym keysym; 306 KeySym keysym;
281#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
283#endif 309#endif
284 int valid_keysym; 310 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
286 312
287 /* 313 /*
288 * 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
289 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
290 * 316 *
… …
308 Status status_return; 334 Status status_return;
309 335
310#if 0 336#if 0
311#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
312 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
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
315 else 341 else
316#endif 342#endif
317#endif 343#endif
318 { 344 {
… …
355 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
356 } 382 }
357 else 383 else
358#endif 384#endif
359 { 385 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
362 } 388 }
363 389
364 if (valid_keysym) 390 if (valid_keysym)
365 { 391 {
366#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 394 return;
369#endif 395#endif
370 396
371 if (TermWin.saveLines) 397 if (saveLines)
372 { 398 {
373#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 400 if (!ctrl && !meta)
375#else 401#else
376 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
377#endif 403#endif
378 { 404 {
379 int lnsppg; 405 int lnsppg;
380 406
381#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 409#else
384 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
385#endif 411#endif
386 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
387 { 413 {
388 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
389 return; 415 return;
… …
829 { 855 {
830#ifdef META8_OPTION 856#ifdef META8_OPTION
831 /* set 8-bit on */ 857 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
833 { 859 {
834 unsigned char *ch; 860 char *ch;
835 861
836 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 863 *ch |= 0x80;
838 864
839 meta = 0; 865 meta = 0;
… …
841#endif 867#endif
842 /* nil */ ; 868 /* nil */ ;
843 } 869 }
844 } 870 }
845 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
846 if (len <= 0) 875 if (len <= 0)
847 return; /* not mapped */ 876 return; /* not mapped */
848 877
849 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 879 if (view_start)
851 { 880 {
852 TermWin.view_start = 0; 881 view_start = 0;
853 want_refresh = 1; 882 want_refresh = 1;
854 } 883 }
855 884
856 /* 885 /*
857 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 901#ifdef META8_OPTION
873 && meta_char == C0_ESC 902 && meta_char == C0_ESC
874#endif 903#endif
875 ) 904 )
876 { 905 {
877 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
878 tt_write (&ch, 1); 907 tt_write (&ch, 1);
879 } 908 }
880 909
881#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
894 923
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
898unsigned int 927unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 929{
901 unsigned int n, s; 930 unsigned int n, s;
902 931
903 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 970 }
942#endif 971#endif
943 972
944 if (want_refresh) 973 if (want_refresh)
945 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = view_start;
978 int end_row = row + nrow;
979
980 while (row > top_row && 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
946 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
947 scrollbar_show (1); 1014 scrollbar_show (1);
948#ifdef USE_XIM 1015#ifdef USE_XIM
949 IMSendSpot (); 1016 IMSendSpot ();
950#endif 1017#endif
… …
960 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
961 1028
962 display->flush (); 1029 display->flush ();
963 1030
964 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1033}
967 1034
968void 1035void
969rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
970{ 1037{
… …
1034{ 1101{
1035 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1036 || 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)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1105 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1106 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1107 mouse_slip_wheel_speed = 0;
1042 1108
1043 refresh_type |= SMOOTH_REFRESH; 1109 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1110 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1112 }
1047} 1113}
1048#endif 1114#endif
1049 1115
1116#if HAVE_SCHED_YIELD
1117static struct event_handler
1118{
1119 check_watcher cw_yield;
1120
1121 void yield (check_watcher &w)
1122 {
1123 sched_yield ();
1124 w.stop ();
1125 }
1126
1127 event_handler ()
1128 : cw_yield (this, &event_handler::yield)
1129 {
1130 }
1131} event_handler;
1132#endif
1133
1050bool 1134bool
1051rxvt_term::pty_fill () 1135rxvt_term::pty_fill ()
1052{ 1136{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1137 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1138
1055 if (CBUFSIZ == n) 1139 if (CBUFSIZ == n)
1056 { 1140 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1141 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1142 n = 0;
1059 } 1143 }
1060 1144
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1145 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1146 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1147 cmdbuf_endp = cmdbuf_ptr + n;
1064 1148
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1150
1067 if (n > 0) 1151 if (r > 0)
1068 { 1152 {
1069 cmdbuf_endp += n; 1153 cmdbuf_endp += r;
1070 return true; 1154 return true;
1071 } 1155 }
1072 else if (n < 0 && errno != EAGAIN) 1156 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157 {
1158#if HAVE_SCHED_YIELD
1159 if (display->is_local)
1160 event_handler.cw_yield.start ();
1161#endif
1162 }
1163 else
1164 {
1165 pty_ev.stop ();
1166
1167 if (!OPTION (Opt_hold))
1073 destroy (); 1168 destroy ();
1169 }
1074 1170
1075 return false; 1171 return false;
1076} 1172}
1077 1173
1078void 1174void
… …
1092} 1188}
1093 1189
1094void 1190void
1095rxvt_term::pointer_unblank () 1191rxvt_term::pointer_unblank ()
1096{ 1192{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1193 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1194 recolour_cursor ();
1099 1195
1100#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1197 hidden_pointer = 0;
1102 1198
1103 if (options & Opt_pointerBlank) 1199 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1200 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1201#endif
1106} 1202}
1107 1203
1108#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
1109void 1205void
1110rxvt_term::pointer_blank () 1206rxvt_term::pointer_blank ()
1111{ 1207{
1112 if (! (options & Opt_pointerBlank)) 1208 if (!OPTION (Opt_pointerBlank))
1113 return; 1209 return;
1114 1210
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1211 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1212 XFlush (display->display);
1117 1213
1118 hidden_pointer = 1; 1214 hidden_pointer = 1;
1119} 1215}
1120 1216
… …
1214 dDisp; 1310 dDisp;
1215 1311
1216 SET_R (this); 1312 SET_R (this);
1217 SET_LOCALE (locale); 1313 SET_LOCALE (locale);
1218 1314
1219#if defined(CURSOR_BLINK) 1315 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1221 { 1317 return;
1222 if (hidden_cursor)
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1318
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1319 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1322 unsigned int unused_mask;
1249 1323
1250 switch (ev.type) 1324 switch (ev.type)
… …
1257 1331
1258 break; 1332 break;
1259 1333
1260 case KeyRelease: 1334 case KeyRelease:
1261 { 1335 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1337 KeySym keysym;
1264 1338
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1340#endif
1267 1341
1268#if ENABLE_FRILLS || ISO_14755 1342#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1343 // ISO 14755 support
1270 if (iso14755buf) 1344 if (iso14755buf)
… …
1275# endif 1349# endif
1276# if ISO_14755 1350# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1351 // iso14755 part 5.2 handling: release time
1278 // first: controls 1352 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1353 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1356 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1358 commit_iso14755 ();
1285 return; // case-break; 1359 goto skip_switch;
1286 } 1360 }
1287 1361
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1363 if (i[0] == keysym)
1290 { 1364 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1365 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1366 commit_iso14755 ();
1293 return; // case-break; 1367 goto skip_switch;
1294 } 1368 }
1295 1369
1296 scr_bell (); 1370 scr_bell ();
1297# endif 1371# endif
1298 iso14755buf = 0; 1372 iso14755buf = 0;
… …
1317 else 1391 else
1318 iso14755buf = 0; 1392 iso14755buf = 0;
1319 } 1393 }
1320#endif 1394#endif
1321 1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1402 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1327#endif 1405#endif
1328 break; 1406 break;
1329 } 1407 }
1330 1408
… …
1422 case FocusOut: 1500 case FocusOut:
1423 focus_out (); 1501 focus_out ();
1424 break; 1502 break;
1425 1503
1426 case ConfigureNotify: 1504 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1505 if (ev.xconfigure.window == parent[0])
1428 { 1506 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ;
1438 1509
1439 if (szHint.width != width || szHint.height != height) 1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1511 {
1441 seen_resize = 1; 1512 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1514 }
1444 1515
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1517 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1518 check_our_parents ();
1448#endif 1519#endif
1449 } 1520 }
1450 break; 1521 break;
1451 1522
… …
1467 1538
1468 case SelectionRequest: 1539 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1470 break; 1541 break;
1471 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1472 case UnmapNotify: 1551 case UnmapNotify:
1473 TermWin.mapped = 0; 1552 mapped = 0;
1474#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1476#endif 1555#endif
1477 break; 1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479 case MapNotify:
1480 TermWin.mapped = 1;
1481#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif
1484 break; 1557 break;
1485 1558
1486#ifdef TRANSPARENT 1559#ifdef TRANSPARENT
1487 case ReparentNotify: 1560 case ReparentNotify:
1488 rootwin_cb (ev); 1561 rootwin_cb (ev);
1489 break; 1562 break;
1490#endif /* TRANSPARENT */ 1563#endif /* TRANSPARENT */
1491 1564
1492 case GraphicsExpose: 1565 case GraphicsExpose:
1493 case Expose: 1566 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1567 if (ev.xany.window == vt)
1495 { 1568 {
1496 do 1569 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1573
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1575
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1506 1579
1507 scr_refresh (refresh_type); 1580 want_refresh = 1;
1508 } 1581 }
1509 else 1582 else
1510 { 1583 {
1511 XEvent unused_event; 1584 XEvent unused_event;
1512 1585
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1598 menubar_expose ();
1526#endif 1599#endif
1527 1600
1528#ifdef TRANSPARENT 1601#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1602 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1603 XClearWindow (disp, ev.xany.window);
1531#endif 1604#endif
1532 } 1605 }
1533 break; 1606 break;
1534 1607
… …
1545 } 1618 }
1546#endif 1619#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1621 break;
1549 1622
1550 if (ev.xany.window == TermWin.vt) 1623 if (ev.xany.window == vt)
1551 { 1624 {
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1628 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1630 ;
1556 1631
1557 XQueryPointer (disp, TermWin.vt, 1632 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1636 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1637#ifdef MOUSE_THRESHOLD
… …
1574#endif 1649#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1650 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1651 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1652
1578#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1656 {
1582 int dist; 1657 int dist;
1583 1658
1584 /* don't clobber the current delay if we are 1659 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1660 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1668 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1669 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1670 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1671
1597 /* calc number of lines to scroll */ 1672 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1673 if (ev.xbutton.y < int_bwidth)
1599 { 1674 {
1600 scroll_selection_dir = UP; 1675 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1676 dist = int_bwidth - ev.xbutton.y;
1602 } 1677 }
1603 else 1678 else
1604 { 1679 {
1605 scroll_selection_dir = DN; 1680 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1681 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1682 }
1608 1683
1609 scroll_selection_lines = Pixel2Height (dist) 1684 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1685 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1686 + 1;
1612 MIN_IT (scroll_selection_lines, 1687 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1688 SELECTION_SCROLL_MAX_LINES);
1614 } 1689 }
1615 else 1690 else
1616 { 1691 {
1617 /* we are within the text window, so we 1692 /* we are within the text window, so we
… …
1637 &unused_root_x, &unused_root_y, 1712 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1713 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1714 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1716 scrollbar_size ());
1642 scr_refresh (refresh_type); 1717 want_refresh = 1;
1643 refresh_limit = 0; 1718 refresh_limit = 0;
1644 scrollbar_show (1); 1719 scrollbar_show (1);
1645 } 1720 }
1646 break; 1721 break;
1647 } 1722 }
1723
1724skip_switch: ;
1725
1726#if defined(CURSOR_BLINK)
1727 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1728 {
1729 if (hidden_cursor)
1730 {
1731 hidden_cursor = 0;
1732 want_refresh = 1;
1733 }
1734
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1736 }
1737#endif
1738
1739#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 {
1742 if (ev.type == MotionNotify
1743 || ev.type == ButtonPress
1744 || ev.type == ButtonRelease)
1745 if (hidden_pointer)
1746 pointer_unblank ();
1747
1748 if (ev.type == KeyPress && hidden_pointer == 0)
1749 pointer_blank ();
1750 }
1751#endif
1648} 1752}
1649 1753
1650void 1754void
1651rxvt_term::focus_in () 1755rxvt_term::focus_in ()
1652{ 1756{
1653 if (!TermWin.focus) 1757 if (!focus)
1654 { 1758 {
1655 TermWin.focus = 1; 1759 focus = 1;
1656 want_refresh = 1; 1760 want_refresh = 1;
1761
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1763
1657#if USE_XIM 1764#if USE_XIM
1658 if (Input_Context != NULL) 1765 if (Input_Context != NULL)
1659 { 1766 {
1660 IMSetStatusPosition (); 1767 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1768 XSetICFocus (Input_Context);
1662 } 1769 }
1663#endif 1770#endif
1664#if CURSOR_BLINK 1771#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1772 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1774#endif
1668#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1670 { 1777 {
… …
1676} 1783}
1677 1784
1678void 1785void
1679rxvt_term::focus_out () 1786rxvt_term::focus_out ()
1680{ 1787{
1681 if (TermWin.focus) 1788 if (focus)
1682 { 1789 {
1683 TermWin.focus = 0; 1790 focus = 0;
1684 want_refresh = 1; 1791 want_refresh = 1;
1685 1792
1793 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1794
1686#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf)
1797 {
1687 iso14755buf = 0; 1798 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1799# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1800 scr_overlay_off ();
1801# endif
1802 }
1691#endif 1803#endif
1692#if USE_XIM 1804#if USE_XIM
1693 if (Input_Context != NULL) 1805 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1695#endif 1807#endif
1696#if CURSOR_BLINK 1808#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1809 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1811 hidden_cursor = 0;
1700#endif 1812#endif
1701#if OFF_FOCUS_FADING 1813#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1814 if (rs[Rs_fade])
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1838 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1839 return;
1728 1840
1729 /* FALLTHROUGH */ 1841 /* FALLTHROUGH */
1730 case ReparentNotify: 1842 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1843 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1844 want_refresh = want_full_refresh = 1;
1733 break; 1845 break;
1734 } 1846 }
1735} 1847}
1736#endif 1848#endif
… …
1739rxvt_term::button_press (XButtonEvent &ev) 1851rxvt_term::button_press (XButtonEvent &ev)
1740{ 1852{
1741 int reportmode = 0, clickintime; 1853 int reportmode = 0, clickintime;
1742 1854
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1855 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1856
1744 if (!bypass_keystate) 1857 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1858 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1859
1747 /* 1860 /*
1748 * VT window processing of button press 1861 * VT window processing of button press
1749 */ 1862 */
1750 if (ev.window == TermWin.vt) 1863 if (ev.window == vt)
1751 { 1864 {
1752#if ISO_14755 1865#if ISO_14755
1753 // 5.4 1866 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1868 {
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1881#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1882 if (ev.button == MEvent.button && clickintime)
1770 { 1883 {
1771 /* same button, within alloted time */ 1884 /* same button, within alloted time */
1772 MEvent.clicks++; 1885 MEvent.clicks++;
1886
1773 if (MEvent.clicks > 1) 1887 if (MEvent.clicks > 1)
1774 { 1888 {
1775 /* only report double clicks */ 1889 /* only report double clicks */
1776 MEvent.clicks = 2; 1890 MEvent.clicks = 2;
1777 mouse_report (ev); 1891 mouse_report (ev);
… …
1797 else 1911 else
1798 { 1912 {
1799 if (ev.button != MEvent.button) 1913 if (ev.button != MEvent.button)
1800 MEvent.clicks = 0; 1914 MEvent.clicks = 0;
1801 1915
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1802 switch (ev.button) 1917 switch (ev.button)
1803 { 1918 {
1804 case Button1: 1919 case Button1:
1805 /* allow meta + click to select rectangular areas */ 1920 /* allow meta + click to select rectangular areas */
1806 /* should be done in screen.C */ 1921 /* should be done in screen.C */
1807#if ENABLE_FRILLS 1922#if ENABLE_FRILLS
1808 selection.rect = !!(ev.state & ModMetaMask); 1923 selection.rect = !!(ev.state & ModMetaMask);
1809#else 1924#else
1810 selection.rect = false; 1925 selection.rect = false;
1811#endif 1926#endif
1812 1927
1813 /* allow shift+left click to extend selection */ 1928 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1930 {
1816 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1818 else 1933 else
1819 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
1820 } 1935 }
1821 else 1936 else
1822 { 1937 {
1823 if (MEvent.button == Button1 && clickintime) 1938 if (MEvent.button == Button1 && clickintime)
1824 MEvent.clicks++; 1939 MEvent.clicks++;
1825 else 1940 else
1826 MEvent.clicks = 1; 1941 MEvent.clicks = 1;
1827 1942
1828 selection_click (MEvent.clicks, ev.x, ev.y); 1943 selection_click (MEvent.clicks, ev.x, ev.y);
1829 } 1944 }
1830 1945
1831 MEvent.button = Button1; 1946 MEvent.button = Button1;
1832 break; 1947 break;
1833 1948
1834 case Button3: 1949 case Button3:
1835 if (MEvent.button == Button3 && clickintime) 1950 if (MEvent.button == Button3 && clickintime)
1836 selection_rotate (ev.x, ev.y); 1951 selection_rotate (ev.x, ev.y);
1837 else 1952 else
1838 selection_extend (ev.x, ev.y, 1); 1953 selection_extend (ev.x, ev.y, 1);
1839 1954
1840 MEvent.button = Button3; 1955 MEvent.button = Button3;
1841 break; 1956 break;
1842 } 1957 }
1843 } 1958 }
1844 1959
1845 MEvent.time = ev.time; 1960 MEvent.time = ev.time;
1846 return; 1961 return;
1847 } 1962 }
1848 1963
… …
1960 case Button3: 2075 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2076 if (scrollBar.style != R_SB_XTERM)
1962 { 2077 {
1963 if (scrollbar_above_slider (ev.y)) 2078 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2080 scr_page (UP, nrow - 1);
1966# else 2081# else
1967 scr_page (UP, TermWin.nrow / 4); 2082 scr_page (UP, nrow / 4);
1968# endif 2083# endif
1969 else if (scrollbar_below_slider (ev.y)) 2084 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2085# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2086 scr_page (DN, nrow - 1);
1972# else 2087# else
1973 scr_page (DN, TermWin.nrow / 4); 2088 scr_page (DN, nrow / 4);
1974# endif 2089# endif
1975 else 2090 else
1976 scrollBar.setMotion (); 2091 scrollBar.setMotion ();
1977 } 2092 }
1978 else 2093 else
1979 { 2094 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2095 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2096 (nrow
1982 * scrollbar_position (ev.y) 2097 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2098 / scrollbar_size ()));
1984 } 2099 }
1985 2100
1986 break; 2101 break;
1987 } 2102 }
1988 } 2103 }
2104
1989 return; 2105 return;
1990 } 2106 }
2107
1991#if MENUBAR 2108#if MENUBAR
1992 /* 2109 /*
1993 * Menubar window processing of button press 2110 * Menubar window processing of button press
1994 */ 2111 */
1995 if (isMenuBarWindow (ev.window)) 2112 if (isMenuBarWindow (ev.window))
… …
2018#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2021#endif 2138#endif
2022 2139
2023 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
2024 { 2141 {
2025#if ISO_14755 2142#if ISO_14755
2026 // 5.4 2143 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2145 return;
… …
2058 if (priv_modes & PrivMode_mouse_report 2175 if (priv_modes & PrivMode_mouse_report
2059 && bypass_keystate 2176 && bypass_keystate
2060 && ev.button == Button1 && MEvent.clicks <= 1) 2177 && ev.button == Button1 && MEvent.clicks <= 1)
2061 selection_extend (ev.x, ev.y, 0); 2178 selection_extend (ev.x, ev.y, 0);
2062 2179
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2063 switch (ev.button) 2183 switch (ev.button)
2064 { 2184 {
2065 case Button1: 2185 case Button1:
2066 case Button3: 2186 case Button3:
2067 selection_make (ev.time); 2187 selection_make (ev.time);
… …
2078 2198
2079 v = ev.button == Button4 ? UP : DN; 2199 v = ev.button == Button4 ? UP : DN;
2080 2200
2081 if (ev.state & ShiftMask) 2201 if (ev.state & ShiftMask)
2082 i = 1; 2202 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2203 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2204 i = nrow - 1;
2085 else 2205 else
2086 i = 5; 2206 i = 5;
2087 2207
2088# ifdef MOUSE_SLIP_WHEELING 2208# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2209 if (ev.state & ControlMask)
2090 { 2210 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2211 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2212 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2213 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2214
2095 if (slip_wheel_ev.at < NOW) 2215 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2216 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2217
2098 slip_wheel_ev.start (); 2218 slip_wheel_ev.start ();
2099 } 2219 }
2100 else 2220 else
2101 { 2221 {
2102# endif 2222# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2223 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2224 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING 2225# ifdef MOUSE_SLIP_WHEELING
2116 } 2226 }
2117#endif 2227# endif
2118 } 2228 }
2119 break; 2229 break;
2120#endif 2230#endif
2121 } 2231 }
2122 } 2232 }
… …
2374 XWindowAttributes wattr, wrootattr; 2484 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2485 dDisp;
2376 2486
2377 pchanged = 0; 2487 pchanged = 0;
2378 2488
2379 if (!(options & Opt_transparent)) 2489 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2381 2491
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2492 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2493 rootdepth = wrootattr.depth;
2384 2494
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2495 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2496
2387 if (rootdepth != wattr.depth) 2497 if (rootdepth != wattr.depth)
2388 { 2498 {
2389 if (am_transparent) 2499 if (am_transparent)
2390 { 2500 {
2391 pchanged = 1; 2501 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2502 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2503 am_transparent = am_pixmap_trans = 0;
2394 } 2504 }
2395 2505
2396 return pchanged; /* Don't try any more */ 2506 return pchanged; /* Don't try any more */
2397 } 2507 }
… …
2438 Window cr; 2548 Window cr;
2439 XImage *image; 2549 XImage *image;
2440 GC gc; 2550 GC gc;
2441 XGCValues gcvalue; 2551 XGCValues gcvalue;
2442 2552
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2553 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2554 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2555 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2556 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2557 nx = ny = 0;
2448 2558
… …
2458 nh += sy; 2568 nh += sy;
2459 ny = -sy; 2569 ny = -sy;
2460 sy = 0; 2570 sy = 0;
2461 } 2571 }
2462 2572
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2573 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2574 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2575
2466 XSync (disp, False); 2576 XSync (disp, False);
2467 allowedxerror = -1; 2577 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2578 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2579
… …
2474 if (image == NULL) 2584 if (image == NULL)
2475 { 2585 {
2476 if (am_transparent && am_pixmap_trans) 2586 if (am_transparent && am_pixmap_trans)
2477 { 2587 {
2478 pchanged = 1; 2588 pchanged = 1;
2479 if (TermWin.pixmap != None) 2589 if (pixmap != None)
2480 { 2590 {
2481 XFreePixmap (disp, TermWin.pixmap); 2591 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2592 pixmap = None;
2483 } 2593 }
2484 } 2594 }
2485 2595
2486 am_pixmap_trans = 0; 2596 am_pixmap_trans = 0;
2487 } 2597 }
2488 else 2598 else
2489 { 2599 {
2490 if (TermWin.pixmap != None) 2600 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2601 XFreePixmap (disp, pixmap);
2492 2602
2493#if TINTING 2603#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2604 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2605 {
2496 unsigned short rm, gm, bm; 2606 unsigned short rm, gm, bm;
… …
2500 2610
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2611 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2612 }
2503#endif 2613#endif
2504 2614
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2615 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2616 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2617 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2618 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2619 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2620 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2621 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2622 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2623 XClearWindow (disp, parent[0]);
2514 2624
2515 if (!am_transparent || !am_pixmap_trans) 2625 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2626 pchanged = 1;
2517 2627
2518 am_transparent = am_pixmap_trans = 1; 2628 am_transparent = am_pixmap_trans = 1;
2519 } 2629 }
2520 } 2630 }
2521 2631
2522 if (am_pixmap_trans) 2632 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2633 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2634 else
2525 { 2635 {
2526 unsigned int n; 2636 unsigned int n;
2527 /* 2637 /*
2528 * InheritPixmap transparency 2638 * InheritPixmap transparency
2529 */ 2639 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2640 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2641 {
2532 oldp = TermWin.parent[i]; 2642 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2643 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2644 &parent[i], &list, &n);
2535 XFree (list); 2645 XFree (list);
2536 2646
2537 if (TermWin.parent[i] == display->root) 2647 if (parent[i] == display->root)
2538 { 2648 {
2539 if (oldp != None) 2649 if (oldp != None)
2540 pchanged = 1; 2650 pchanged = 1;
2541 2651
2542 break; 2652 break;
2543 } 2653 }
2544 2654
2545 if (oldp != TermWin.parent[i]) 2655 if (oldp != parent[i])
2546 pchanged = 1; 2656 pchanged = 1;
2547 } 2657 }
2548 2658
2549 n = 0; 2659 n = 0;
2550 2660
2551 if (pchanged) 2661 if (pchanged)
2552 { 2662 {
2553 for (; n < (unsigned int)i; n++) 2663 for (; n < (unsigned int)i; n++)
2554 { 2664 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2665 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2666 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2667 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2668 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2669 break;
2560 } 2670 }
2561 } 2671 }
2562 } 2672 }
2563 2673
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2674 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2675 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2676 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2677 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2678 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2679 /* XXX: also turn off Opt_transparent? */
2570 } 2680 }
2571 else 2681 else
2572 { 2682 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2685 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2686 sleep (1);
2577#endif 2687#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2688 for (n = 0; n < (unsigned int)i; n++)
2579 { 2689 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2691 XClearWindow (disp, parent[n]);
2582 } 2692 }
2583 2693
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2694 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2695 am_transparent = 1;
2586 } 2696 }
2587 2697
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2698 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2699 parent[i] = None;
2590 } 2700 }
2591 2701
2592 if (scrollBar.win) 2702 if (scrollBar.win)
2593 { 2703 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2704 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2611 2721
2612bool 2722bool
2613rxvt_term::cmd_parse () 2723rxvt_term::cmd_parse ()
2614{ 2724{
2615 bool flag = false; 2725 bool flag = false;
2616 unicode_t ch = NOCHAR; 2726 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2727 char *seq_begin; // remember start of esc-sequence here
2618 2728
2619 for (;;) 2729 for (;;)
2620 { 2730 {
2621 if (ch == NOCHAR) 2731 if (ch == NOCHAR)
2622 { 2732 {
2623 seq_begin = cmdbuf_ptr; 2733 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2734 ch = next_char ();
2625 }
2626 2735
2627 if (ch == NOCHAR) // TODO: improve 2736 if (ch == NOCHAR)
2628 break; 2737 break;
2738 }
2629 2739
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2740 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2741 {
2632 if (!seen_input) 2742 if (!seen_input)
2633 { 2743 {
… …
2642 if (seen_resize && cmd_pid) 2752 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2753 kill (-cmd_pid, SIGWINCH);
2644 } 2754 }
2645 2755
2646 /* Read a text string from the input buffer */ 2756 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2757 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2758 bool refreshnow = false;
2649 int nlines = 0; 2759 int nlines = 0;
2650 unicode_t *str = buf; 2760 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2761 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2762
2653 for (;;) 2763 for (;;)
2654 { 2764 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2765 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2766 break;
… …
2662 if (ch == C0_LF) 2772 if (ch == C0_LF)
2663 nlines++; 2773 nlines++;
2664 2774
2665 refresh_count++; 2775 refresh_count++;
2666 2776
2667 if (!(options & Opt_jumpScroll) 2777 if (!OPTION (Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2778 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2779 {
2670 refreshnow = true; 2780 refreshnow = true;
2781 refresh_count = 0;
2671 ch = NOCHAR; 2782 ch = NOCHAR;
2672 break; 2783 break;
2673 } 2784 }
2674 2785
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2786 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2787 if (nlines >= nrow - 1)
2677 { 2788 {
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2678 scr_add_lines (buf, nlines, str - buf); 2790 scr_add_lines (buf, str - buf, nlines);
2791
2679 nlines = 0; 2792 nlines = 0;
2680 str = buf; 2793 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2794 eol = str + min (ncol, UBUFSIZ);
2682 } 2795 }
2683 2796
2684 if (str >= eol) 2797 if (str >= eol)
2685 { 2798 {
2686 if (eol >= buf + UBUFSIZ) 2799 if (eol >= buf + UBUFSIZ)
2687 { 2800 {
2688 ch = NOCHAR; 2801 ch = NOCHAR;
2689 break; 2802 break;
2690 } 2803 }
2691 else 2804 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2805 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2806 }
2694 2807
2695 } 2808 }
2696 2809
2697 seq_begin = cmdbuf_ptr; 2810 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2811 ch = next_char ();
2699 } 2812 }
2700 2813
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2701 scr_add_lines (buf, nlines, str - buf); 2815 scr_add_lines (buf, str - buf, nlines);
2702 2816
2703 /* 2817 /*
2704 * If there have been a lot of new lines, then update the screen 2818 * If there have been a lot of new lines, then update the screen
2705 * What the heck I'll cheat and only refresh less than every page-full. 2819 * What the heck I'll cheat and only refresh less than every page-full.
2706 * the number of pages between refreshes is refresh_limit, which 2820 * the number of pages between refreshes is refresh_limit, which
2707 * is incremented here because we must be doing flat-out scrolling. 2821 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2822 */
2709 if (refreshnow) 2823 if (refreshnow)
2710 { 2824 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++; 2826 refresh_limit++;
2713 else 2827 else
2714 { 2828 {
2715 flag = true; 2829 flag = true;
2716 scr_refresh (refresh_type); 2830 scr_refresh (refresh_type);
2831 want_refresh = 1;
2717 } 2832 }
2718 } 2833 }
2719 2834
2720 } 2835 }
2721 else 2836 else
… …
2736 } 2851 }
2737 2852
2738 return flag; 2853 return flag;
2739} 2854}
2740 2855
2741// read the next octet
2742unicode_t
2743rxvt_term::next_octet ()
2744{
2745 return cmdbuf_ptr < cmdbuf_endp
2746 ? *cmdbuf_ptr++
2747 : NOCHAR;
2748}
2749
2750// read the next character 2856// read the next character
2751unicode_t 2857wchar_t
2752rxvt_term::next_char () 2858rxvt_term::next_char ()
2753{ 2859{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2860 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2861 {
2756 // assume 7-bit to be ascii ALWAYS 2862 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2864 return *cmdbuf_ptr++;
2759 2865
2760 wchar_t wc; 2866 wchar_t wc;
2761 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2867 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2762 2868
2763 if (len == (size_t)-2) 2869 if (len == (size_t)-2)
2764 { 2870 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2871 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2872 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2873 break;
2768 } 2874 }
2769 2875
2770 if (len == (size_t)-1) 2876 if (len == (size_t)-1)
2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2877 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2772 2878
2773 // assume wchar == unicode 2879 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2880 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2881 return wc & UNICODE_MASK;
2776 } 2882 }
2777 2883
2778 return NOCHAR; 2884 return NOCHAR;
2885}
2886
2887// read the next octet
2888uint32_t
2889rxvt_term::next_octet ()
2890{
2891 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR;
2779} 2894}
2780 2895
2781/* rxvt_cmd_getc () - Return next input character */ 2896/* rxvt_cmd_getc () - Return next input character */
2782/* 2897/*
2783 * Return the next input character after first passing any keyboard input 2898 * Return the next input character after first passing any keyboard input
2784 * to the command. 2899 * to the command.
2785 */ 2900 */
2786unicode_t 2901wchar_t
2787rxvt_term::cmd_getc () 2902rxvt_term::cmd_getc ()
2788{ 2903{
2789 unicode_t c = next_char (); 2904 wchar_t c = next_char ();
2790 2905
2791 if (c == NOCHAR) 2906 if (c == NOCHAR)
2792 throw out_of_input; 2907 throw out_of_input;
2793 2908
2794 return c; 2909 return c;
2795} 2910}
2796 2911
2797unicode_t 2912uint32_t
2798rxvt_term::cmd_get8 () 2913rxvt_term::cmd_get8 ()
2799{ 2914{
2800 unicode_t c = next_octet (); 2915 uint32_t c = next_octet ();
2801 2916
2802 if (c == NOCHAR) 2917 if (c == NOCHAR)
2803 throw out_of_input; 2918 throw out_of_input;
2804 2919
2805 return c; 2920 return c;
… …
2905 case C0_ESC: 3020 case C0_ESC:
2906 process_escape_seq (); 3021 process_escape_seq ();
2907 break; 3022 break;
2908 case C0_ENQ: /* terminal Status */ 3023 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 3024 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3025 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 3026 else
2913 tt_write ((unsigned char *)VT100_ANS, 3027 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 3028 break;
2916 case C0_BEL: /* bell */ 3029 case C0_BEL: /* bell */
2917 scr_bell (); 3030 scr_bell ();
2918 break; 3031 break;
2919 case C0_BS: /* backspace */ 3032 case C0_BS: /* backspace */
… …
3074 break; 3187 break;
3075 3188
3076 /* 8.3.87: NEXT LINE */ 3189 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 3190 case C1_NEL: /* ESC E */
3078 { 3191 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 3192 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 3193 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 3194 }
3082 break; 3195 break;
3083 3196
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 3197 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 3198 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 3220 process_dcs_seq ();
3108 break; 3221 break;
3109 3222
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3223 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 3224 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 3225 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 3226 break; /* steal obsolete ESC [ c */
3115 3227
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3228 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 3229 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 3230 process_csi_seq ();
… …
3358 3470
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3471 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3472 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3473 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3474 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3475 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3476 break;
3365 3477
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3478 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3479 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 3480 break;
3370 3481
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3482 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 3483 process_sgr_mode (nargs, arg);
3373 break; 3484 break;
… …
3380 break; 3491 break;
3381 case 6: /* CPR requested */ 3492 case 6: /* CPR requested */
3382 scr_report_position (); 3493 scr_report_position ();
3383 break; 3494 break;
3384 case 7: /* unofficial extension */ 3495 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 3496 if (OPTION (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3497 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 3498 break;
3388 case 8: /* unofficial extension */ 3499 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3500 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 3501 break;
… …
3493 { 3604 {
3494 /* 3605 /*
3495 * commands 3606 * commands
3496 */ 3607 */
3497 case 1: /* deiconify window */ 3608 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3609 XMapWindow (disp, parent[0]);
3499 break; 3610 break;
3500 case 2: /* iconify window */ 3611 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3612 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3613 break;
3503 case 3: /* set position (pixels) */ 3614 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3615 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3616 break;
3506 case 4: /* set size (pixels) */ 3617 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3618 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3619 break;
3509 case 5: /* raise window */ 3620 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3621 XRaiseWindow (disp, parent[0]);
3511 break; 3622 break;
3512 case 6: /* lower window */ 3623 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3624 XLowerWindow (disp, parent[0]);
3514 break; 3625 break;
3515 case 7: /* refresh window */ 3626 case 7: /* refresh window */
3516 scr_touch (true); 3627 scr_touch (true);
3517 break; 3628 break;
3518 case 8: /* set size (chars) */ 3629 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3630 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3631 (unsigned int) (args[1] * fheight));
3521 break; 3632 break;
3522 3633
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3634 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3635 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3636 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3637 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
3528 break; 3639 break;
3529 3640
3530 3641
3531 /* 3642 /*
3532 * reports - some output format copied from XTerm 3643 * reports - some output format copied from XTerm
3533 */ 3644 */
3534 case 11: /* report window state */ 3645 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3647 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3648 break;
3538 case 13: /* report window position */ 3649 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3650 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3651 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3652 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3653 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3654 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3655 break;
3545 case 14: /* report window size (pixels) */ 3656 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3658 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3659 break;
3549 case 18: /* report text area size (chars) */ 3660 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3661 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3662 break;
3552 case 19: /* report window size (chars) */ 3663 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3664 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3665 break;
3555 case 20: /* report icon label */ 3666 case 20: /* report icon label */
3556 { 3667 {
3557 char *s; 3668 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3669 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3670 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3671 XFree (s);
3561 } 3672 }
3562 break; 3673 break;
3563 case 21: /* report window title */ 3674 case 21: /* report window title */
3564 { 3675 {
3565 char *s; 3676 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3677 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3678 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3679 XFree (s);
3569 } 3680 }
3570 break; 3681 break;
3571 } 3682 }
3572} 3683}
… …
3575/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
3576/* 3687/*
3577 * get input up until STRING TERMINATOR (or BEL) 3688 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3689 * ends_how is terminator used. returned input must be free()'d
3579 */ 3690 */
3580unsigned char * 3691char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3692rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3693{
3583 unicode_t ch; 3694 unicode_t ch;
3584 bool seen_esc = false; 3695 bool seen_esc = false;
3585 unsigned int n = 0; 3696 unsigned int n = 0;
… …
3618 3729
3619 string[n++] = '\0'; 3730 string[n++] = '\0';
3620 3731
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3732 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3733
3623 return (unsigned char *)rxvt_wcstombs (string); 3734 return rxvt_wcstombs (string);
3624} 3735}
3625 3736
3626/*----------------------------------------------------------------------*/ 3737/*----------------------------------------------------------------------*/
3627/* 3738/*
3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3739 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3629 */ 3740 */
3630void 3741void
3631rxvt_term::process_dcs_seq () 3742rxvt_term::process_dcs_seq ()
3632{ 3743{
3633 unsigned char *s; 3744 char *s;
3634 unicode_t eh; 3745 unicode_t eh;
3635 3746
3636 /* 3747 /*
3637 * Not handled yet 3748 * Not handled yet
3638 */ 3749 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3768 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3769 arg = arg * 10 + (ch - '0');
3659 3770
3660 if (ch == ';') 3771 if (ch == ';')
3661 { 3772 {
3662 unsigned char *s = get_to_st (eh); 3773 char *s = get_to_st (eh);
3663 3774
3664 if (s) 3775 if (s)
3665 { 3776 {
3666 process_xterm_seq (arg, (char *)s, eh); 3777 process_xterm_seq (arg, s, eh);
3667 free (s); 3778 free (s);
3668 } 3779 }
3669 } 3780 }
3670} 3781}
3671 3782
3672void 3783void
3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3784rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3674{ 3785{
3675 if (str[0] == '?' && !str[1]) 3786 if (str[0] == '?' && !str[1])
3676 { 3787 {
3677 unsigned short r, g, b; 3788 unsigned short r, g, b;
3678 pix_colors_focused[color].get (display, r, g, b); 3789 pix_colors_focused[color].get (display, r, g, b);
… …
3684 3795
3685/* 3796/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3797 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3798 */
3688void 3799void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3800rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3801{
3691 int changed = 0; 3802 int changed = 0;
3692 int color; 3803 int color;
3693 char *buf, *name; 3804 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3805 bool query = str[0] == '?' && !str[1];
… …
3717 unsigned long bytes_after; 3828 unsigned long bytes_after;
3718 unsigned char *value = 0; 3829 unsigned char *value = 0;
3719 const char *str = ""; 3830 const char *str = "";
3720 3831
3721 if (prop 3832 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3833 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3837 && actual_type != None
3727 && actual_format == 8) 3838 && actual_format == 8)
… …
3739 { 3850 {
3740 *eq = 0; 3851 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3742 } 3853 }
3743 else 3854 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3855 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3856 display->atom (str));
3746 } 3857 }
3747 break; 3858 break;
3748 3859
3749 case XTerm_Color: 3860 case XTerm_Color:
… …
3751 { 3862 {
3752 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3864 break;
3754 3865
3755 *name++ = '\0'; 3866 *name++ = '\0';
3756 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3757 3868
3758 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3870 break;
3760 3871
3761 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3873 *buf++ = '\0';
3763 3874
3764 if (name[0] == '?' && !name[1]) 3875 if (name[0] == '?' && !name[1])
3765 { 3876 {
3766 unsigned short r, g, b; 3877 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3878 pix_colors_focused[color].get (display, r, g, b);
3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 } 3880 }
3770 else 3881 else
3771 set_window_color (color + minCOLOR, name); 3882 set_window_color (color, name);
3772 } 3883 }
3773 break; 3884 break;
3774 case XTerm_Color00: 3885 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3776 break; 3887 break;
3777 case XTerm_Color01: 3888 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3779 break; 3890 break;
3780#ifndef NO_CURSORCOLOR 3891#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3892 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3783 break; 3894 break;
… …
3787 break; 3898 break;
3788 case XTerm_Color_pointer_bg: 3899 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3790 break; 3901 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#ifndef NO_BOLD_UNDERLINE_REVERSE
3792 case XTerm_Color_BD:
3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3794 break;
3795 case XTerm_Color_UL:
3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3797 break;
3798 case XTerm_Color_RV: 3903 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3905 break;
3906 case Rxvt_Color_BD:
3907 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp);
3909 break;
3910 case Rxvt_Color_UL:
3911 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp);
3800 break; 3913 break;
3801 case URxvt_Color_IT: 3914 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3803 break; 3916 break;
3804#endif 3917#endif
… …
3809 if (am_transparent) 3922 if (am_transparent)
3810 want_full_refresh = want_refresh = 1; 3923 want_full_refresh = want_refresh = 1;
3811 break; 3924 break;
3812#endif 3925#endif
3813 3926
3814 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3815 if (*str != ';') 3928 if (*str != ';')
3816 { 3929 {
3817#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3818 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3819 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
3820#endif
3821 scr_touch (true); 3933 scr_touch (true);
3934#endif
3822 } 3935 }
3936
3823 while ((str = strchr (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3824 { 3938 {
3825 str++; 3939 str++;
3826#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3827 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
… …
3830 3944
3831 if (changed) 3945 if (changed)
3832 { 3946 {
3833#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3834 resize_pixmap (); 3948 resize_pixmap ();
3835#endif
3836 scr_touch (true); 3949 scr_touch (true);
3950#endif
3837 } 3951 }
3838 break; 3952 break;
3839 3953
3840 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3842 break; 3956 break;
3843 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3845 break; 3959 break;
3846 3960
3847 case XTerm_logfile: 3961 case XTerm_logfile:
3848 // TODO, when secure mode? 3962 // TODO, when secure mode?
3849 break; 3963 break;
3850 3964
3851#ifdef MENUBAR 3965#ifdef MENUBAR
3852 case URxvt_Menu: 3966 case URxvt_Menu:
3853 if (options & Opt_insecure) 3967 if (OPTION (Opt_insecure))
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break; 3969 break;
3856#endif 3970#endif
3857#if 0 3971#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3972 case Rxvt_dumpscreen: /* no error notices */
3859 { 3973 {
3860 int fd; 3974 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3976 {
3863 scr_dump (fd); 3977 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3988 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3989 case URxvt_boldItalicFont:
3876#endif 3990#endif
3877 if (query) 3991 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3992 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3994 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3995 resp);
3882 else 3996 else
3883 { 3997 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3998 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3999
… …
3890 break; 4004 break;
3891 4005
3892#if ENABLE_FRILLS 4006#if ENABLE_FRILLS
3893 case URxvt_locale: 4007 case URxvt_locale:
3894 if (query) 4008 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3896 else 4010 else
3897 { 4011 {
3898 set_locale (str); 4012 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 4013 pty.set_utf8_mode (enc_utf8);
3900 init_xlocale (); 4014 init_xlocale ();
3901 } 4015 }
3902 break; 4016 break;
3903 4017
3904 case URxvt_view_up: 4018 case URxvt_view_up:
3905 case URxvt_view_down: 4019 case URxvt_view_down:
4020 {
3906 int lines = atoi (str); 4021 int lines = atoi (str);
3907 4022
3908 if (lines) 4023 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 4025 else
3911 {
3912 scr_erase_savelines (); 4026 scr_erase_savelines ();
3913 } 4027 }
3914 4028
4029 break;
4030#endif
4031
4032#if ENABLE_PERL
4033 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035 ; // no responses yet
3915 break; 4036 break;
3916#endif 4037#endif
3917 } 4038 }
3918} 4039}
3919/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
… …
4028 } 4149 }
4029 4150
4030 /* extra handling for values with state unkept */ 4151 /* extra handling for values with state unkept */
4031 switch (arg[i]) 4152 switch (arg[i])
4032 { 4153 {
4154#if ENABLE_STYLES
4155 case 1021:
4156 set_option (Opt_intensityStyles, mode);
4157
4158 scr_touch (true);
4159 break;
4160#endif
4033 case 1048: /* alternative cursor save */ 4161 case 1048: /* alternative cursor save */
4034 case 1049: 4162 case 1049:
4035 if (options & Opt_secondaryScreen) 4163 if (OPTION (Opt_secondaryScreen))
4036 if (mode == 0) 4164 if (mode == 0)
4037 scr_cursor (RESTORE); 4165 scr_cursor (RESTORE);
4038 else if (mode == 1) 4166 else if (mode == 1)
4039 scr_cursor (SAVE); 4167 scr_cursor (SAVE);
4040 break; 4168 break;
… …
4052 */ 4180 */
4053 PrivMode (1, PrivMode_vt52); 4181 PrivMode (1, PrivMode_vt52);
4054 break; 4182 break;
4055 case 3: /* 80/132 */ 4183 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4184 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4185 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4186 break;
4059 case 4: /* smooth scrolling */ 4187 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 4188 set_option (Opt_jumpScroll, !state);
4064 break; 4189 break;
4065 case 5: /* reverse video */ 4190 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 4191 scr_rvideo_mode (state);
4067 break; 4192 break;
4068 case 6: /* relative/absolute origins */ 4193 case 6: /* relative/absolute origins */
… …
4109#if 0 4234#if 0
4110 case 1001: 4235 case 1001:
4111 break; /* X11 mouse highlighting */ 4236 break; /* X11 mouse highlighting */
4112#endif 4237#endif
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 4238 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 4239 set_option (Opt_scrollTtyOutput, !state);
4118 break; 4240 break;
4119 case 1011: /* scroll to bottom on key press */ 4241 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 4242 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 4243 break;
4125 case 1047: /* secondary screen w/ clearing last */ 4244 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 4245 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4246 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4247 scr_erase_screen (2);
4129 scr_change_screen (state); 4248 scr_change_screen (state);
4130 break; 4249 break;
4131 case 1049: /* secondary screen w/ clearing first */ 4250 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 4251 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 4252 if (OPTION (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 4253 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 4254 scr_erase_screen (2);
4136 break; 4255 break;
4137 default: 4256 default:
4138 break; 4257 break;
… …
4266 scr_color (Color_bg, Color_bg); 4385 scr_color (Color_bg, Color_bg);
4267 break; 4386 break;
4268 4387
4269 //case 50: // not variable spacing 4388 //case 50: // not variable spacing
4270 4389
4271#ifndef NO_BRIGHTCOLOR 4390#if ENABLE_FRILLS
4272 case 90: 4391 case 90:
4273 case 91: /* set bright fg color */ 4392 case 91: /* set bright fg color */
4274 case 92: 4393 case 92:
4275 case 93: 4394 case 93:
4276 case 94: 4395 case 94:
… …
4288 case 106: 4407 case 106:
4289 case 107: 4408 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4409 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 4410 break;
4292#endif 4411#endif
4293
4294 } 4412 }
4295 } 4413 }
4296} 4414}
4297/*}}} */ 4415/*}}} */
4298 4416
… …
4322 */ 4440 */
4323void 4441void
4324rxvt_term::tt_printf (const char *fmt,...) 4442rxvt_term::tt_printf (const char *fmt,...)
4325{ 4443{
4326 va_list arg_ptr; 4444 va_list arg_ptr;
4327 unsigned char buf[256]; 4445 char buf[256];
4328 4446
4329 va_start (arg_ptr, fmt); 4447 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4448 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 4449 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 4450 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 4455 * or generated by us in response to a query ESC sequence.
4338 */ 4456 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4457const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 4458
4341void 4459void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4460rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 4461{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return;
4464
4465 if (pty.pty < 0)
4466 return;
4467
4344 if (v_buflen == 0) 4468 if (v_buflen == 0)
4345 { 4469 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4347 4471
4348 if ((unsigned int)written == len) 4472 if ((unsigned int)written == len)
… …
4350 4474
4351 data += written; 4475 data += written;
4352 len -= written; 4476 len -= written;
4353 } 4477 }
4354 4478
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 4480
4357 memcpy (v_buffer + v_buflen, data, len); 4481 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 4482 v_buflen += len;
4359 4483
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 4484 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4379 } 4503 }
4380 4504
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4505 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4506 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4508 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4509}
4387 4510
4388/*----------------------- end-of-file (C source) -----------------------*/ 4511/*----------------------- end-of-file (C source) -----------------------*/
4389 4512

Diff Legend

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