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.260 by root, Fri Jan 13 05:04:33 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 1319
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
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; 1321 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1323 unsigned int unused_mask;
1243 1324
1244 switch (ev.type) 1325 switch (ev.type)
… …
1251 1332
1252 break; 1333 break;
1253 1334
1254 case KeyRelease: 1335 case KeyRelease:
1255 { 1336 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1257 KeySym ks; 1338 KeySym keysym;
1258 1339
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif 1341#endif
1261 1342
1262#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support 1344 // ISO 14755 support
1264 if (iso14755buf) 1345 if (iso14755buf)
… …
1269# endif 1350# endif
1270# if ISO_14755 1351# if ISO_14755
1271 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1272 // first: controls 1353 // first: controls
1273 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1276 { 1357 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1278 commit_iso14755 (); 1359 commit_iso14755 ();
1279 return; // case-break; 1360 goto skip_switch;
1280 } 1361 }
1281 1362
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks) 1364 if (i[0] == keysym)
1284 { 1365 {
1285 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 (); 1367 commit_iso14755 ();
1287 return; // case-break; 1368 goto skip_switch;
1288 } 1369 }
1289 1370
1290 scr_bell (); 1371 scr_bell ();
1291# endif 1372# endif
1292 iso14755buf = 0; 1373 iso14755buf = 0;
… …
1311 else 1392 else
1312 iso14755buf = 0; 1393 iso14755buf = 0;
1313 } 1394 }
1314#endif 1395#endif
1315 1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1320 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1321#endif 1406#endif
1322 break; 1407 break;
1323 } 1408 }
1324 1409
… …
1330 button_release (ev.xbutton); 1415 button_release (ev.xbutton);
1331 break; 1416 break;
1332 1417
1333 case ClientMessage: 1418 case ClientMessage:
1334 if (ev.xclient.format == 32 1419 if (ev.xclient.format == 32
1420 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1421 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1422 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1423 destroy ();
1424#if ENABLE_EWMH
1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1426 XSendEvent (disp, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1428 &ev);
1429#endif
1430 }
1431#if ENABLE_XEMBED
1432 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433 {
1434 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435 focus_in ();
1436 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437 focus_out ();
1438 }
1439#endif
1337#ifdef OFFIX_DND 1440#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1441 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1442 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1443 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1444 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1445 || ev.xclient.data.l[0] == DndLink))
1343 { 1446 {
1344 /* Get Dnd data */ 1447 /* Get Dnd data */
1345 Atom ActualType; 1448 Atom ActualType;
1346 int ActualFormat; 1449 int ActualFormat;
1347 unsigned char *data; 1450 unsigned char *data;
… …
1390 break; 1493 break;
1391 } 1494 }
1392 break; 1495 break;
1393 1496
1394 case FocusIn: 1497 case FocusIn:
1395 if (!TermWin.focus) 1498 focus_in ();
1499 break;
1500
1501 case FocusOut:
1502 focus_out ();
1503 break;
1504
1505 case ConfigureNotify:
1506 if (ev.xconfigure.window == parent[0])
1396 { 1507 {
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)); 1508 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1509 ;
1464 1510
1465 if (szHint.width != width || szHint.height != height) 1511 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1512 {
1467 seen_resize = 1; 1513 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1515 }
1470 1516
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1518 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1519 check_our_parents ();
1474#endif 1520#endif
1475 } 1521 }
1476 break; 1522 break;
1477 1523
… …
1493 1539
1494 case SelectionRequest: 1540 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1496 break; 1542 break;
1497 1543
1544 case MapNotify:
1545 mapped = 1;
1546#ifdef TEXT_BLINK
1547 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1548#endif
1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break;
1551
1498 case UnmapNotify: 1552 case UnmapNotify:
1499 TermWin.mapped = 0; 1553 mapped = 0;
1500#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1502#endif 1556#endif
1503 break; 1557 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; 1558 break;
1511 1559
1512#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1513 case ReparentNotify: 1561 case ReparentNotify:
1514 rootwin_cb (ev); 1562 rootwin_cb (ev);
1515 break; 1563 break;
1516#endif /* TRANSPARENT */ 1564#endif /* TRANSPARENT */
1517 1565
1518 case GraphicsExpose: 1566 case GraphicsExpose:
1519 case Expose: 1567 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1568 if (ev.xany.window == vt)
1521 { 1569 {
1522 do 1570 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1574
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1576
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1532 1580
1533 scr_refresh (refresh_type); 1581 want_refresh = 1;
1534 } 1582 }
1535 else 1583 else
1536 { 1584 {
1537 XEvent unused_event; 1585 XEvent unused_event;
1538 1586
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1599 menubar_expose ();
1552#endif 1600#endif
1553 1601
1554#ifdef TRANSPARENT 1602#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1603 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1604 XClearWindow (disp, ev.xany.window);
1557#endif 1605#endif
1558 } 1606 }
1559 break; 1607 break;
1560 1608
1561 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1562#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1612 if (hidden_pointer)
1564 pointer_unblank (); 1613 pointer_unblank ();
1565#endif 1614#endif
1566#if MENUBAR 1615#if MENUBAR
… …
1571 } 1620 }
1572#endif 1621#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1623 break;
1575 1624
1576 if (ev.xany.window == TermWin.vt) 1625 if (ev.xany.window == vt)
1577 { 1626 {
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1630 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1632 ;
1582 1633
1583 XQueryPointer (disp, TermWin.vt, 1634 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1635 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1638 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
… …
1600#endif 1651#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1652 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1653 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1654
1604#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1658 {
1608 int dist; 1659 int dist;
1609 1660
1610 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1670 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1671 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1672 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1673
1623 /* calc number of lines to scroll */ 1674 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1675 if (ev.xbutton.y < int_bwidth)
1625 { 1676 {
1626 scroll_selection_dir = UP; 1677 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1628 } 1679 }
1629 else 1680 else
1630 { 1681 {
1631 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1683 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1684 }
1634 1685
1635 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1688 + 1;
1638 MIN_IT (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1640 } 1691 }
1641 else 1692 else
1642 { 1693 {
1643 /* we are within the text window, so we 1694 /* we are within the text window, so we
… …
1663 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1716 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1718 scrollbar_size ());
1668 scr_refresh (refresh_type); 1719 want_refresh = 1;
1669 refresh_limit = 0; 1720 refresh_limit = 0;
1670 scrollbar_show (1); 1721 scrollbar_show (1);
1671 } 1722 }
1672 break; 1723 break;
1724 }
1725
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1730 {
1731 if (hidden_cursor)
1732 {
1733 hidden_cursor = 0;
1734 want_refresh = 1;
1735 }
1736
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1738 }
1739#endif
1740
1741#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1743 {
1744 if (ev.type == MotionNotify
1745 || ev.type == ButtonPress
1746 || ev.type == ButtonRelease)
1747 if (hidden_pointer)
1748 pointer_unblank ();
1749
1750 if (ev.type == KeyPress && hidden_pointer == 0)
1751 pointer_blank ();
1752 }
1753#endif
1754}
1755
1756void
1757rxvt_term::focus_in ()
1758{
1759 if (!focus)
1760 {
1761 focus = 1;
1762 want_refresh = 1;
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765
1766#if USE_XIM
1767 if (Input_Context != NULL)
1768 {
1769 IMSetStatusPosition ();
1770 XSetICFocus (Input_Context);
1771 }
1772#endif
1773#if CURSOR_BLINK
1774 if (OPTION (Opt_cursorBlink))
1775 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1776#endif
1777#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade])
1779 {
1780 pix_colors = pix_colors_focused;
1781 scr_recolour ();
1782 }
1783#endif
1784 }
1785}
1786
1787void
1788rxvt_term::focus_out ()
1789{
1790 if (focus)
1791 {
1792 focus = 0;
1793 want_refresh = 1;
1794
1795 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796
1797#if ENABLE_FRILLS || ISO_14755
1798 if (iso14755buf)
1799 {
1800 iso14755buf = 0;
1801# if ENABLE_OVERLAY
1802 scr_overlay_off ();
1803# endif
1804 }
1805#endif
1806#if USE_XIM
1807 if (Input_Context != NULL)
1808 XUnsetICFocus (Input_Context);
1809#endif
1810#if CURSOR_BLINK
1811 if (OPTION (Opt_cursorBlink))
1812 cursor_blink_ev.stop ();
1813 hidden_cursor = 0;
1814#endif
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 pix_colors = pix_colors_unfocused;
1819 scr_recolour ();
1820 }
1821#endif
1673 } 1822 }
1674} 1823}
1675 1824
1676#if TRANSPARENT 1825#if TRANSPARENT
1677void 1826void
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1841 return;
1693 1842
1694 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1695 case ReparentNotify: 1844 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1845 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1846 want_refresh = want_full_refresh = 1;
1698 break; 1847 break;
1699 } 1848 }
1700} 1849}
1701#endif 1850#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1705{ 1854{
1706 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1707 1856
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1709 if (!bypass_keystate) 1859 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1861
1712 /* 1862 /*
1713 * VT window processing of button press 1863 * VT window processing of button press
1714 */ 1864 */
1715 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1716 { 1866 {
1717#if ISO_14755 1867#if ISO_14755
1718 // 5.4 1868 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1870 {
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1735 { 1885 {
1736 /* same button, within alloted time */ 1886 /* same button, within alloted time */
1737 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1738 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1739 { 1890 {
1740 /* only report double clicks */ 1891 /* only report double clicks */
1741 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1742 mouse_report (ev); 1893 mouse_report (ev);
… …
1762 else 1913 else
1763 { 1914 {
1764 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1765 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1766 1917
1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1767 switch (ev.button) 1919 switch (ev.button)
1768 { 1920 {
1769 case Button1: 1921 case Button1:
1770 /* allow meta + click to select rectangular areas */ 1922 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */ 1923 /* should be done in screen.C */
1772#if ENABLE_FRILLS 1924#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask); 1925 selection.rect = !!(ev.state & ModMetaMask);
1774#else 1926#else
1775 selection.rect = false; 1927 selection.rect = false;
1776#endif 1928#endif
1777 1929
1778 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1932 {
1781 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1783 else 1935 else
1784 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1785 } 1937 }
1786 else 1938 else
1787 { 1939 {
1788 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1789 MEvent.clicks++; 1941 MEvent.clicks++;
1790 else 1942 else
1791 MEvent.clicks = 1; 1943 MEvent.clicks = 1;
1792 1944
1793 selection_click (MEvent.clicks, ev.x, ev.y); 1945 selection_click (MEvent.clicks, ev.x, ev.y);
1794 } 1946 }
1795 1947
1796 MEvent.button = Button1; 1948 MEvent.button = Button1;
1797 break; 1949 break;
1798 1950
1799 case Button3: 1951 case Button3:
1800 if (MEvent.button == Button3 && clickintime) 1952 if (MEvent.button == Button3 && clickintime)
1801 selection_rotate (ev.x, ev.y); 1953 selection_rotate (ev.x, ev.y);
1802 else 1954 else
1803 selection_extend (ev.x, ev.y, 1); 1955 selection_extend (ev.x, ev.y, 1);
1804 1956
1805 MEvent.button = Button3; 1957 MEvent.button = Button3;
1806 break; 1958 break;
1807 } 1959 }
1808 } 1960 }
1809 1961
1810 MEvent.time = ev.time; 1962 MEvent.time = ev.time;
1811 return; 1963 return;
1812 } 1964 }
1813 1965
… …
1925 case Button3: 2077 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2078 if (scrollBar.style != R_SB_XTERM)
1927 { 2079 {
1928 if (scrollbar_above_slider (ev.y)) 2080 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2082 scr_page (UP, nrow - 1);
1931# else 2083# else
1932 scr_page (UP, TermWin.nrow / 4); 2084 scr_page (UP, nrow / 4);
1933# endif 2085# endif
1934 else if (scrollbar_below_slider (ev.y)) 2086 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2087# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2088 scr_page (DN, nrow - 1);
1937# else 2089# else
1938 scr_page (DN, TermWin.nrow / 4); 2090 scr_page (DN, nrow / 4);
1939# endif 2091# endif
1940 else 2092 else
1941 scrollBar.setMotion (); 2093 scrollBar.setMotion ();
1942 } 2094 }
1943 else 2095 else
1944 { 2096 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2097 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2098 (nrow
1947 * scrollbar_position (ev.y) 2099 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2100 / scrollbar_size ()));
1949 } 2101 }
1950 2102
1951 break; 2103 break;
1952 } 2104 }
1953 } 2105 }
2106
1954 return; 2107 return;
1955 } 2108 }
2109
1956#if MENUBAR 2110#if MENUBAR
1957 /* 2111 /*
1958 * Menubar window processing of button press 2112 * Menubar window processing of button press
1959 */ 2113 */
1960 if (isMenuBarWindow (ev.window)) 2114 if (isMenuBarWindow (ev.window))
… …
1983#ifdef SELECTION_SCROLLING 2137#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2138 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
1986#endif 2140#endif
1987 2141
1988 if (ev.window == TermWin.vt) 2142 if (ev.window == vt)
1989 { 2143 {
1990#if ISO_14755 2144#if ISO_14755
1991 // 5.4 2145 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2146 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2147 return;
… …
2023 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2024 && bypass_keystate 2178 && bypass_keystate
2025 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2026 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2027 2181
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2028 switch (ev.button) 2185 switch (ev.button)
2029 { 2186 {
2030 case Button1: 2187 case Button1:
2031 case Button3: 2188 case Button3:
2032 selection_make (ev.time); 2189 selection_make (ev.time);
… …
2043 2200
2044 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2045 2202
2046 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2047 i = 1; 2204 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2205 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2206 i = nrow - 1;
2050 else 2207 else
2051 i = 5; 2208 i = 5;
2052 2209
2053# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2211 if (ev.state & ControlMask)
2055 { 2212 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2213 mouse_slip_wheel_speed += v ? -1 : 1;
2057 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;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2216
2060 if (slip_wheel_ev.at < NOW) 2217 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2219
2063 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2064 } 2221 }
2065 else 2222 else
2066 { 2223 {
2067# endif 2224# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2225 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2226 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 2227# ifdef MOUSE_SLIP_WHEELING
2081 } 2228 }
2082#endif 2229# endif
2083 } 2230 }
2084 break; 2231 break;
2085#endif 2232#endif
2086 } 2233 }
2087 } 2234 }
… …
2339 XWindowAttributes wattr, wrootattr; 2486 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2487 dDisp;
2341 2488
2342 pchanged = 0; 2489 pchanged = 0;
2343 2490
2344 if (!(options & Opt_transparent)) 2491 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2492 return pchanged; /* Don't try any more */
2346 2493
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2494 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2495 rootdepth = wrootattr.depth;
2349 2496
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2497 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2498
2352 if (rootdepth != wattr.depth) 2499 if (rootdepth != wattr.depth)
2353 { 2500 {
2354 if (am_transparent) 2501 if (am_transparent)
2355 { 2502 {
2356 pchanged = 1; 2503 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2504 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2505 am_transparent = am_pixmap_trans = 0;
2359 } 2506 }
2360 2507
2361 return pchanged; /* Don't try any more */ 2508 return pchanged; /* Don't try any more */
2362 } 2509 }
… …
2403 Window cr; 2550 Window cr;
2404 XImage *image; 2551 XImage *image;
2405 GC gc; 2552 GC gc;
2406 XGCValues gcvalue; 2553 XGCValues gcvalue;
2407 2554
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2555 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2556 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2557 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2558 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2559 nx = ny = 0;
2413 2560
… …
2423 nh += sy; 2570 nh += sy;
2424 ny = -sy; 2571 ny = -sy;
2425 sy = 0; 2572 sy = 0;
2426 } 2573 }
2427 2574
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2575 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2576 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2577
2431 XSync (disp, False); 2578 XSync (disp, False);
2432 allowedxerror = -1; 2579 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2580 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2581
… …
2439 if (image == NULL) 2586 if (image == NULL)
2440 { 2587 {
2441 if (am_transparent && am_pixmap_trans) 2588 if (am_transparent && am_pixmap_trans)
2442 { 2589 {
2443 pchanged = 1; 2590 pchanged = 1;
2444 if (TermWin.pixmap != None) 2591 if (pixmap != None)
2445 { 2592 {
2446 XFreePixmap (disp, TermWin.pixmap); 2593 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2594 pixmap = None;
2448 } 2595 }
2449 } 2596 }
2450 2597
2451 am_pixmap_trans = 0; 2598 am_pixmap_trans = 0;
2452 } 2599 }
2453 else 2600 else
2454 { 2601 {
2455 if (TermWin.pixmap != None) 2602 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2603 XFreePixmap (disp, pixmap);
2457 2604
2458#if TINTING 2605#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2606 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2607 {
2461 unsigned short rm, gm, bm; 2608 unsigned short rm, gm, bm;
… …
2465 2612
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2613 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2614 }
2468#endif 2615#endif
2469 2616
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2617 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2618 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2619 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2620 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2621 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2622 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2623 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2624 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2625 XClearWindow (disp, parent[0]);
2479 2626
2480 if (!am_transparent || !am_pixmap_trans) 2627 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2628 pchanged = 1;
2482 2629
2483 am_transparent = am_pixmap_trans = 1; 2630 am_transparent = am_pixmap_trans = 1;
2484 } 2631 }
2485 } 2632 }
2486 2633
2487 if (am_pixmap_trans) 2634 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2636 else
2490 { 2637 {
2491 unsigned int n; 2638 unsigned int n;
2492 /* 2639 /*
2493 * InheritPixmap transparency 2640 * InheritPixmap transparency
2494 */ 2641 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2642 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2643 {
2497 oldp = TermWin.parent[i]; 2644 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2645 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2646 &parent[i], &list, &n);
2500 XFree (list); 2647 XFree (list);
2501 2648
2502 if (TermWin.parent[i] == display->root) 2649 if (parent[i] == display->root)
2503 { 2650 {
2504 if (oldp != None) 2651 if (oldp != None)
2505 pchanged = 1; 2652 pchanged = 1;
2506 2653
2507 break; 2654 break;
2508 } 2655 }
2509 2656
2510 if (oldp != TermWin.parent[i]) 2657 if (oldp != parent[i])
2511 pchanged = 1; 2658 pchanged = 1;
2512 } 2659 }
2513 2660
2514 n = 0; 2661 n = 0;
2515 2662
2516 if (pchanged) 2663 if (pchanged)
2517 { 2664 {
2518 for (; n < (unsigned int)i; n++) 2665 for (; n < (unsigned int)i; n++)
2519 { 2666 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2667 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2668 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2669 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2670 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2671 break;
2525 } 2672 }
2526 } 2673 }
2527 } 2674 }
2528 2675
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2676 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2677 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2678 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2679 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2680 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2681 /* XXX: also turn off Opt_transparent? */
2535 } 2682 }
2536 else 2683 else
2537 { 2684 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2687 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2688 sleep (1);
2542#endif 2689#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2690 for (n = 0; n < (unsigned int)i; n++)
2544 { 2691 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2692 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2693 XClearWindow (disp, parent[n]);
2547 } 2694 }
2548 2695
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2696 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2697 am_transparent = 1;
2551 } 2698 }
2552 2699
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2700 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2701 parent[i] = None;
2555 } 2702 }
2556 2703
2557 if (scrollBar.win) 2704 if (scrollBar.win)
2558 { 2705 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2706 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2576 2723
2577bool 2724bool
2578rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2579{ 2726{
2580 bool flag = false; 2727 bool flag = false;
2581 unicode_t ch = NOCHAR; 2728 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2583 2730
2584 for (;;) 2731 for (;;)
2585 { 2732 {
2586 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2587 { 2734 {
2588 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2736 ch = next_char ();
2590 }
2591 2737
2592 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2593 break; 2739 break;
2740 }
2594 2741
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2742 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2743 {
2597 if (!seen_input) 2744 if (!seen_input)
2598 { 2745 {
… …
2602 // some window managers resize the window early, and these programs 2749 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2750 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2751 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2752 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2753 // resized.
2607 if (seen_resize) 2754 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2755 kill (-cmd_pid, SIGWINCH);
2609 } 2756 }
2610 2757
2611 /* Read a text string from the input buffer */ 2758 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2759 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2760 bool refreshnow = false;
2614 int nlines = 0; 2761 int nlines = 0;
2615 unicode_t *str = buf; 2762 wchar_t *str = buf;
2763 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2764
2617 for (;;) 2765 for (;;)
2618 { 2766 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2768 break;
2621 2769
2622 *str++ = ch; 2770 *str++ = ch;
2623 2771
2624 if (ch == C0_LF) 2772 if (ch == C0_LF || str >= eol)
2625 { 2773 {
2774 if (ch == C0_LF)
2626 nlines++; 2775 nlines++;
2776
2627 refresh_count++; 2777 refresh_count++;
2628 2778
2629 if (!(options & Opt_jumpScroll) 2779 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2780 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2781 {
2632 refreshnow = true; 2782 refreshnow = true;
2783 refresh_count = 0;
2633 ch = NOCHAR; 2784 ch = NOCHAR;
2634 break; 2785 break;
2635 } 2786 }
2636 2787
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2789 if (nlines >= nrow - 1)
2639 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2640 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, str - buf, nlines);
2793
2641 nlines = 0; 2794 nlines = 0;
2642 str = buf; 2795 str = buf;
2796 eol = str + min (ncol, UBUFSIZ);
2643 } 2797 }
2644 }
2645 2798
2646 if (str >= buf + UBUFSIZ) 2799 if (str >= eol)
2647 { 2800 {
2801 if (eol >= buf + UBUFSIZ)
2802 {
2648 ch = NOCHAR; 2803 ch = NOCHAR;
2649 break; 2804 break;
2805 }
2806 else
2807 eol = min (eol + ncol, buf + UBUFSIZ);
2808 }
2809
2650 } 2810 }
2651 2811
2652 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2813 ch = next_char ();
2654 } 2814 }
2655 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2656 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, str - buf, nlines);
2657 2818
2658 /* 2819 /*
2659 * If there have been a lot of new lines, then update the screen 2820 * 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. 2821 * 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 2822 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2823 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2824 */
2664 if (refreshnow) 2825 if (refreshnow)
2665 { 2826 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2828 refresh_limit++;
2668 else 2829 else
2669 { 2830 {
2670 flag = true; 2831 flag = true;
2671 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2833 want_refresh = 1;
2672 } 2834 }
2673 } 2835 }
2674 2836
2675 } 2837 }
2676 else 2838 else
… …
2691 } 2853 }
2692 2854
2693 return flag; 2855 return flag;
2694} 2856}
2695 2857
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 2858// read the next character
2706unicode_t 2859wchar_t
2707rxvt_term::next_char () 2860rxvt_term::next_char ()
2708{ 2861{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2862 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2863 {
2711 // assume 7-bit to be ascii ALWAYS 2864 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2866 return *cmdbuf_ptr++;
2714 2867
2715 wchar_t wc; 2868 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2869 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2870
2718 if (len == (size_t)-2) 2871 if (len == (size_t)-2)
2719 { 2872 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2873 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2874 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2875 break;
2723 } 2876 }
2724 2877
2725 if (len == (size_t)-1) 2878 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2879 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2880
2728 // assume wchar == unicode 2881 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2882 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2883 return wc & UNICODE_MASK;
2731 } 2884 }
2732 2885
2733 return NOCHAR; 2886 return NOCHAR;
2887}
2888
2889// read the next octet
2890uint32_t
2891rxvt_term::next_octet ()
2892{
2893 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR;
2734} 2896}
2735 2897
2736/* rxvt_cmd_getc () - Return next input character */ 2898/* rxvt_cmd_getc () - Return next input character */
2737/* 2899/*
2738 * Return the next input character after first passing any keyboard input 2900 * Return the next input character after first passing any keyboard input
2739 * to the command. 2901 * to the command.
2740 */ 2902 */
2741unicode_t 2903wchar_t
2742rxvt_term::cmd_getc () 2904rxvt_term::cmd_getc ()
2743{ 2905{
2744 unicode_t c = next_char (); 2906 wchar_t c = next_char ();
2745 2907
2746 if (c == NOCHAR) 2908 if (c == NOCHAR)
2747 throw out_of_input; 2909 throw out_of_input;
2748 2910
2749 return c; 2911 return c;
2750} 2912}
2751 2913
2752unicode_t 2914uint32_t
2753rxvt_term::cmd_get8 () 2915rxvt_term::cmd_get8 ()
2754{ 2916{
2755 unicode_t c = next_octet (); 2917 uint32_t c = next_octet ();
2756 2918
2757 if (c == NOCHAR) 2919 if (c == NOCHAR)
2758 throw out_of_input; 2920 throw out_of_input;
2759 2921
2760 return c; 2922 return c;
… …
2860 case C0_ESC: 3022 case C0_ESC:
2861 process_escape_seq (); 3023 process_escape_seq ();
2862 break; 3024 break;
2863 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 3028 else
2868 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 3030 break;
2871 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2872 scr_bell (); 3032 scr_bell ();
2873 break; 3033 break;
2874 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3029 break; 3189 break;
3030 3190
3031 /* 8.3.87: NEXT LINE */ 3191 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3192 case C1_NEL: /* ESC E */
3033 { 3193 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3194 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3195 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3196 }
3037 break; 3197 break;
3038 3198
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3199 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3200 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3222 process_dcs_seq ();
3063 break; 3223 break;
3064 3224
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3070 3229
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3232 process_csi_seq ();
… …
3313 3472
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3473 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3474 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3475 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3478 break;
3320 3479
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3482 break;
3325 3483
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3328 break; 3486 break;
… …
3335 break; 3493 break;
3336 case 6: /* CPR requested */ 3494 case 6: /* CPR requested */
3337 scr_report_position (); 3495 scr_report_position ();
3338 break; 3496 break;
3339 case 7: /* unofficial extension */ 3497 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3498 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3499 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3500 break;
3343 case 8: /* unofficial extension */ 3501 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3502 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3503 break;
… …
3448 { 3606 {
3449 /* 3607 /*
3450 * commands 3608 * commands
3451 */ 3609 */
3452 case 1: /* deiconify window */ 3610 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3611 XMapWindow (disp, parent[0]);
3454 break; 3612 break;
3455 case 2: /* iconify window */ 3613 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3614 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3615 break;
3458 case 3: /* set position (pixels) */ 3616 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3617 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3618 break;
3461 case 4: /* set size (pixels) */ 3619 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3620 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3621 break;
3464 case 5: /* raise window */ 3622 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3623 XRaiseWindow (disp, parent[0]);
3466 break; 3624 break;
3467 case 6: /* lower window */ 3625 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3626 XLowerWindow (disp, parent[0]);
3469 break; 3627 break;
3470 case 7: /* refresh window */ 3628 case 7: /* refresh window */
3471 scr_touch (true); 3629 scr_touch (true);
3472 break; 3630 break;
3473 case 8: /* set size (chars) */ 3631 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3632 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3633 (unsigned int) (args[1] * fheight));
3476 break; 3634 break;
3477 3635
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3636 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3637 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3638 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3639 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3640 (unsigned int) (args[1] * fheight));
3483 break; 3641 break;
3484 3642
3485 3643
3486 /* 3644 /*
3487 * reports - some output format copied from XTerm 3645 * reports - some output format copied from XTerm
3488 */ 3646 */
3489 case 11: /* report window state */ 3647 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3649 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3650 break;
3493 case 13: /* report window position */ 3651 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3652 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3653 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3654 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3655 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3656 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3657 break;
3500 case 14: /* report window size (pixels) */ 3658 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3659 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3660 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3661 break;
3504 case 18: /* report text area size (chars) */ 3662 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3663 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3664 break;
3507 case 19: /* report window size (chars) */ 3665 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3666 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3667 break;
3510 case 20: /* report icon label */ 3668 case 20: /* report icon label */
3511 { 3669 {
3512 char *s; 3670 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3671 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3672 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3673 XFree (s);
3516 } 3674 }
3517 break; 3675 break;
3518 case 21: /* report window title */ 3676 case 21: /* report window title */
3519 { 3677 {
3520 char *s; 3678 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3679 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3680 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3681 XFree (s);
3524 } 3682 }
3525 break; 3683 break;
3526 } 3684 }
3527} 3685}
… …
3530/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3531/* 3689/*
3532 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3534 */ 3692 */
3535unsigned char * 3693char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3695{
3538 unicode_t ch; 3696 unicode_t ch;
3539 bool seen_esc = false; 3697 bool seen_esc = false;
3540 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3717 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3718 return NULL; /* other control character - exit */
3561 3719
3562 seen_esc = false; 3720 seen_esc = false;
3563 3721
3564 if (n >= sizeof (string) - 1) 3722 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3723 // stop at some sane length
3566 return NULL; 3724 return NULL;
3567 3725
3568 if (ch == C0_SYN) 3726 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3727 string[n++] = cmd_get8 ();
… …
3573 3731
3574 string[n++] = '\0'; 3732 string[n++] = '\0';
3575 3733
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3735
3578 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3579} 3737}
3580 3738
3581/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3582/* 3740/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3741 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3742 */
3585void 3743void
3586rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3587{ 3745{
3588 unsigned char *s; 3746 char *s;
3589 unicode_t eh; 3747 unicode_t eh;
3590 3748
3591 /* 3749 /*
3592 * Not handled yet 3750 * Not handled yet
3593 */ 3751 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3614 3772
3615 if (ch == ';') 3773 if (ch == ';')
3616 { 3774 {
3617 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3618 3776
3619 if (s) 3777 if (s)
3620 { 3778 {
3621 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3622 free (s); 3780 free (s);
3623 } 3781 }
3624 } 3782 }
3625} 3783}
3626 3784
3627void 3785void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3787{
3630 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3631 { 3789 {
3632 unsigned short r, g, b; 3790 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3637 set_window_color (color, str); 3795 set_window_color (color, str);
3638} 3796}
3639 3797
3640/* 3798/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * 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 */ 3800 */
3665void 3801void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3803{
3668 int changed = 0; 3804 int changed = 0;
3669 int color; 3805 int color;
3670 char *buf, *name; 3806 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3694 unsigned long bytes_after; 3830 unsigned long bytes_after;
3695 unsigned char *value = 0; 3831 unsigned char *value = 0;
3696 const char *str = ""; 3832 const char *str = "";
3697 3833
3698 if (prop 3834 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3835 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3836 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3837 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3838 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3839 && actual_type != None
3704 && actual_format == 8) 3840 && actual_format == 8)
… …
3716 { 3852 {
3717 *eq = 0; 3853 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3854 set_utf8_property (display->atom (str), eq + 1);
3719 } 3855 }
3720 else 3856 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3857 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3858 display->atom (str));
3723 } 3859 }
3724 break; 3860 break;
3725 3861
3726 case XTerm_Color: 3862 case XTerm_Color:
… …
3728 { 3864 {
3729 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3866 break;
3731 3867
3732 *name++ = '\0'; 3868 *name++ = '\0';
3733 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3734 3870
3735 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3872 break;
3737 3873
3738 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3875 *buf++ = '\0';
3740 3876
3741 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3742 { 3878 {
3743 unsigned short r, g, b; 3879 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 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); 3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 } 3882 }
3747 else 3883 else
3748 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3749 } 3885 }
3750 break; 3886 break;
3751 case XTerm_Color00: 3887 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3753 break; 3889 break;
3754 case XTerm_Color01: 3890 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3756 break; 3892 break;
3757#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3760 break; 3896 break;
… …
3764 break; 3900 break;
3765 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3767 break; 3903 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#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: 3905 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3907 break;
3908 case Rxvt_Color_BD:
3909 case URxvt_Color_BD:
3910 process_color_seq (op, Color_BD, str, resp);
3911 break;
3912 case Rxvt_Color_UL:
3913 case URxvt_Color_UL:
3914 process_color_seq (op, Color_UL, str, resp);
3915 break;
3916 case URxvt_Color_IT:
3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3918 break;
3781#endif 3919#endif
3782#if TRANSPARENT && TINTING 3920#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3921 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3922 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3923 check_our_parents ();
3786 if (am_transparent) 3924 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3788 break; 3926 break;
3789#endif 3927#endif
3790 3928
3791 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3792 if (*str != ';') 3930 if (*str != ';')
3793 { 3931 {
3794#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3935 scr_touch (true);
3936#endif
3799 } 3937 }
3938
3800 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3801 { 3940 {
3802 str++; 3941 str++;
3803#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
… …
3807 3946
3808 if (changed) 3947 if (changed)
3809 { 3948 {
3810#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3950 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3951 scr_touch (true);
3952#endif
3814 } 3953 }
3815 break; 3954 break;
3816 3955
3817 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3819 break; 3958 break;
3820 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3822 break; 3961 break;
3823 3962
3824 case XTerm_logfile: 3963 case XTerm_logfile:
3825 // TODO, when secure mode? 3964 // TODO, when secure mode?
3826 break; 3965 break;
3827 3966
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0
3974 case Rxvt_dumpscreen: /* no error notices */
3975 {
3976 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3978 {
3979 scr_dump (fd);
3980 close (fd);
3981 }
3982 }
3983 break;
3984#endif
3828 case XTerm_font: 3985 case XTerm_font:
3829 op = URxvt_font; 3986 op = URxvt_font;
3830 case URxvt_font: 3987 case URxvt_font:
3831#if ENABLE_STYLES 3988#if ENABLE_STYLES
3832 case URxvt_boldFont: 3989 case URxvt_boldFont:
3833 case URxvt_italicFont: 3990 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3991 case URxvt_boldItalicFont:
3835#endif 3992#endif
3836 if (query) 3993 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3994 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3996 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3997 resp);
3841 else 3998 else
3842 { 3999 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4000 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 4001
… …
3847 set_fonts (); 4004 set_fonts ();
3848 } 4005 }
3849 break; 4006 break;
3850 4007
3851#if ENABLE_FRILLS 4008#if ENABLE_FRILLS
3852 case XTerm_locale: 4009 case URxvt_locale:
3853 if (query) 4010 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 4012 else
3856 { 4013 {
3857 set_locale (str); 4014 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 4015 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 4016 init_xlocale ();
3861# endif
3862 } 4017 }
3863 break; 4018 break;
3864#endif
3865 4019
3866#ifdef MENUBAR 4020 case URxvt_view_up:
3867 case XTerm_Menu: 4021 case URxvt_view_down:
3868 if (options & Opt_insecure) 4022 {
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4023 int lines = atoi (str);
4024
4025 if (lines)
4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
4027 else
4028 scr_erase_savelines ();
4029 }
4030
3870 break; 4031 break;
3871#endif 4032#endif
3872#if 0 4033
3873 case XTerm_dumpscreen: /* no error notices */ 4034#if ENABLE_PERL
3874 { 4035 case URxvt_perl:
3875 int fd; 4036 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) 4037 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 4038 break;
3883#endif 4039#endif
3884 } 4040 }
3885} 4041}
3886/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3995 } 4151 }
3996 4152
3997 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4154 switch (arg[i])
3999 { 4155 {
4156#if ENABLE_STYLES
4157 case 1021:
4158 set_option (Opt_intensityStyles, mode);
4159
4160 scr_touch (true);
4161 break;
4162#endif
4000 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
4001 case 1049: 4164 case 1049:
4002 if (options & Opt_secondaryScreen) 4165 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4166 if (mode == 0)
4004 scr_cursor (RESTORE); 4167 scr_cursor (RESTORE);
4005 else if (mode == 1) 4168 else if (mode == 1)
4006 scr_cursor (SAVE); 4169 scr_cursor (SAVE);
4007 break; 4170 break;
… …
4019 */ 4182 */
4020 PrivMode (1, PrivMode_vt52); 4183 PrivMode (1, PrivMode_vt52);
4021 break; 4184 break;
4022 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4188 break;
4026 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 4190 set_option (Opt_jumpScroll, !state);
4031 break; 4191 break;
4032 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4034 break; 4194 break;
4035 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
4076#if 0 4236#if 0
4077 case 1001: 4237 case 1001:
4078 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4079#endif 4239#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 4241 set_option (Opt_scrollTtyOutput, !state);
4085 break; 4242 break;
4086 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 4244 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 4245 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4247 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4249 scr_erase_screen (2);
4096 scr_change_screen (state); 4250 scr_change_screen (state);
4097 break; 4251 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4252 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4253 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4254 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4255 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4256 scr_erase_screen (2);
4103 break; 4257 break;
4104 default: 4258 default:
4105 break; 4259 break;
… …
4233 scr_color (Color_bg, Color_bg); 4387 scr_color (Color_bg, Color_bg);
4234 break; 4388 break;
4235 4389
4236 //case 50: // not variable spacing 4390 //case 50: // not variable spacing
4237 4391
4238#ifndef NO_BRIGHTCOLOR 4392#if ENABLE_FRILLS
4239 case 90: 4393 case 90:
4240 case 91: /* set bright fg color */ 4394 case 91: /* set bright fg color */
4241 case 92: 4395 case 92:
4242 case 93: 4396 case 93:
4243 case 94: 4397 case 94:
… …
4255 case 106: 4409 case 106:
4256 case 107: 4410 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4411 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4412 break;
4259#endif 4413#endif
4260
4261 } 4414 }
4262 } 4415 }
4263} 4416}
4264/*}}} */ 4417/*}}} */
4265 4418
… …
4289 */ 4442 */
4290void 4443void
4291rxvt_term::tt_printf (const char *fmt,...) 4444rxvt_term::tt_printf (const char *fmt,...)
4292{ 4445{
4293 va_list arg_ptr; 4446 va_list arg_ptr;
4294 unsigned char buf[256]; 4447 char buf[256];
4295 4448
4296 va_start (arg_ptr, fmt); 4449 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4450 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4451 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4452 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4457 * or generated by us in response to a query ESC sequence.
4305 */ 4458 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4460
4308void 4461void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 4463{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return;
4466
4467 if (pty.pty < 0)
4468 return;
4469
4311 if (v_buflen == 0) 4470 if (v_buflen == 0)
4312 { 4471 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4314 4473
4315 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4317 4476
4318 data += written; 4477 data += written;
4319 len -= written; 4478 len -= written;
4320 } 4479 }
4321 4480
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4482
4324 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4484 v_buflen += len;
4326 4485
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4486 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4346 } 4505 }
4347 4506
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4507 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4508 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4509 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4510 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4511}
4354 4512
4355/*----------------------- end-of-file (C source) -----------------------*/ 4513/*----------------------- end-of-file (C source) -----------------------*/
4356 4514

Diff Legend

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