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.205 by root, Wed Jul 13 03:11:51 2005 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 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 > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
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 == nsaved ||
1040 TermWin.view_start == 0) 1107 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1108 mouse_slip_wheel_speed = 0;
1042 1109
1043 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1111 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1113 }
1047} 1114}
1048#endif 1115#endif
1049 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1050bool 1135bool
1051rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1052{ 1137{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1139
1055 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1056 { 1141 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1143 n = 0;
1059 } 1144 }
1060 1145
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1064 1149
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1151
1067 if (n > 0) 1152 if (r > 0)
1068 { 1153 {
1069 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1070 return true; 1155 return true;
1071 } 1156 }
1072 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
1073 destroy (); 1169 destroy ();
1170 }
1074 1171
1075 return false; 1172 return false;
1076} 1173}
1077 1174
1078void 1175void
… …
1092} 1189}
1093 1190
1094void 1191void
1095rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
1096{ 1193{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1195 recolour_cursor ();
1099 1196
1100#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1198 hidden_pointer = 0;
1102 1199
1103 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1202#endif
1106} 1203}
1107 1204
1108#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1109void 1206void
1110rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1111{ 1208{
1112 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1113 return; 1210 return;
1114 1211
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1213 XFlush (display->display);
1117 1214
1118 hidden_pointer = 1; 1215 hidden_pointer = 1;
1119} 1216}
1120 1217
… …
1214 dDisp; 1311 dDisp;
1215 1312
1216 SET_R (this); 1313 SET_R (this);
1217 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1218 1315
1219#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1221 { 1318 return;
1222 if (hidden_cursor)
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
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 1319
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
… …
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
1535 case MotionNotify: 1608 case MotionNotify:
1609 printf ("motion notify\n");//D
1536#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1611 if (hidden_pointer)
1538 pointer_unblank (); 1612 pointer_unblank ();
1539#endif 1613#endif
1540#if MENUBAR 1614#if MENUBAR
… …
1545 } 1619 }
1546#endif 1620#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1622 break;
1549 1623
1550 if (ev.xany.window == TermWin.vt) 1624 if (ev.xany.window == vt)
1551 { 1625 {
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1629 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1631 ;
1556 1632
1557 XQueryPointer (disp, TermWin.vt, 1633 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1634 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1636 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1637 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
… …
1574#endif 1650#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1651 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1652 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1653
1578#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1657 {
1582 int dist; 1658 int dist;
1583 1659
1584 /* don't clobber the current delay if we are 1660 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1661 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1669 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1670 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1671 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1672
1597 /* calc number of lines to scroll */ 1673 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1674 if (ev.xbutton.y < int_bwidth)
1599 { 1675 {
1600 scroll_selection_dir = UP; 1676 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1677 dist = int_bwidth - ev.xbutton.y;
1602 } 1678 }
1603 else 1679 else
1604 { 1680 {
1605 scroll_selection_dir = DN; 1681 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1682 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1683 }
1608 1684
1609 scroll_selection_lines = Pixel2Height (dist) 1685 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1686 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1687 + 1;
1612 MIN_IT (scroll_selection_lines, 1688 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1689 SELECTION_SCROLL_MAX_LINES);
1614 } 1690 }
1615 else 1691 else
1616 { 1692 {
1617 /* we are within the text window, so we 1693 /* we are within the text window, so we
… …
1637 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1715 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1717 scrollbar_size ());
1642 scr_refresh (refresh_type); 1718 want_refresh = 1;
1643 refresh_limit = 0; 1719 refresh_limit = 0;
1644 scrollbar_show (1); 1720 scrollbar_show (1);
1645 } 1721 }
1646 break; 1722 break;
1647 } 1723 }
1724
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1729 {
1730 if (hidden_cursor)
1731 {
1732 hidden_cursor = 0;
1733 want_refresh = 1;
1734 }
1735
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1737 }
1738#endif
1739
1740#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 {
1743 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease)
1746 if (hidden_pointer)
1747 pointer_unblank ();
1748
1749 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank ();
1751 }
1752#endif
1648} 1753}
1649 1754
1650void 1755void
1651rxvt_term::focus_in () 1756rxvt_term::focus_in ()
1652{ 1757{
1653 if (!TermWin.focus) 1758 if (!focus)
1654 { 1759 {
1655 TermWin.focus = 1; 1760 focus = 1;
1656 want_refresh = 1; 1761 want_refresh = 1;
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1657#ifdef USE_XIM 1765#if USE_XIM
1658 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1659 { 1767 {
1660 IMSetStatusPosition (); 1768 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1769 XSetICFocus (Input_Context);
1662 } 1770 }
1663#endif 1771#endif
1664#ifdef CURSOR_BLINK 1772#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1773 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1775#endif
1668#ifdef OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
1670 { 1778 {
1671 pix_colors = pix_colors_focused; 1779 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1780 scr_recolour ();
1673 } 1781 }
… …
1676} 1784}
1677 1785
1678void 1786void
1679rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1680{ 1788{
1681 if (TermWin.focus) 1789 if (focus)
1682 { 1790 {
1683 TermWin.focus = 0; 1791 focus = 0;
1684 want_refresh = 1; 1792 want_refresh = 1;
1685 1793
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1795
1686#if ENABLE_FRILLS || ISO_14755 1796#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf)
1798 {
1687 iso14755buf = 0; 1799 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1800# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1801 scr_overlay_off ();
1691#endif 1802# endif
1803 }
1804#endif
1692#ifdef USE_XIM 1805#if USE_XIM
1693 if (Input_Context != NULL) 1806 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1807 XUnsetICFocus (Input_Context);
1695#endif 1808#endif
1696#ifdef CURSOR_BLINK 1809#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1810 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1811 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1812 hidden_cursor = 0;
1700#endif 1813#endif
1701#ifdef OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1703 { 1816 {
1704 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1818 scr_recolour ();
1706 } 1819 }
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1840 return;
1728 1841
1729 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1730 case ReparentNotify: 1843 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1733 break; 1846 break;
1734 } 1847 }
1735} 1848}
1736#endif 1849#endif
… …
1739rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
1740{ 1853{
1741 int reportmode = 0, clickintime; 1854 int reportmode = 0, clickintime;
1742 1855
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1856 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1857
1744 if (!bypass_keystate) 1858 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1859 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1860
1747 /* 1861 /*
1748 * VT window processing of button press 1862 * VT window processing of button press
1749 */ 1863 */
1750 if (ev.window == TermWin.vt) 1864 if (ev.window == vt)
1751 { 1865 {
1752#if ISO_14755 1866#if ISO_14755
1753 // 5.4 1867 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1869 {
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1882#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1883 if (ev.button == MEvent.button && clickintime)
1770 { 1884 {
1771 /* same button, within alloted time */ 1885 /* same button, within alloted time */
1772 MEvent.clicks++; 1886 MEvent.clicks++;
1887
1773 if (MEvent.clicks > 1) 1888 if (MEvent.clicks > 1)
1774 { 1889 {
1775 /* only report double clicks */ 1890 /* only report double clicks */
1776 MEvent.clicks = 2; 1891 MEvent.clicks = 2;
1777 mouse_report (ev); 1892 mouse_report (ev);
… …
1797 else 1912 else
1798 { 1913 {
1799 if (ev.button != MEvent.button) 1914 if (ev.button != MEvent.button)
1800 MEvent.clicks = 0; 1915 MEvent.clicks = 0;
1801 1916
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1802 switch (ev.button) 1918 switch (ev.button)
1803 { 1919 {
1804 case Button1: 1920 case Button1:
1805 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1806 /* should be done in screen.C */ 1922 /* should be done in screen.C */
1807#if ENABLE_FRILLS 1923#if ENABLE_FRILLS
1808 selection.rect = !!(ev.state & ModMetaMask); 1924 selection.rect = !!(ev.state & ModMetaMask);
1809#else 1925#else
1810 selection.rect = false; 1926 selection.rect = false;
1811#endif 1927#endif
1812 1928
1813 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1931 {
1816 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1818 else 1934 else
1819 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1820 } 1936 }
1821 else 1937 else
1822 { 1938 {
1823 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1824 MEvent.clicks++; 1940 MEvent.clicks++;
1825 else 1941 else
1826 MEvent.clicks = 1; 1942 MEvent.clicks = 1;
1827 1943
1828 selection_click (MEvent.clicks, ev.x, ev.y); 1944 selection_click (MEvent.clicks, ev.x, ev.y);
1829 } 1945 }
1830 1946
1831 MEvent.button = Button1; 1947 MEvent.button = Button1;
1832 break; 1948 break;
1833 1949
1834 case Button3: 1950 case Button3:
1835 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1836 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1837 else 1953 else
1838 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1839 1955
1840 MEvent.button = Button3; 1956 MEvent.button = Button3;
1841 break; 1957 break;
1842 } 1958 }
1843 } 1959 }
1844 1960
1845 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1846 return; 1962 return;
1847 } 1963 }
1848 1964
… …
1960 case Button3: 2076 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2077 if (scrollBar.style != R_SB_XTERM)
1962 { 2078 {
1963 if (scrollbar_above_slider (ev.y)) 2079 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2081 scr_page (UP, nrow - 1);
1966# else 2082# else
1967 scr_page (UP, TermWin.nrow / 4); 2083 scr_page (UP, nrow / 4);
1968# endif 2084# endif
1969 else if (scrollbar_below_slider (ev.y)) 2085 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2086# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2087 scr_page (DN, nrow - 1);
1972# else 2088# else
1973 scr_page (DN, TermWin.nrow / 4); 2089 scr_page (DN, nrow / 4);
1974# endif 2090# endif
1975 else 2091 else
1976 scrollBar.setMotion (); 2092 scrollBar.setMotion ();
1977 } 2093 }
1978 else 2094 else
1979 { 2095 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2096 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2097 (nrow
1982 * scrollbar_position (ev.y) 2098 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2099 / scrollbar_size ()));
1984 } 2100 }
1985 2101
1986 break; 2102 break;
1987 } 2103 }
1988 } 2104 }
2105
1989 return; 2106 return;
1990 } 2107 }
2108
1991#if MENUBAR 2109#if MENUBAR
1992 /* 2110 /*
1993 * Menubar window processing of button press 2111 * Menubar window processing of button press
1994 */ 2112 */
1995 if (isMenuBarWindow (ev.window)) 2113 if (isMenuBarWindow (ev.window))
… …
2018#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2137 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2138 sel_scroll_ev.stop();
2021#endif 2139#endif
2022 2140
2023 if (ev.window == TermWin.vt) 2141 if (ev.window == vt)
2024 { 2142 {
2025#if ISO_14755 2143#if ISO_14755
2026 // 5.4 2144 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2146 return;
… …
2058 if (priv_modes & PrivMode_mouse_report 2176 if (priv_modes & PrivMode_mouse_report
2059 && bypass_keystate 2177 && bypass_keystate
2060 && ev.button == Button1 && MEvent.clicks <= 1) 2178 && ev.button == Button1 && MEvent.clicks <= 1)
2061 selection_extend (ev.x, ev.y, 0); 2179 selection_extend (ev.x, ev.y, 0);
2062 2180
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2063 switch (ev.button) 2184 switch (ev.button)
2064 { 2185 {
2065 case Button1: 2186 case Button1:
2066 case Button3: 2187 case Button3:
2067 selection_make (ev.time); 2188 selection_make (ev.time);
… …
2078 2199
2079 v = ev.button == Button4 ? UP : DN; 2200 v = ev.button == Button4 ? UP : DN;
2080 2201
2081 if (ev.state & ShiftMask) 2202 if (ev.state & ShiftMask)
2082 i = 1; 2203 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2204 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2205 i = nrow - 1;
2085 else 2206 else
2086 i = 5; 2207 i = 5;
2087 2208
2088# ifdef MOUSE_SLIP_WHEELING 2209# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2210 if (ev.state & ControlMask)
2090 { 2211 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2212 mouse_slip_wheel_speed += v ? -1 : 1;
2092 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;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2215
2095 if (slip_wheel_ev.at < NOW) 2216 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2218
2098 slip_wheel_ev.start (); 2219 slip_wheel_ev.start ();
2099 } 2220 }
2100 else 2221 else
2101 { 2222 {
2102# endif 2223# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2224 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2225 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 2226# ifdef MOUSE_SLIP_WHEELING
2116 } 2227 }
2117#endif 2228# endif
2118 } 2229 }
2119 break; 2230 break;
2120#endif 2231#endif
2121 } 2232 }
2122 } 2233 }
… …
2374 XWindowAttributes wattr, wrootattr; 2485 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2486 dDisp;
2376 2487
2377 pchanged = 0; 2488 pchanged = 0;
2378 2489
2379 if (!(options & Opt_transparent)) 2490 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2491 return pchanged; /* Don't try any more */
2381 2492
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2493 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2494 rootdepth = wrootattr.depth;
2384 2495
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2496 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2497
2387 if (rootdepth != wattr.depth) 2498 if (rootdepth != wattr.depth)
2388 { 2499 {
2389 if (am_transparent) 2500 if (am_transparent)
2390 { 2501 {
2391 pchanged = 1; 2502 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2504 am_transparent = am_pixmap_trans = 0;
2394 } 2505 }
2395 2506
2396 return pchanged; /* Don't try any more */ 2507 return pchanged; /* Don't try any more */
2397 } 2508 }
… …
2438 Window cr; 2549 Window cr;
2439 XImage *image; 2550 XImage *image;
2440 GC gc; 2551 GC gc;
2441 XGCValues gcvalue; 2552 XGCValues gcvalue;
2442 2553
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2554 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2555 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2556 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2557 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2558 nx = ny = 0;
2448 2559
… …
2458 nh += sy; 2569 nh += sy;
2459 ny = -sy; 2570 ny = -sy;
2460 sy = 0; 2571 sy = 0;
2461 } 2572 }
2462 2573
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2574 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2575 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2576
2466 XSync (disp, False); 2577 XSync (disp, False);
2467 allowedxerror = -1; 2578 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2580
… …
2474 if (image == NULL) 2585 if (image == NULL)
2475 { 2586 {
2476 if (am_transparent && am_pixmap_trans) 2587 if (am_transparent && am_pixmap_trans)
2477 { 2588 {
2478 pchanged = 1; 2589 pchanged = 1;
2479 if (TermWin.pixmap != None) 2590 if (pixmap != None)
2480 { 2591 {
2481 XFreePixmap (disp, TermWin.pixmap); 2592 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2593 pixmap = None;
2483 } 2594 }
2484 } 2595 }
2485 2596
2486 am_pixmap_trans = 0; 2597 am_pixmap_trans = 0;
2487 } 2598 }
2488 else 2599 else
2489 { 2600 {
2490 if (TermWin.pixmap != None) 2601 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2602 XFreePixmap (disp, pixmap);
2492 2603
2493#if TINTING 2604#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2605 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2606 {
2496 unsigned short rm, gm, bm; 2607 unsigned short rm, gm, bm;
… …
2500 2611
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2612 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2613 }
2503#endif 2614#endif
2504 2615
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2616 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2617 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2619 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2620 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2621 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2622 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2624 XClearWindow (disp, parent[0]);
2514 2625
2515 if (!am_transparent || !am_pixmap_trans) 2626 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2627 pchanged = 1;
2517 2628
2518 am_transparent = am_pixmap_trans = 1; 2629 am_transparent = am_pixmap_trans = 1;
2519 } 2630 }
2520 } 2631 }
2521 2632
2522 if (am_pixmap_trans) 2633 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2635 else
2525 { 2636 {
2526 unsigned int n; 2637 unsigned int n;
2527 /* 2638 /*
2528 * InheritPixmap transparency 2639 * InheritPixmap transparency
2529 */ 2640 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2642 {
2532 oldp = TermWin.parent[i]; 2643 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2644 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2645 &parent[i], &list, &n);
2535 XFree (list); 2646 XFree (list);
2536 2647
2537 if (TermWin.parent[i] == display->root) 2648 if (parent[i] == display->root)
2538 { 2649 {
2539 if (oldp != None) 2650 if (oldp != None)
2540 pchanged = 1; 2651 pchanged = 1;
2541 2652
2542 break; 2653 break;
2543 } 2654 }
2544 2655
2545 if (oldp != TermWin.parent[i]) 2656 if (oldp != parent[i])
2546 pchanged = 1; 2657 pchanged = 1;
2547 } 2658 }
2548 2659
2549 n = 0; 2660 n = 0;
2550 2661
2551 if (pchanged) 2662 if (pchanged)
2552 { 2663 {
2553 for (; n < (unsigned int)i; n++) 2664 for (; n < (unsigned int)i; n++)
2554 { 2665 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2666 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2668 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2670 break;
2560 } 2671 }
2561 } 2672 }
2562 } 2673 }
2563 2674
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2675 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2676 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2679 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2680 /* XXX: also turn off Opt_transparent? */
2570 } 2681 }
2571 else 2682 else
2572 { 2683 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2686 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2687 sleep (1);
2577#endif 2688#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2689 for (n = 0; n < (unsigned int)i; n++)
2579 { 2690 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2692 XClearWindow (disp, parent[n]);
2582 } 2693 }
2583 2694
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2696 am_transparent = 1;
2586 } 2697 }
2587 2698
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2700 parent[i] = None;
2590 } 2701 }
2591 2702
2592 if (scrollBar.win) 2703 if (scrollBar.win)
2593 { 2704 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2611 2722
2612bool 2723bool
2613rxvt_term::cmd_parse () 2724rxvt_term::cmd_parse ()
2614{ 2725{
2615 bool flag = false; 2726 bool flag = false;
2616 unicode_t ch = NOCHAR; 2727 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2728 char *seq_begin; // remember start of esc-sequence here
2618 2729
2619 for (;;) 2730 for (;;)
2620 { 2731 {
2621 if (ch == NOCHAR) 2732 if (ch == NOCHAR)
2622 { 2733 {
2623 seq_begin = cmdbuf_ptr; 2734 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2735 ch = next_char ();
2625 }
2626 2736
2627 if (ch == NOCHAR) // TODO: improve 2737 if (ch == NOCHAR)
2628 break; 2738 break;
2739 }
2629 2740
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2742 {
2632 if (!seen_input) 2743 if (!seen_input)
2633 { 2744 {
… …
2642 if (seen_resize && cmd_pid) 2753 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2754 kill (-cmd_pid, SIGWINCH);
2644 } 2755 }
2645 2756
2646 /* Read a text string from the input buffer */ 2757 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2758 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2759 bool refreshnow = false;
2649 int nlines = 0; 2760 int nlines = 0;
2650 unicode_t *str = buf; 2761 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2762 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2763
2653 for (;;) 2764 for (;;)
2654 { 2765 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2767 break;
… …
2662 if (ch == C0_LF) 2773 if (ch == C0_LF)
2663 nlines++; 2774 nlines++;
2664 2775
2665 refresh_count++; 2776 refresh_count++;
2666 2777
2667 if (!(options & Opt_jumpScroll) 2778 if (!OPTION (Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2780 {
2670 refreshnow = true; 2781 refreshnow = true;
2782 refresh_count = 0;
2671 ch = NOCHAR; 2783 ch = NOCHAR;
2672 break; 2784 break;
2673 } 2785 }
2674 2786
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2787 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2788 if (nlines >= nrow - 1)
2677 { 2789 {
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2678 scr_add_lines (buf, nlines, str - buf); 2791 scr_add_lines (buf, str - buf, nlines);
2792
2679 nlines = 0; 2793 nlines = 0;
2680 str = buf; 2794 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2795 eol = str + min (ncol, UBUFSIZ);
2682 } 2796 }
2683 2797
2684 if (str >= eol) 2798 if (str >= eol)
2685 { 2799 {
2686 if (eol >= buf + UBUFSIZ) 2800 if (eol >= buf + UBUFSIZ)
2687 { 2801 {
2688 ch = NOCHAR; 2802 ch = NOCHAR;
2689 break; 2803 break;
2690 } 2804 }
2691 else 2805 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2806 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2807 }
2694 2808
2695 } 2809 }
2696 2810
2697 seq_begin = cmdbuf_ptr; 2811 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2812 ch = next_char ();
2699 } 2813 }
2700 2814
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2701 scr_add_lines (buf, nlines, str - buf); 2816 scr_add_lines (buf, str - buf, nlines);
2702 2817
2703 /* 2818 /*
2704 * If there have been a lot of new lines, then update the screen 2819 * 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. 2820 * 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 2821 * the number of pages between refreshes is refresh_limit, which
2707 * is incremented here because we must be doing flat-out scrolling. 2822 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2823 */
2709 if (refreshnow) 2824 if (refreshnow)
2710 { 2825 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++; 2827 refresh_limit++;
2713 else 2828 else
2714 { 2829 {
2715 flag = true; 2830 flag = true;
2716 scr_refresh (refresh_type); 2831 scr_refresh (refresh_type);
2832 want_refresh = 1;
2717 } 2833 }
2718 } 2834 }
2719 2835
2720 } 2836 }
2721 else 2837 else
… …
2736 } 2852 }
2737 2853
2738 return flag; 2854 return flag;
2739} 2855}
2740 2856
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 2857// read the next character
2751unicode_t 2858wchar_t
2752rxvt_term::next_char () 2859rxvt_term::next_char ()
2753{ 2860{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2861 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2862 {
2756 // assume 7-bit to be ascii ALWAYS 2863 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2865 return *cmdbuf_ptr++;
2759 2866
2760 wchar_t wc; 2867 wchar_t wc;
2761 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2762 2869
2763 if (len == (size_t)-2) 2870 if (len == (size_t)-2)
2764 { 2871 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2872 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2873 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2874 break;
2768 } 2875 }
2769 2876
2770 if (len == (size_t)-1) 2877 if (len == (size_t)-1)
2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2772 2879
2773 // assume wchar == unicode 2880 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2881 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2882 return wc & UNICODE_MASK;
2776 } 2883 }
2777 2884
2778 return NOCHAR; 2885 return NOCHAR;
2886}
2887
2888// read the next octet
2889uint32_t
2890rxvt_term::next_octet ()
2891{
2892 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR;
2779} 2895}
2780 2896
2781/* rxvt_cmd_getc () - Return next input character */ 2897/* rxvt_cmd_getc () - Return next input character */
2782/* 2898/*
2783 * Return the next input character after first passing any keyboard input 2899 * Return the next input character after first passing any keyboard input
2784 * to the command. 2900 * to the command.
2785 */ 2901 */
2786unicode_t 2902wchar_t
2787rxvt_term::cmd_getc () 2903rxvt_term::cmd_getc ()
2788{ 2904{
2789 unicode_t c = next_char (); 2905 wchar_t c = next_char ();
2790 2906
2791 if (c == NOCHAR) 2907 if (c == NOCHAR)
2792 throw out_of_input; 2908 throw out_of_input;
2793 2909
2794 return c; 2910 return c;
2795} 2911}
2796 2912
2797unicode_t 2913uint32_t
2798rxvt_term::cmd_get8 () 2914rxvt_term::cmd_get8 ()
2799{ 2915{
2800 unicode_t c = next_octet (); 2916 uint32_t c = next_octet ();
2801 2917
2802 if (c == NOCHAR) 2918 if (c == NOCHAR)
2803 throw out_of_input; 2919 throw out_of_input;
2804 2920
2805 return c; 2921 return c;
… …
2905 case C0_ESC: 3021 case C0_ESC:
2906 process_escape_seq (); 3022 process_escape_seq ();
2907 break; 3023 break;
2908 case C0_ENQ: /* terminal Status */ 3024 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 3025 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3026 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 3027 else
2913 tt_write ((unsigned char *)VT100_ANS, 3028 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 3029 break;
2916 case C0_BEL: /* bell */ 3030 case C0_BEL: /* bell */
2917 scr_bell (); 3031 scr_bell ();
2918 break; 3032 break;
2919 case C0_BS: /* backspace */ 3033 case C0_BS: /* backspace */
… …
3074 break; 3188 break;
3075 3189
3076 /* 8.3.87: NEXT LINE */ 3190 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 3191 case C1_NEL: /* ESC E */
3078 { 3192 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 3193 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 3195 }
3082 break; 3196 break;
3083 3197
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 3198 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 3199 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 3221 process_dcs_seq ();
3108 break; 3222 break;
3109 3223
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 3225 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 3227 break; /* steal obsolete ESC [ c */
3115 3228
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 3230 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 3231 process_csi_seq ();
… …
3358 3471
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3472 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3473 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3474 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3475 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3476 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3477 break;
3365 3478
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3479 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3480 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 3481 break;
3370 3482
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3483 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 3484 process_sgr_mode (nargs, arg);
3373 break; 3485 break;
… …
3380 break; 3492 break;
3381 case 6: /* CPR requested */ 3493 case 6: /* CPR requested */
3382 scr_report_position (); 3494 scr_report_position ();
3383 break; 3495 break;
3384 case 7: /* unofficial extension */ 3496 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 3497 if (OPTION (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3498 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 3499 break;
3388 case 8: /* unofficial extension */ 3500 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 3502 break;
… …
3493 { 3605 {
3494 /* 3606 /*
3495 * commands 3607 * commands
3496 */ 3608 */
3497 case 1: /* deiconify window */ 3609 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3610 XMapWindow (disp, parent[0]);
3499 break; 3611 break;
3500 case 2: /* iconify window */ 3612 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3613 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3614 break;
3503 case 3: /* set position (pixels) */ 3615 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3616 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3617 break;
3506 case 4: /* set size (pixels) */ 3618 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3620 break;
3509 case 5: /* raise window */ 3621 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3622 XRaiseWindow (disp, parent[0]);
3511 break; 3623 break;
3512 case 6: /* lower window */ 3624 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3625 XLowerWindow (disp, parent[0]);
3514 break; 3626 break;
3515 case 7: /* refresh window */ 3627 case 7: /* refresh window */
3516 scr_touch (true); 3628 scr_touch (true);
3517 break; 3629 break;
3518 case 8: /* set size (chars) */ 3630 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3631 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3632 (unsigned int) (args[1] * fheight));
3521 break; 3633 break;
3522 3634
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3635 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3636 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3637 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3638 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3639 (unsigned int) (args[1] * fheight));
3528 break; 3640 break;
3529 3641
3530 3642
3531 /* 3643 /*
3532 * reports - some output format copied from XTerm 3644 * reports - some output format copied from XTerm
3533 */ 3645 */
3534 case 11: /* report window state */ 3646 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3647 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3649 break;
3538 case 13: /* report window position */ 3650 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3652 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3653 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3654 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3655 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3656 break;
3545 case 14: /* report window size (pixels) */ 3657 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3658 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3660 break;
3549 case 18: /* report text area size (chars) */ 3661 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3662 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3663 break;
3552 case 19: /* report window size (chars) */ 3664 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3665 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3666 break;
3555 case 20: /* report icon label */ 3667 case 20: /* report icon label */
3556 { 3668 {
3557 char *s; 3669 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3670 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3672 XFree (s);
3561 } 3673 }
3562 break; 3674 break;
3563 case 21: /* report window title */ 3675 case 21: /* report window title */
3564 { 3676 {
3565 char *s; 3677 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3678 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3680 XFree (s);
3569 } 3681 }
3570 break; 3682 break;
3571 } 3683 }
3572} 3684}
… …
3575/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3576/* 3688/*
3577 * get input up until STRING TERMINATOR (or BEL) 3689 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3690 * ends_how is terminator used. returned input must be free()'d
3579 */ 3691 */
3580unsigned char * 3692char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3693rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3694{
3583 unicode_t ch; 3695 unicode_t ch;
3584 bool seen_esc = false; 3696 bool seen_esc = false;
3585 unsigned int n = 0; 3697 unsigned int n = 0;
… …
3618 3730
3619 string[n++] = '\0'; 3731 string[n++] = '\0';
3620 3732
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3733 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3734
3623 return (unsigned char *)rxvt_wcstombs (string); 3735 return rxvt_wcstombs (string);
3624} 3736}
3625 3737
3626/*----------------------------------------------------------------------*/ 3738/*----------------------------------------------------------------------*/
3627/* 3739/*
3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3740 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3629 */ 3741 */
3630void 3742void
3631rxvt_term::process_dcs_seq () 3743rxvt_term::process_dcs_seq ()
3632{ 3744{
3633 unsigned char *s; 3745 char *s;
3634 unicode_t eh; 3746 unicode_t eh;
3635 3747
3636 /* 3748 /*
3637 * Not handled yet 3749 * Not handled yet
3638 */ 3750 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3769 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3770 arg = arg * 10 + (ch - '0');
3659 3771
3660 if (ch == ';') 3772 if (ch == ';')
3661 { 3773 {
3662 unsigned char *s = get_to_st (eh); 3774 char *s = get_to_st (eh);
3663 3775
3664 if (s) 3776 if (s)
3665 { 3777 {
3666 process_xterm_seq (arg, (char *)s, eh); 3778 process_xterm_seq (arg, s, eh);
3667 free (s); 3779 free (s);
3668 } 3780 }
3669 } 3781 }
3670} 3782}
3671 3783
3672void 3784void
3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3674{ 3786{
3675 if (str[0] == '?' && !str[1]) 3787 if (str[0] == '?' && !str[1])
3676 { 3788 {
3677 unsigned short r, g, b; 3789 unsigned short r, g, b;
3678 pix_colors_focused[color].get (display, r, g, b); 3790 pix_colors_focused[color].get (display, r, g, b);
… …
3684 3796
3685/* 3797/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3799 */
3688void 3800void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3801rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3802{
3691 int changed = 0; 3803 int changed = 0;
3692 int color; 3804 int color;
3693 char *buf, *name; 3805 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3806 bool query = str[0] == '?' && !str[1];
… …
3717 unsigned long bytes_after; 3829 unsigned long bytes_after;
3718 unsigned char *value = 0; 3830 unsigned char *value = 0;
3719 const char *str = ""; 3831 const char *str = "";
3720 3832
3721 if (prop 3833 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3834 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3835 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3836 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3837 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3838 && actual_type != None
3727 && actual_format == 8) 3839 && actual_format == 8)
… …
3739 { 3851 {
3740 *eq = 0; 3852 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3853 set_utf8_property (display->atom (str), eq + 1);
3742 } 3854 }
3743 else 3855 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3856 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3857 display->atom (str));
3746 } 3858 }
3747 break; 3859 break;
3748 3860
3749 case XTerm_Color: 3861 case XTerm_Color:
… …
3751 { 3863 {
3752 if ((name = strchr (buf, ';')) == NULL) 3864 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3865 break;
3754 3866
3755 *name++ = '\0'; 3867 *name++ = '\0';
3756 color = atoi (buf); 3868 color = atoi (buf) + minCOLOR;
3757 3869
3758 if (color < 0 || color >= TOTAL_COLORS) 3870 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3871 break;
3760 3872
3761 if ((buf = strchr (name, ';')) != NULL) 3873 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3874 *buf++ = '\0';
3763 3875
3764 if (name[0] == '?' && !name[1]) 3876 if (name[0] == '?' && !name[1])
3765 { 3877 {
3766 unsigned short r, g, b; 3878 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3879 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); 3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 } 3881 }
3770 else 3882 else
3771 set_window_color (color + minCOLOR, name); 3883 set_window_color (color, name);
3772 } 3884 }
3773 break; 3885 break;
3774 case XTerm_Color00: 3886 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3776 break; 3888 break;
3777 case XTerm_Color01: 3889 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3779 break; 3891 break;
3780#ifndef NO_CURSORCOLOR 3892#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3893 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3783 break; 3895 break;
… …
3787 break; 3899 break;
3788 case XTerm_Color_pointer_bg: 3900 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3790 break; 3902 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3903#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: 3904 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3800 break; 3914 break;
3801 case URxvt_Color_IT: 3915 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3803 break; 3917 break;
3804#endif 3918#endif
… …
3809 if (am_transparent) 3923 if (am_transparent)
3810 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3811 break; 3925 break;
3812#endif 3926#endif
3813 3927
3814 case XTerm_Pixmap: 3928 case Rxvt_Pixmap:
3815 if (*str != ';') 3929 if (*str != ';')
3816 { 3930 {
3817#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3818 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3819 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3820#endif
3821 scr_touch (true); 3934 scr_touch (true);
3935#endif
3822 } 3936 }
3937
3823 while ((str = strchr (str, ';')) != NULL) 3938 while ((str = strchr (str, ';')) != NULL)
3824 { 3939 {
3825 str++; 3940 str++;
3826#if XPM_BACKGROUND 3941#if XPM_BACKGROUND
3827 changed += scale_pixmap (str); 3942 changed += scale_pixmap (str);
… …
3830 3945
3831 if (changed) 3946 if (changed)
3832 { 3947 {
3833#ifdef XPM_BACKGROUND 3948#ifdef XPM_BACKGROUND
3834 resize_pixmap (); 3949 resize_pixmap ();
3835#endif
3836 scr_touch (true); 3950 scr_touch (true);
3951#endif
3837 } 3952 }
3838 break; 3953 break;
3839 3954
3840 case XTerm_restoreFG: 3955 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3956 set_window_color (Color_fg, str);
3842 break; 3957 break;
3843 case XTerm_restoreBG: 3958 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3959 set_window_color (Color_bg, str);
3845 break; 3960 break;
3846 3961
3847 case XTerm_logfile: 3962 case XTerm_logfile:
3848 // TODO, when secure mode? 3963 // TODO, when secure mode?
3849 break; 3964 break;
3850 3965
3851#ifdef MENUBAR 3966#ifdef MENUBAR
3852 case URxvt_Menu: 3967 case URxvt_Menu:
3853 if (options & Opt_insecure) 3968 if (OPTION (Opt_insecure))
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break; 3970 break;
3856#endif 3971#endif
3857#if 0 3972#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3973 case Rxvt_dumpscreen: /* no error notices */
3859 { 3974 {
3860 int fd; 3975 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3977 {
3863 scr_dump (fd); 3978 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3989 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3990 case URxvt_boldItalicFont:
3876#endif 3991#endif
3877 if (query) 3992 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3993 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3995 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3996 resp);
3882 else 3997 else
3883 { 3998 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3999 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 4000
… …
3890 break; 4005 break;
3891 4006
3892#if ENABLE_FRILLS 4007#if ENABLE_FRILLS
3893 case URxvt_locale: 4008 case URxvt_locale:
3894 if (query) 4009 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3896 else 4011 else
3897 { 4012 {
3898 set_locale (str); 4013 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 4014 pty.set_utf8_mode (enc_utf8);
3900 init_xlocale (); 4015 init_xlocale ();
3901 } 4016 }
3902 break; 4017 break;
3903 4018
3904 case URxvt_view_up: 4019 case URxvt_view_up:
3905 case URxvt_view_down: 4020 case URxvt_view_down:
4021 {
3906 int lines = atoi (str); 4022 int lines = atoi (str);
3907 4023
3908 if (lines) 4024 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 4025 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 4026 else
3911 {
3912 scr_erase_savelines (); 4027 scr_erase_savelines ();
3913 } 4028 }
3914 4029
4030 break;
4031#endif
4032
4033#if ENABLE_PERL
4034 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4036 ; // no responses yet
3915 break; 4037 break;
3916#endif 4038#endif
3917 } 4039 }
3918} 4040}
3919/*----------------------------------------------------------------------*/ 4041/*----------------------------------------------------------------------*/
… …
4028 } 4150 }
4029 4151
4030 /* extra handling for values with state unkept */ 4152 /* extra handling for values with state unkept */
4031 switch (arg[i]) 4153 switch (arg[i])
4032 { 4154 {
4155#if ENABLE_STYLES
4156 case 1021:
4157 set_option (Opt_intensityStyles, mode);
4158
4159 scr_touch (true);
4160 break;
4161#endif
4033 case 1048: /* alternative cursor save */ 4162 case 1048: /* alternative cursor save */
4034 case 1049: 4163 case 1049:
4035 if (options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
4036 if (mode == 0) 4165 if (mode == 0)
4037 scr_cursor (RESTORE); 4166 scr_cursor (RESTORE);
4038 else if (mode == 1) 4167 else if (mode == 1)
4039 scr_cursor (SAVE); 4168 scr_cursor (SAVE);
4040 break; 4169 break;
… …
4052 */ 4181 */
4053 PrivMode (1, PrivMode_vt52); 4182 PrivMode (1, PrivMode_vt52);
4054 break; 4183 break;
4055 case 3: /* 80/132 */ 4184 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4185 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4186 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4187 break;
4059 case 4: /* smooth scrolling */ 4188 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 4189 set_option (Opt_jumpScroll, !state);
4064 break; 4190 break;
4065 case 5: /* reverse video */ 4191 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 4192 scr_rvideo_mode (state);
4067 break; 4193 break;
4068 case 6: /* relative/absolute origins */ 4194 case 6: /* relative/absolute origins */
… …
4109#if 0 4235#if 0
4110 case 1001: 4236 case 1001:
4111 break; /* X11 mouse highlighting */ 4237 break; /* X11 mouse highlighting */
4112#endif 4238#endif
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 4239 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 4240 set_option (Opt_scrollTtyOutput, !state);
4118 break; 4241 break;
4119 case 1011: /* scroll to bottom on key press */ 4242 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 4243 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 4244 break;
4125 case 1047: /* secondary screen w/ clearing last */ 4245 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 4246 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4248 scr_erase_screen (2);
4129 scr_change_screen (state); 4249 scr_change_screen (state);
4130 break; 4250 break;
4131 case 1049: /* secondary screen w/ clearing first */ 4251 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 4252 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 4253 if (OPTION (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 4254 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 4255 scr_erase_screen (2);
4136 break; 4256 break;
4137 default: 4257 default:
4138 break; 4258 break;
… …
4266 scr_color (Color_bg, Color_bg); 4386 scr_color (Color_bg, Color_bg);
4267 break; 4387 break;
4268 4388
4269 //case 50: // not variable spacing 4389 //case 50: // not variable spacing
4270 4390
4271#ifndef NO_BRIGHTCOLOR 4391#if ENABLE_FRILLS
4272 case 90: 4392 case 90:
4273 case 91: /* set bright fg color */ 4393 case 91: /* set bright fg color */
4274 case 92: 4394 case 92:
4275 case 93: 4395 case 93:
4276 case 94: 4396 case 94:
… …
4288 case 106: 4408 case 106:
4289 case 107: 4409 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4410 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 4411 break;
4292#endif 4412#endif
4293
4294 } 4413 }
4295 } 4414 }
4296} 4415}
4297/*}}} */ 4416/*}}} */
4298 4417
… …
4322 */ 4441 */
4323void 4442void
4324rxvt_term::tt_printf (const char *fmt,...) 4443rxvt_term::tt_printf (const char *fmt,...)
4325{ 4444{
4326 va_list arg_ptr; 4445 va_list arg_ptr;
4327 unsigned char buf[256]; 4446 char buf[256];
4328 4447
4329 va_start (arg_ptr, fmt); 4448 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4449 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 4450 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 4451 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 4456 * or generated by us in response to a query ESC sequence.
4338 */ 4457 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 4459
4341void 4460void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4461rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 4462{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return;
4465
4466 if (pty.pty < 0)
4467 return;
4468
4344 if (v_buflen == 0) 4469 if (v_buflen == 0)
4345 { 4470 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4347 4472
4348 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4350 4475
4351 data += written; 4476 data += written;
4352 len -= written; 4477 len -= written;
4353 } 4478 }
4354 4479
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 4481
4357 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 4483 v_buflen += len;
4359 4484
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4379 } 4504 }
4380 4505
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4506 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4507 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4509 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4510}
4387 4511
4388/*----------------------- end-of-file (C source) -----------------------*/ 4512/*----------------------- end-of-file (C source) -----------------------*/
4389 4513

Diff Legend

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