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

Diff Legend

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