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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
136{ 142{
137 x = Pixel2Col (x); 143 x = Pixel2Col (x);
138 y = Pixel2Row (y); 144 y = Pixel2Row (y);
139 145
140 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
147 155
148 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
149 { 157 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
153 break; 160 break;
154 } 161 }
155 162
156 x--; 163 x--;
157 } 164 }
158
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
175 fname = rxvt_utf8towcs (f->name);
176
171#if ENABLE_COMBINING 177# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
173 { 179 {
174 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
177 } 183 }
178 else 184 else
179#endif 185# endif
180 { 186 {
181 ch2 = ch; 187 ch2 = ch;
182 188
183 alloc = 0; 189 alloc = 0;
184 chr = &ch2; 190 chr = &ch2;
185 len = 1; 191 len = 1;
186 } 192 }
187 193
188 int width = strlen (f->name); 194 char attr[80]; // plenty
189 195
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
191 218
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 220
194 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
195 { 222 {
… …
198 ch = *chr++; 225 ch = *chr++;
199 226
200 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
203#if !UNICODE3 230# if !UNICODE3
204 if (ch >= 0x10000) 231 if (ch >= 0x10000)
205 ch = 0xfffd; 232 ch = 0xfffd;
206#endif 233# endif
207 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
209 } 236 }
210 237
238 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
212 240
241 free (fname);
242
213#if ENABLE_COMBINING 243# if ENABLE_COMBINING
214 if (alloc) 244 if (alloc)
215 delete [] alloc; 245 delete [] alloc;
216#endif 246# endif
217} 247}
218#endif 248#endif
219 249
220void 250void
221rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
238 mb[0] = ch[0]; 268 mb[0] = ch[0];
239 len = 1; 269 len = 1;
240 } 270 }
241 271
242 if (len > 0) 272 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
244 else 274 else
245 scr_bell (); 275 scr_bell ();
246 } 276 }
247 277
248 iso14755buf = 0; 278 iso14755buf = 0;
… …
276 KeySym keysym; 306 KeySym keysym;
277#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
279#endif 309#endif
280 int valid_keysym; 310 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
282 312
283 /* 313 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
286 * 316 *
… …
304 Status status_return; 334 Status status_return;
305 335
306#if 0 336#if 0
307#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
311 else 341 else
312#endif 342#endif
313#endif 343#endif
314 { 344 {
… …
316 346
317 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
321 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
324 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 357 SET_LOCALE (locale);
326 358
327 if (status_return == XLookupChars 359 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
350 } 382 }
351 else 383 else
352#endif 384#endif
353 { 385 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
356 } 388 }
357 389
358 if (valid_keysym) 390 if (valid_keysym)
359 { 391 {
360#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 394 return;
363#endif 395#endif
364 396
365 if (TermWin.saveLines) 397 if (saveLines)
366 { 398 {
367#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 400 if (!ctrl && !meta)
369#else 401#else
370 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
371#endif 403#endif
372 { 404 {
373 int lnsppg; 405 int lnsppg;
374 406
375#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 409#else
378 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
379#endif 411#endif
380 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
381 { 413 {
382 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
383 return; 415 return;
… …
823 { 855 {
824#ifdef META8_OPTION 856#ifdef META8_OPTION
825 /* set 8-bit on */ 857 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
827 { 859 {
828 unsigned char *ch; 860 char *ch;
829 861
830 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 863 *ch |= 0x80;
832 864
833 meta = 0; 865 meta = 0;
… …
835#endif 867#endif
836 /* nil */ ; 868 /* nil */ ;
837 } 869 }
838 } 870 }
839 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
840 if (len <= 0) 875 if (len <= 0)
841 return; /* not mapped */ 876 return; /* not mapped */
842 877
843 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 879 if (view_start)
845 { 880 {
846 TermWin.view_start = 0; 881 view_start = 0;
847 want_refresh = 1; 882 want_refresh = 1;
848 } 883 }
849 884
850 /* 885 /*
851 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 901#ifdef META8_OPTION
867 && meta_char == C0_ESC 902 && meta_char == C0_ESC
868#endif 903#endif
869 ) 904 )
870 { 905 {
871 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
872 tt_write (&ch, 1); 907 tt_write (&ch, 1);
873 } 908 }
874 909
875#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
888 923
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
892unsigned int 927unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 929{
895 unsigned int n, s; 930 unsigned int n, s;
896 931
897 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 970 }
936#endif 971#endif
937 972
938 if (want_refresh) 973 if (want_refresh)
939 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
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
940 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
941 scrollbar_show (1); 1014 scrollbar_show (1);
942#ifdef USE_XIM 1015#ifdef USE_XIM
943 IMSendSpot (); 1016 IMSendSpot ();
944#endif 1017#endif
… …
954 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
955 1028
956 display->flush (); 1029 display->flush ();
957 1030
958 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1033}
961 1034
962void 1035void
963rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
964{ 1037{
… …
1028{ 1101{
1029 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1030 || 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)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1105 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1106 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1107 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1108 mouse_slip_wheel_speed = 0;
1036 1109
1037 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1111 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1113 }
1041} 1114}
1042#endif 1115#endif
1043 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
1044bool 1135bool
1045rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1046{ 1137{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1139
1049 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1050 { 1141 {
1051 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");
1052 n = 0; 1143 n = 0;
1053 } 1144 }
1054 1145
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1058 1149
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1151
1061 if (n > 0) 1152 if (r > 0)
1062 { 1153 {
1063 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1064 return true; 1155 return true;
1065 } 1156 }
1066 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))
1067 destroy (); 1169 destroy ();
1170 }
1068 1171
1069 return false; 1172 return false;
1070} 1173}
1071 1174
1072void 1175void
… …
1086} 1189}
1087 1190
1088void 1191void
1089rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
1090{ 1193{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1195 recolour_cursor ();
1093 1196
1094#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1198 hidden_pointer = 0;
1096 1199
1097 if (options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1202#endif
1100} 1203}
1101 1204
1102#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1103void 1206void
1104rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1105{ 1208{
1106 if (! (options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1107 return; 1210 return;
1108 1211
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1213 XFlush (display->display);
1111 1214
1112 hidden_pointer = 1; 1215 hidden_pointer = 1;
1113} 1216}
1114 1217
… …
1208 dDisp; 1311 dDisp;
1209 1312
1210 SET_R (this); 1313 SET_R (this);
1211 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1212 1315
1213#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1215 { 1318 return;
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 1319
1240 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1322 unsigned int unused_mask;
1243 1323
… …
1251 1331
1252 break; 1332 break;
1253 1333
1254 case KeyRelease: 1334 case KeyRelease:
1255 { 1335 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1257 KeySym ks; 1337 KeySym keysym;
1258 1338
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif 1340#endif
1261 1341
1262#if ENABLE_FRILLS || ISO_14755 1342#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support 1343 // ISO 14755 support
1264 if (iso14755buf) 1344 if (iso14755buf)
… …
1269# endif 1349# endif
1270# if ISO_14755 1350# if ISO_14755
1271 // iso14755 part 5.2 handling: release time 1351 // iso14755 part 5.2 handling: release time
1272 // first: controls 1352 // first: controls
1273 if ((ev.xkey.state & ControlMask) 1353 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f) 1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f))) 1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1276 { 1356 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1278 commit_iso14755 (); 1358 commit_iso14755 ();
1279 return; // case-break; 1359 goto skip_switch;
1280 } 1360 }
1281 1361
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks) 1363 if (i[0] == keysym)
1284 { 1364 {
1285 iso14755buf = ISO_14755_51 | i[1]; 1365 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 (); 1366 commit_iso14755 ();
1287 return; // case-break; 1367 goto skip_switch;
1288 } 1368 }
1289 1369
1290 scr_bell (); 1370 scr_bell ();
1291# endif 1371# endif
1292 iso14755buf = 0; 1372 iso14755buf = 0;
… …
1311 else 1391 else
1312 iso14755buf = 0; 1392 iso14755buf = 0;
1313 } 1393 }
1314#endif 1394#endif
1315 1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop (); 1402 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R) 1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1320 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1321#endif 1405#endif
1322 break; 1406 break;
1323 } 1407 }
1324 1408
… …
1330 button_release (ev.xbutton); 1414 button_release (ev.xbutton);
1331 break; 1415 break;
1332 1416
1333 case ClientMessage: 1417 case ClientMessage:
1334 if (ev.xclient.format == 32 1418 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1420 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1422 destroy ();
1423#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev);
1428#endif
1429 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1337#ifdef OFFIX_DND 1439#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1440 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1442 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1443 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1444 || ev.xclient.data.l[0] == DndLink))
1343 { 1445 {
1344 /* Get Dnd data */ 1446 /* Get Dnd data */
1345 Atom ActualType; 1447 Atom ActualType;
1346 int ActualFormat; 1448 int ActualFormat;
1347 unsigned char *data; 1449 unsigned char *data;
… …
1390 break; 1492 break;
1391 } 1493 }
1392 break; 1494 break;
1393 1495
1394 case FocusIn: 1496 case FocusIn:
1395 if (!TermWin.focus) 1497 focus_in ();
1498 break;
1499
1500 case FocusOut:
1501 focus_out ();
1502 break;
1503
1504 case ConfigureNotify:
1505 if (ev.xconfigure.window == parent[0])
1396 { 1506 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ;
1464 1509
1465 if (szHint.width != width || szHint.height != height) 1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1511 {
1467 seen_resize = 1; 1512 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1514 }
1470 1515
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1517 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1518 check_our_parents ();
1474#endif 1519#endif
1475 } 1520 }
1476 break; 1521 break;
1477 1522
… …
1493 1538
1494 case SelectionRequest: 1539 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1496 break; 1541 break;
1497 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1498 case UnmapNotify: 1551 case UnmapNotify:
1499 TermWin.mapped = 0; 1552 mapped = 0;
1500#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1502#endif 1555#endif
1503 break; 1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505 case MapNotify:
1506 TermWin.mapped = 1;
1507#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif
1510 break; 1557 break;
1511 1558
1512#ifdef TRANSPARENT 1559#ifdef TRANSPARENT
1513 case ReparentNotify: 1560 case ReparentNotify:
1514 rootwin_cb (ev); 1561 rootwin_cb (ev);
1515 break; 1562 break;
1516#endif /* TRANSPARENT */ 1563#endif /* TRANSPARENT */
1517 1564
1518 case GraphicsExpose: 1565 case GraphicsExpose:
1519 case Expose: 1566 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1567 if (ev.xany.window == vt)
1521 { 1568 {
1522 do 1569 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1573
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1575
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1532 1579
1533 scr_refresh (refresh_type); 1580 want_refresh = 1;
1534 } 1581 }
1535 else 1582 else
1536 { 1583 {
1537 XEvent unused_event; 1584 XEvent unused_event;
1538 1585
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1598 menubar_expose ();
1552#endif 1599#endif
1553 1600
1554#ifdef TRANSPARENT 1601#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1602 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1603 XClearWindow (disp, ev.xany.window);
1557#endif 1604#endif
1558 } 1605 }
1559 break; 1606 break;
1560 1607
1561 case MotionNotify: 1608 case MotionNotify:
1609 printf ("motion notify\n");//D
1562#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1611 if (hidden_pointer)
1564 pointer_unblank (); 1612 pointer_unblank ();
1565#endif 1613#endif
1566#if MENUBAR 1614#if MENUBAR
… …
1571 } 1619 }
1572#endif 1620#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1622 break;
1575 1623
1576 if (ev.xany.window == TermWin.vt) 1624 if (ev.xany.window == vt)
1577 { 1625 {
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1629 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1631 ;
1582 1632
1583 XQueryPointer (disp, TermWin.vt, 1633 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1634 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1636 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1637 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
… …
1600#endif 1650#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1651 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1652 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1653
1604#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1657 {
1608 int dist; 1658 int dist;
1609 1659
1610 /* don't clobber the current delay if we are 1660 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1661 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1669 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1670 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1671 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1672
1623 /* calc number of lines to scroll */ 1673 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1674 if (ev.xbutton.y < int_bwidth)
1625 { 1675 {
1626 scroll_selection_dir = UP; 1676 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1677 dist = int_bwidth - ev.xbutton.y;
1628 } 1678 }
1629 else 1679 else
1630 { 1680 {
1631 scroll_selection_dir = DN; 1681 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1682 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1683 }
1634 1684
1635 scroll_selection_lines = Pixel2Height (dist) 1685 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1686 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1687 + 1;
1638 MIN_IT (scroll_selection_lines, 1688 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1689 SELECTION_SCROLL_MAX_LINES);
1640 } 1690 }
1641 else 1691 else
1642 { 1692 {
1643 /* we are within the text window, so we 1693 /* we are within the text window, so we
… …
1663 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1715 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1717 scrollbar_size ());
1668 scr_refresh (refresh_type); 1718 want_refresh = 1;
1669 refresh_limit = 0; 1719 refresh_limit = 0;
1670 scrollbar_show (1); 1720 scrollbar_show (1);
1671 } 1721 }
1672 break; 1722 break;
1723 }
1724
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1729 {
1730 if (hidden_cursor)
1731 {
1732 hidden_cursor = 0;
1733 want_refresh = 1;
1734 }
1735
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1737 }
1738#endif
1739
1740#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 {
1743 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease)
1746 if (hidden_pointer)
1747 pointer_unblank ();
1748
1749 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank ();
1751 }
1752#endif
1753}
1754
1755void
1756rxvt_term::focus_in ()
1757{
1758 if (!focus)
1759 {
1760 focus = 1;
1761 want_refresh = 1;
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1765#if USE_XIM
1766 if (Input_Context != NULL)
1767 {
1768 IMSetStatusPosition ();
1769 XSetICFocus (Input_Context);
1770 }
1771#endif
1772#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1775#endif
1776#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade])
1778 {
1779 pix_colors = pix_colors_focused;
1780 scr_recolour ();
1781 }
1782#endif
1783 }
1784}
1785
1786void
1787rxvt_term::focus_out ()
1788{
1789 if (focus)
1790 {
1791 focus = 0;
1792 want_refresh = 1;
1793
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1795
1796#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf)
1798 {
1799 iso14755buf = 0;
1800# if ENABLE_OVERLAY
1801 scr_overlay_off ();
1802# endif
1803 }
1804#endif
1805#if USE_XIM
1806 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context);
1808#endif
1809#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink))
1811 cursor_blink_ev.stop ();
1812 hidden_cursor = 0;
1813#endif
1814#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade])
1816 {
1817 pix_colors = pix_colors_unfocused;
1818 scr_recolour ();
1819 }
1820#endif
1673 } 1821 }
1674} 1822}
1675 1823
1676#if TRANSPARENT 1824#if TRANSPARENT
1677void 1825void
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1840 return;
1693 1841
1694 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1695 case ReparentNotify: 1843 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1698 break; 1846 break;
1699 } 1847 }
1700} 1848}
1701#endif 1849#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
1705{ 1853{
1706 int reportmode = 0, clickintime; 1854 int reportmode = 0, clickintime;
1707 1855
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1856 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1857
1709 if (!bypass_keystate) 1858 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1859 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1860
1712 /* 1861 /*
1713 * VT window processing of button press 1862 * VT window processing of button press
1714 */ 1863 */
1715 if (ev.window == TermWin.vt) 1864 if (ev.window == vt)
1716 { 1865 {
1717#if ISO_14755 1866#if ISO_14755
1718 // 5.4 1867 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1869 {
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1882#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1883 if (ev.button == MEvent.button && clickintime)
1735 { 1884 {
1736 /* same button, within alloted time */ 1885 /* same button, within alloted time */
1737 MEvent.clicks++; 1886 MEvent.clicks++;
1887
1738 if (MEvent.clicks > 1) 1888 if (MEvent.clicks > 1)
1739 { 1889 {
1740 /* only report double clicks */ 1890 /* only report double clicks */
1741 MEvent.clicks = 2; 1891 MEvent.clicks = 2;
1742 mouse_report (ev); 1892 mouse_report (ev);
… …
1762 else 1912 else
1763 { 1913 {
1764 if (ev.button != MEvent.button) 1914 if (ev.button != MEvent.button)
1765 MEvent.clicks = 0; 1915 MEvent.clicks = 0;
1766 1916
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1767 switch (ev.button) 1918 switch (ev.button)
1768 { 1919 {
1769 case Button1: 1920 case Button1:
1770 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */ 1922 /* should be done in screen.C */
1772#if ENABLE_FRILLS 1923#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask); 1924 selection.rect = !!(ev.state & ModMetaMask);
1774#else 1925#else
1775 selection.rect = false; 1926 selection.rect = false;
1776#endif 1927#endif
1777 1928
1778 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1931 {
1781 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1783 else 1934 else
1784 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1785 } 1936 }
1786 else 1937 else
1787 { 1938 {
1788 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1789 MEvent.clicks++; 1940 MEvent.clicks++;
1790 else 1941 else
1791 MEvent.clicks = 1; 1942 MEvent.clicks = 1;
1792 1943
1793 selection_click (MEvent.clicks, ev.x, ev.y); 1944 selection_click (MEvent.clicks, ev.x, ev.y);
1794 } 1945 }
1795 1946
1796 MEvent.button = Button1; 1947 MEvent.button = Button1;
1797 break; 1948 break;
1798 1949
1799 case Button3: 1950 case Button3:
1800 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1801 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1802 else 1953 else
1803 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1804 1955
1805 MEvent.button = Button3; 1956 MEvent.button = Button3;
1806 break; 1957 break;
1807 } 1958 }
1808 } 1959 }
1809 1960
1810 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1811 return; 1962 return;
1812 } 1963 }
1813 1964
… …
1925 case Button3: 2076 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2077 if (scrollBar.style != R_SB_XTERM)
1927 { 2078 {
1928 if (scrollbar_above_slider (ev.y)) 2079 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2081 scr_page (UP, nrow - 1);
1931# else 2082# else
1932 scr_page (UP, TermWin.nrow / 4); 2083 scr_page (UP, nrow / 4);
1933# endif 2084# endif
1934 else if (scrollbar_below_slider (ev.y)) 2085 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2086# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2087 scr_page (DN, nrow - 1);
1937# else 2088# else
1938 scr_page (DN, TermWin.nrow / 4); 2089 scr_page (DN, nrow / 4);
1939# endif 2090# endif
1940 else 2091 else
1941 scrollBar.setMotion (); 2092 scrollBar.setMotion ();
1942 } 2093 }
1943 else 2094 else
1944 { 2095 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2096 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2097 (nrow
1947 * scrollbar_position (ev.y) 2098 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2099 / scrollbar_size ()));
1949 } 2100 }
1950 2101
1951 break; 2102 break;
1952 } 2103 }
1953 } 2104 }
2105
1954 return; 2106 return;
1955 } 2107 }
2108
1956#if MENUBAR 2109#if MENUBAR
1957 /* 2110 /*
1958 * Menubar window processing of button press 2111 * Menubar window processing of button press
1959 */ 2112 */
1960 if (isMenuBarWindow (ev.window)) 2113 if (isMenuBarWindow (ev.window))
… …
1983#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2137 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2138 sel_scroll_ev.stop();
1986#endif 2139#endif
1987 2140
1988 if (ev.window == TermWin.vt) 2141 if (ev.window == vt)
1989 { 2142 {
1990#if ISO_14755 2143#if ISO_14755
1991 // 5.4 2144 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2146 return;
… …
2023 if (priv_modes & PrivMode_mouse_report 2176 if (priv_modes & PrivMode_mouse_report
2024 && bypass_keystate 2177 && bypass_keystate
2025 && ev.button == Button1 && MEvent.clicks <= 1) 2178 && ev.button == Button1 && MEvent.clicks <= 1)
2026 selection_extend (ev.x, ev.y, 0); 2179 selection_extend (ev.x, ev.y, 0);
2027 2180
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2028 switch (ev.button) 2184 switch (ev.button)
2029 { 2185 {
2030 case Button1: 2186 case Button1:
2031 case Button3: 2187 case Button3:
2032 selection_make (ev.time); 2188 selection_make (ev.time);
… …
2043 2199
2044 v = ev.button == Button4 ? UP : DN; 2200 v = ev.button == Button4 ? UP : DN;
2045 2201
2046 if (ev.state & ShiftMask) 2202 if (ev.state & ShiftMask)
2047 i = 1; 2203 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2204 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2205 i = nrow - 1;
2050 else 2206 else
2051 i = 5; 2207 i = 5;
2052 2208
2053# ifdef MOUSE_SLIP_WHEELING 2209# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2210 if (ev.state & ControlMask)
2055 { 2211 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2212 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2215
2060 if (slip_wheel_ev.at < NOW) 2216 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2218
2063 slip_wheel_ev.start (); 2219 slip_wheel_ev.start ();
2064 } 2220 }
2065 else 2221 else
2066 { 2222 {
2067# endif 2223# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2224 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2225 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2081 } 2227 }
2082#endif 2228# endif
2083 } 2229 }
2084 break; 2230 break;
2085#endif 2231#endif
2086 } 2232 }
2087 } 2233 }
… …
2339 XWindowAttributes wattr, wrootattr; 2485 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2486 dDisp;
2341 2487
2342 pchanged = 0; 2488 pchanged = 0;
2343 2489
2344 if (!(options & Opt_transparent)) 2490 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2491 return pchanged; /* Don't try any more */
2346 2492
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2493 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2494 rootdepth = wrootattr.depth;
2349 2495
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2496 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2497
2352 if (rootdepth != wattr.depth) 2498 if (rootdepth != wattr.depth)
2353 { 2499 {
2354 if (am_transparent) 2500 if (am_transparent)
2355 { 2501 {
2356 pchanged = 1; 2502 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2504 am_transparent = am_pixmap_trans = 0;
2359 } 2505 }
2360 2506
2361 return pchanged; /* Don't try any more */ 2507 return pchanged; /* Don't try any more */
2362 } 2508 }
… …
2403 Window cr; 2549 Window cr;
2404 XImage *image; 2550 XImage *image;
2405 GC gc; 2551 GC gc;
2406 XGCValues gcvalue; 2552 XGCValues gcvalue;
2407 2553
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2554 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2555 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2556 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2557 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2558 nx = ny = 0;
2413 2559
… …
2423 nh += sy; 2569 nh += sy;
2424 ny = -sy; 2570 ny = -sy;
2425 sy = 0; 2571 sy = 0;
2426 } 2572 }
2427 2573
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2574 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2575 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2576
2431 XSync (disp, False); 2577 XSync (disp, False);
2432 allowedxerror = -1; 2578 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2580
… …
2439 if (image == NULL) 2585 if (image == NULL)
2440 { 2586 {
2441 if (am_transparent && am_pixmap_trans) 2587 if (am_transparent && am_pixmap_trans)
2442 { 2588 {
2443 pchanged = 1; 2589 pchanged = 1;
2444 if (TermWin.pixmap != None) 2590 if (pixmap != None)
2445 { 2591 {
2446 XFreePixmap (disp, TermWin.pixmap); 2592 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2593 pixmap = None;
2448 } 2594 }
2449 } 2595 }
2450 2596
2451 am_pixmap_trans = 0; 2597 am_pixmap_trans = 0;
2452 } 2598 }
2453 else 2599 else
2454 { 2600 {
2455 if (TermWin.pixmap != None) 2601 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2602 XFreePixmap (disp, pixmap);
2457 2603
2458#if TINTING 2604#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2605 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2606 {
2461 unsigned short rm, gm, bm; 2607 unsigned short rm, gm, bm;
… …
2465 2611
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2612 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2613 }
2468#endif 2614#endif
2469 2615
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2616 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2617 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2619 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2620 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2621 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2622 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2624 XClearWindow (disp, parent[0]);
2479 2625
2480 if (!am_transparent || !am_pixmap_trans) 2626 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2627 pchanged = 1;
2482 2628
2483 am_transparent = am_pixmap_trans = 1; 2629 am_transparent = am_pixmap_trans = 1;
2484 } 2630 }
2485 } 2631 }
2486 2632
2487 if (am_pixmap_trans) 2633 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2635 else
2490 { 2636 {
2491 unsigned int n; 2637 unsigned int n;
2492 /* 2638 /*
2493 * InheritPixmap transparency 2639 * InheritPixmap transparency
2494 */ 2640 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2642 {
2497 oldp = TermWin.parent[i]; 2643 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2644 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2645 &parent[i], &list, &n);
2500 XFree (list); 2646 XFree (list);
2501 2647
2502 if (TermWin.parent[i] == display->root) 2648 if (parent[i] == display->root)
2503 { 2649 {
2504 if (oldp != None) 2650 if (oldp != None)
2505 pchanged = 1; 2651 pchanged = 1;
2506 2652
2507 break; 2653 break;
2508 } 2654 }
2509 2655
2510 if (oldp != TermWin.parent[i]) 2656 if (oldp != parent[i])
2511 pchanged = 1; 2657 pchanged = 1;
2512 } 2658 }
2513 2659
2514 n = 0; 2660 n = 0;
2515 2661
2516 if (pchanged) 2662 if (pchanged)
2517 { 2663 {
2518 for (; n < (unsigned int)i; n++) 2664 for (; n < (unsigned int)i; n++)
2519 { 2665 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2666 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2668 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2670 break;
2525 } 2671 }
2526 } 2672 }
2527 } 2673 }
2528 2674
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2675 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2676 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2679 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2680 /* XXX: also turn off Opt_transparent? */
2535 } 2681 }
2536 else 2682 else
2537 { 2683 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2686 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2687 sleep (1);
2542#endif 2688#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2689 for (n = 0; n < (unsigned int)i; n++)
2544 { 2690 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2692 XClearWindow (disp, parent[n]);
2547 } 2693 }
2548 2694
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2696 am_transparent = 1;
2551 } 2697 }
2552 2698
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2700 parent[i] = None;
2555 } 2701 }
2556 2702
2557 if (scrollBar.win) 2703 if (scrollBar.win)
2558 { 2704 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2576 2722
2577bool 2723bool
2578rxvt_term::cmd_parse () 2724rxvt_term::cmd_parse ()
2579{ 2725{
2580 bool flag = false; 2726 bool flag = false;
2581 unicode_t ch = NOCHAR; 2727 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2728 char *seq_begin; // remember start of esc-sequence here
2583 2729
2584 for (;;) 2730 for (;;)
2585 { 2731 {
2586 if (ch == NOCHAR) 2732 if (ch == NOCHAR)
2587 { 2733 {
2588 seq_begin = cmdbuf_ptr; 2734 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2735 ch = next_char ();
2590 }
2591 2736
2592 if (ch == NOCHAR) // TODO: improve 2737 if (ch == NOCHAR)
2593 break; 2738 break;
2739 }
2594 2740
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2742 {
2597 if (!seen_input) 2743 if (!seen_input)
2598 { 2744 {
… …
2602 // some window managers resize the window early, and these programs 2748 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2749 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2750 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2751 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2752 // resized.
2607 if (seen_resize) 2753 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2754 kill (-cmd_pid, SIGWINCH);
2609 } 2755 }
2610 2756
2611 /* Read a text string from the input buffer */ 2757 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2758 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2759 bool refreshnow = false;
2614 int nlines = 0; 2760 int nlines = 0;
2615 unicode_t *str = buf; 2761 wchar_t *str = buf;
2762 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2763
2617 for (;;) 2764 for (;;)
2618 { 2765 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2767 break;
2621 2768
2622 *str++ = ch; 2769 *str++ = ch;
2623 2770
2624 if (ch == C0_LF) 2771 if (ch == C0_LF || str >= eol)
2625 { 2772 {
2773 if (ch == C0_LF)
2626 nlines++; 2774 nlines++;
2775
2627 refresh_count++; 2776 refresh_count++;
2628 2777
2629 if (!(options & Opt_jumpScroll) 2778 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2780 {
2632 refreshnow = true; 2781 refreshnow = true;
2782 refresh_count = 0;
2633 ch = NOCHAR; 2783 ch = NOCHAR;
2634 break; 2784 break;
2635 } 2785 }
2636 2786
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2787 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2788 if (nlines >= nrow - 1)
2639 { 2789 {
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2640 scr_add_lines (buf, nlines, str - buf); 2791 scr_add_lines (buf, str - buf, nlines);
2792
2641 nlines = 0; 2793 nlines = 0;
2642 str = buf; 2794 str = buf;
2795 eol = str + min (ncol, UBUFSIZ);
2643 } 2796 }
2644 }
2645 2797
2646 if (str >= buf + UBUFSIZ) 2798 if (str >= eol)
2647 { 2799 {
2800 if (eol >= buf + UBUFSIZ)
2801 {
2648 ch = NOCHAR; 2802 ch = NOCHAR;
2649 break; 2803 break;
2804 }
2805 else
2806 eol = min (eol + ncol, buf + UBUFSIZ);
2807 }
2808
2650 } 2809 }
2651 2810
2652 seq_begin = cmdbuf_ptr; 2811 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2812 ch = next_char ();
2654 } 2813 }
2655 2814
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2656 scr_add_lines (buf, nlines, str - buf); 2816 scr_add_lines (buf, str - buf, nlines);
2657 2817
2658 /* 2818 /*
2659 * If there have been a lot of new lines, then update the screen 2819 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full. 2820 * What the heck I'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which 2821 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2822 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2823 */
2664 if (refreshnow) 2824 if (refreshnow)
2665 { 2825 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2827 refresh_limit++;
2668 else 2828 else
2669 { 2829 {
2670 flag = true; 2830 flag = true;
2671 scr_refresh (refresh_type); 2831 scr_refresh (refresh_type);
2832 want_refresh = 1;
2672 } 2833 }
2673 } 2834 }
2674 2835
2675 } 2836 }
2676 else 2837 else
… …
2691 } 2852 }
2692 2853
2693 return flag; 2854 return flag;
2694} 2855}
2695 2856
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character 2857// read the next character
2706unicode_t 2858wchar_t
2707rxvt_term::next_char () 2859rxvt_term::next_char ()
2708{ 2860{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2861 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2862 {
2711 // assume 7-bit to be ascii ALWAYS 2863 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2865 return *cmdbuf_ptr++;
2714 2866
2715 wchar_t wc; 2867 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2869
2718 if (len == (size_t)-2) 2870 if (len == (size_t)-2)
2719 { 2871 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2872 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2873 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2874 break;
2723 } 2875 }
2724 2876
2725 if (len == (size_t)-1) 2877 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2879
2728 // assume wchar == unicode 2880 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2881 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2882 return wc & UNICODE_MASK;
2731 } 2883 }
2732 2884
2733 return NOCHAR; 2885 return NOCHAR;
2886}
2887
2888// read the next octet
2889uint32_t
2890rxvt_term::next_octet ()
2891{
2892 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR;
2734} 2895}
2735 2896
2736/* rxvt_cmd_getc () - Return next input character */ 2897/* rxvt_cmd_getc () - Return next input character */
2737/* 2898/*
2738 * Return the next input character after first passing any keyboard input 2899 * Return the next input character after first passing any keyboard input
2739 * to the command. 2900 * to the command.
2740 */ 2901 */
2741unicode_t 2902wchar_t
2742rxvt_term::cmd_getc () 2903rxvt_term::cmd_getc ()
2743{ 2904{
2744 unicode_t c = next_char (); 2905 wchar_t c = next_char ();
2745 2906
2746 if (c == NOCHAR) 2907 if (c == NOCHAR)
2747 throw out_of_input; 2908 throw out_of_input;
2748 2909
2749 return c; 2910 return c;
2750} 2911}
2751 2912
2752unicode_t 2913uint32_t
2753rxvt_term::cmd_get8 () 2914rxvt_term::cmd_get8 ()
2754{ 2915{
2755 unicode_t c = next_octet (); 2916 uint32_t c = next_octet ();
2756 2917
2757 if (c == NOCHAR) 2918 if (c == NOCHAR)
2758 throw out_of_input; 2919 throw out_of_input;
2759 2920
2760 return c; 2921 return c;
… …
2860 case C0_ESC: 3021 case C0_ESC:
2861 process_escape_seq (); 3022 process_escape_seq ();
2862 break; 3023 break;
2863 case C0_ENQ: /* terminal Status */ 3024 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 3025 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3026 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 3027 else
2868 tt_write ((unsigned char *)VT100_ANS, 3028 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 3029 break;
2871 case C0_BEL: /* bell */ 3030 case C0_BEL: /* bell */
2872 scr_bell (); 3031 scr_bell ();
2873 break; 3032 break;
2874 case C0_BS: /* backspace */ 3033 case C0_BS: /* backspace */
… …
3029 break; 3188 break;
3030 3189
3031 /* 8.3.87: NEXT LINE */ 3190 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3191 case C1_NEL: /* ESC E */
3033 { 3192 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3193 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3195 }
3037 break; 3196 break;
3038 3197
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3198 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3199 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3221 process_dcs_seq ();
3063 break; 3222 break;
3064 3223
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3225 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3227 break; /* steal obsolete ESC [ c */
3070 3228
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3230 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3231 process_csi_seq ();
… …
3313 3471
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3472 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3473 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3474 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3475 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3476 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3477 break;
3320 3478
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3479 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3480 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3481 break;
3325 3482
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3483 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3484 process_sgr_mode (nargs, arg);
3328 break; 3485 break;
… …
3335 break; 3492 break;
3336 case 6: /* CPR requested */ 3493 case 6: /* CPR requested */
3337 scr_report_position (); 3494 scr_report_position ();
3338 break; 3495 break;
3339 case 7: /* unofficial extension */ 3496 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3497 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3498 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3499 break;
3343 case 8: /* unofficial extension */ 3500 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3502 break;
… …
3448 { 3605 {
3449 /* 3606 /*
3450 * commands 3607 * commands
3451 */ 3608 */
3452 case 1: /* deiconify window */ 3609 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3610 XMapWindow (disp, parent[0]);
3454 break; 3611 break;
3455 case 2: /* iconify window */ 3612 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3613 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3614 break;
3458 case 3: /* set position (pixels) */ 3615 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3616 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3617 break;
3461 case 4: /* set size (pixels) */ 3618 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3620 break;
3464 case 5: /* raise window */ 3621 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3622 XRaiseWindow (disp, parent[0]);
3466 break; 3623 break;
3467 case 6: /* lower window */ 3624 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3625 XLowerWindow (disp, parent[0]);
3469 break; 3626 break;
3470 case 7: /* refresh window */ 3627 case 7: /* refresh window */
3471 scr_touch (true); 3628 scr_touch (true);
3472 break; 3629 break;
3473 case 8: /* set size (chars) */ 3630 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3631 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3632 (unsigned int) (args[1] * fheight));
3476 break; 3633 break;
3477 3634
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3635 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3636 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3637 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3638 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3639 (unsigned int) (args[1] * fheight));
3483 break; 3640 break;
3484 3641
3485 3642
3486 /* 3643 /*
3487 * reports - some output format copied from XTerm 3644 * reports - some output format copied from XTerm
3488 */ 3645 */
3489 case 11: /* report window state */ 3646 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3647 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3649 break;
3493 case 13: /* report window position */ 3650 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3652 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3653 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3654 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3655 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3656 break;
3500 case 14: /* report window size (pixels) */ 3657 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3658 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3660 break;
3504 case 18: /* report text area size (chars) */ 3661 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3662 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3663 break;
3507 case 19: /* report window size (chars) */ 3664 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3665 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3666 break;
3510 case 20: /* report icon label */ 3667 case 20: /* report icon label */
3511 { 3668 {
3512 char *s; 3669 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3670 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3672 XFree (s);
3516 } 3673 }
3517 break; 3674 break;
3518 case 21: /* report window title */ 3675 case 21: /* report window title */
3519 { 3676 {
3520 char *s; 3677 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3678 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3680 XFree (s);
3524 } 3681 }
3525 break; 3682 break;
3526 } 3683 }
3527} 3684}
… …
3530/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3531/* 3688/*
3532 * get input up until STRING TERMINATOR (or BEL) 3689 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3690 * ends_how is terminator used. returned input must be free()'d
3534 */ 3691 */
3535unsigned char * 3692char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3693rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3694{
3538 unicode_t ch; 3695 unicode_t ch;
3539 bool seen_esc = false; 3696 bool seen_esc = false;
3540 unsigned int n = 0; 3697 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3716 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3717 return NULL; /* other control character - exit */
3561 3718
3562 seen_esc = false; 3719 seen_esc = false;
3563 3720
3564 if (n >= sizeof (string) - 1) 3721 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3722 // stop at some sane length
3566 return NULL; 3723 return NULL;
3567 3724
3568 if (ch == C0_SYN) 3725 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3726 string[n++] = cmd_get8 ();
… …
3573 3730
3574 string[n++] = '\0'; 3731 string[n++] = '\0';
3575 3732
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3733 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3734
3578 return (unsigned char *)rxvt_wcstombs (string); 3735 return rxvt_wcstombs (string);
3579} 3736}
3580 3737
3581/*----------------------------------------------------------------------*/ 3738/*----------------------------------------------------------------------*/
3582/* 3739/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3740 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3741 */
3585void 3742void
3586rxvt_term::process_dcs_seq () 3743rxvt_term::process_dcs_seq ()
3587{ 3744{
3588 unsigned char *s; 3745 char *s;
3589 unicode_t eh; 3746 unicode_t eh;
3590 3747
3591 /* 3748 /*
3592 * Not handled yet 3749 * Not handled yet
3593 */ 3750 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3769 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3770 arg = arg * 10 + (ch - '0');
3614 3771
3615 if (ch == ';') 3772 if (ch == ';')
3616 { 3773 {
3617 unsigned char *s = get_to_st (eh); 3774 char *s = get_to_st (eh);
3618 3775
3619 if (s) 3776 if (s)
3620 { 3777 {
3621 process_xterm_seq (arg, (char *)s, eh); 3778 process_xterm_seq (arg, s, eh);
3622 free (s); 3779 free (s);
3623 } 3780 }
3624 } 3781 }
3625} 3782}
3626 3783
3627void 3784void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3786{
3630 if (str[0] == '?' && !str[1]) 3787 if (str[0] == '?' && !str[1])
3631 { 3788 {
3632 unsigned short r, g, b; 3789 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b); 3790 pix_colors_focused[color].get (display, r, g, b);
… …
3637 set_window_color (color, str); 3794 set_window_color (color, str);
3638} 3795}
3639 3796
3640/* 3797/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3799 */
3665void 3800void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3801rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3802{
3668 int changed = 0; 3803 int changed = 0;
3669 int color; 3804 int color;
3670 char *buf, *name; 3805 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3806 bool query = str[0] == '?' && !str[1];
… …
3694 unsigned long bytes_after; 3829 unsigned long bytes_after;
3695 unsigned char *value = 0; 3830 unsigned char *value = 0;
3696 const char *str = ""; 3831 const char *str = "";
3697 3832
3698 if (prop 3833 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3834 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3835 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3836 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3837 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3838 && actual_type != None
3704 && actual_format == 8) 3839 && actual_format == 8)
… …
3716 { 3851 {
3717 *eq = 0; 3852 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3853 set_utf8_property (display->atom (str), eq + 1);
3719 } 3854 }
3720 else 3855 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3856 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3857 display->atom (str));
3723 } 3858 }
3724 break; 3859 break;
3725 3860
3726 case XTerm_Color: 3861 case XTerm_Color:
… …
3728 { 3863 {
3729 if ((name = strchr (buf, ';')) == NULL) 3864 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3865 break;
3731 3866
3732 *name++ = '\0'; 3867 *name++ = '\0';
3733 color = atoi (buf); 3868 color = atoi (buf) + minCOLOR;
3734 3869
3735 if (color < 0 || color >= TOTAL_COLORS) 3870 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3871 break;
3737 3872
3738 if ((buf = strchr (name, ';')) != NULL) 3873 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3874 *buf++ = '\0';
3740 3875
3741 if (name[0] == '?' && !name[1]) 3876 if (name[0] == '?' && !name[1])
3742 { 3877 {
3743 unsigned short r, g, b; 3878 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3879 pix_colors_focused[color].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 } 3881 }
3747 else 3882 else
3748 set_window_color (color + minCOLOR, name); 3883 set_window_color (color, name);
3749 } 3884 }
3750 break; 3885 break;
3751 case XTerm_Color00: 3886 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3753 break; 3888 break;
3754 case XTerm_Color01: 3889 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3756 break; 3891 break;
3757#ifndef NO_CURSORCOLOR 3892#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3893 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3760 break; 3895 break;
… …
3764 break; 3899 break;
3765 case XTerm_Color_pointer_bg: 3900 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3767 break; 3902 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3903#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break;
3778 case XTerm_Color_RV: 3904 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3914 break;
3915 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917 break;
3781#endif 3918#endif
3782#if TRANSPARENT && TINTING 3919#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3920 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3922 check_our_parents ();
3786 if (am_transparent) 3923 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3788 break; 3925 break;
3789#endif 3926#endif
3790 3927
3791 case XTerm_Pixmap: 3928 case Rxvt_Pixmap:
3792 if (*str != ';') 3929 if (*str != ';')
3793 { 3930 {
3794#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3934 scr_touch (true);
3935#endif
3799 } 3936 }
3937
3800 while ((str = strchr (str, ';')) != NULL) 3938 while ((str = strchr (str, ';')) != NULL)
3801 { 3939 {
3802 str++; 3940 str++;
3803#if XPM_BACKGROUND 3941#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3942 changed += scale_pixmap (str);
… …
3807 3945
3808 if (changed) 3946 if (changed)
3809 { 3947 {
3810#ifdef XPM_BACKGROUND 3948#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3949 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3950 scr_touch (true);
3951#endif
3814 } 3952 }
3815 break; 3953 break;
3816 3954
3817 case XTerm_restoreFG: 3955 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3956 set_window_color (Color_fg, str);
3819 break; 3957 break;
3820 case XTerm_restoreBG: 3958 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3959 set_window_color (Color_bg, str);
3822 break; 3960 break;
3823 3961
3824 case XTerm_logfile: 3962 case XTerm_logfile:
3825 // TODO, when secure mode? 3963 // TODO, when secure mode?
3826 break; 3964 break;
3827 3965
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0
3973 case Rxvt_dumpscreen: /* no error notices */
3974 {
3975 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3977 {
3978 scr_dump (fd);
3979 close (fd);
3980 }
3981 }
3982 break;
3983#endif
3828 case XTerm_font: 3984 case XTerm_font:
3829 op = URxvt_font; 3985 op = URxvt_font;
3830 case URxvt_font: 3986 case URxvt_font:
3831#if ENABLE_STYLES 3987#if ENABLE_STYLES
3832 case URxvt_boldFont: 3988 case URxvt_boldFont:
3833 case URxvt_italicFont: 3989 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3990 case URxvt_boldItalicFont:
3835#endif 3991#endif
3836 if (query) 3992 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3993 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3995 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3996 resp);
3841 else 3997 else
3842 { 3998 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3999 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 4000
… …
3847 set_fonts (); 4003 set_fonts ();
3848 } 4004 }
3849 break; 4005 break;
3850 4006
3851#if ENABLE_FRILLS 4007#if ENABLE_FRILLS
3852 case XTerm_locale: 4008 case URxvt_locale:
3853 if (query) 4009 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 4011 else
3856 { 4012 {
3857 set_locale (str); 4013 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 4014 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 4015 init_xlocale ();
3861# endif
3862 } 4016 }
3863 break; 4017 break;
3864#endif
3865 4018
3866#ifdef MENUBAR 4019 case URxvt_view_up:
3867 case XTerm_Menu: 4020 case URxvt_view_down:
3868 if (options & Opt_insecure) 4021 {
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4022 int lines = atoi (str);
4023
4024 if (lines)
4025 scr_page (op == URxvt_view_up ? UP : DN, lines);
4026 else
4027 scr_erase_savelines ();
4028 }
4029
3870 break; 4030 break;
3871#endif 4031#endif
3872#if 0 4032
3873 case XTerm_dumpscreen: /* no error notices */ 4033#if ENABLE_PERL
3874 { 4034 case URxvt_perl:
3875 int fd; 4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4036 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 4037 break;
3883#endif 4038#endif
3884 } 4039 }
3885} 4040}
3886/*----------------------------------------------------------------------*/ 4041/*----------------------------------------------------------------------*/
… …
3995 } 4150 }
3996 4151
3997 /* extra handling for values with state unkept */ 4152 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4153 switch (arg[i])
3999 { 4154 {
4155#if ENABLE_STYLES
4156 case 1021:
4157 set_option (Opt_intensityStyles, mode);
4158
4159 scr_touch (true);
4160 break;
4161#endif
4000 case 1048: /* alternative cursor save */ 4162 case 1048: /* alternative cursor save */
4001 case 1049: 4163 case 1049:
4002 if (options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4165 if (mode == 0)
4004 scr_cursor (RESTORE); 4166 scr_cursor (RESTORE);
4005 else if (mode == 1) 4167 else if (mode == 1)
4006 scr_cursor (SAVE); 4168 scr_cursor (SAVE);
4007 break; 4169 break;
… …
4019 */ 4181 */
4020 PrivMode (1, PrivMode_vt52); 4182 PrivMode (1, PrivMode_vt52);
4021 break; 4183 break;
4022 case 3: /* 80/132 */ 4184 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4185 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4186 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4187 break;
4026 case 4: /* smooth scrolling */ 4188 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 4189 set_option (Opt_jumpScroll, !state);
4031 break; 4190 break;
4032 case 5: /* reverse video */ 4191 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4192 scr_rvideo_mode (state);
4034 break; 4193 break;
4035 case 6: /* relative/absolute origins */ 4194 case 6: /* relative/absolute origins */
… …
4076#if 0 4235#if 0
4077 case 1001: 4236 case 1001:
4078 break; /* X11 mouse highlighting */ 4237 break; /* X11 mouse highlighting */
4079#endif 4238#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4239 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 4240 set_option (Opt_scrollTtyOutput, !state);
4085 break; 4241 break;
4086 case 1011: /* scroll to bottom on key press */ 4242 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 4243 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 4244 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4245 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4246 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4248 scr_erase_screen (2);
4096 scr_change_screen (state); 4249 scr_change_screen (state);
4097 break; 4250 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4251 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4252 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4253 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4254 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4255 scr_erase_screen (2);
4103 break; 4256 break;
4104 default: 4257 default:
4105 break; 4258 break;
… …
4233 scr_color (Color_bg, Color_bg); 4386 scr_color (Color_bg, Color_bg);
4234 break; 4387 break;
4235 4388
4236 //case 50: // not variable spacing 4389 //case 50: // not variable spacing
4237 4390
4238#ifndef NO_BRIGHTCOLOR 4391#if ENABLE_FRILLS
4239 case 90: 4392 case 90:
4240 case 91: /* set bright fg color */ 4393 case 91: /* set bright fg color */
4241 case 92: 4394 case 92:
4242 case 93: 4395 case 93:
4243 case 94: 4396 case 94:
… …
4255 case 106: 4408 case 106:
4256 case 107: 4409 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4410 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4411 break;
4259#endif 4412#endif
4260
4261 } 4413 }
4262 } 4414 }
4263} 4415}
4264/*}}} */ 4416/*}}} */
4265 4417
… …
4289 */ 4441 */
4290void 4442void
4291rxvt_term::tt_printf (const char *fmt,...) 4443rxvt_term::tt_printf (const char *fmt,...)
4292{ 4444{
4293 va_list arg_ptr; 4445 va_list arg_ptr;
4294 unsigned char buf[256]; 4446 char buf[256];
4295 4447
4296 va_start (arg_ptr, fmt); 4448 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4449 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4450 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4451 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4456 * or generated by us in response to a query ESC sequence.
4305 */ 4457 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4459
4308void 4460void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4461rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 4462{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return;
4465
4466 if (pty.pty < 0)
4467 return;
4468
4311 if (v_buflen == 0) 4469 if (v_buflen == 0)
4312 { 4470 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4314 4472
4315 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4317 4475
4318 data += written; 4476 data += written;
4319 len -= written; 4477 len -= written;
4320 } 4478 }
4321 4479
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4481
4324 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4483 v_buflen += len;
4326 4484
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4346 } 4504 }
4347 4505
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4506 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4507 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4509 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4510}
4354 4511
4355/*----------------------- end-of-file (C source) -----------------------*/ 4512/*----------------------- end-of-file (C source) -----------------------*/
4356 4513

Diff Legend

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