ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC

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

Diff Legend

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