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.247 by root, Sat Jan 7 20:23:52 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_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
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
940 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
941 scrollbar_show (1); 1015 scrollbar_show (1);
942#ifdef USE_XIM 1016#ifdef USE_XIM
943 IMSendSpot (); 1017 IMSendSpot ();
944#endif 1018#endif
… …
954 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
955 1029
956 display->flush (); 1030 display->flush ();
957 1031
958 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1034}
961 1035
962void 1036void
963rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
964{ 1038{
… …
1028{ 1102{
1029 if (mouse_slip_wheel_speed == 0 1103 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1105 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1106 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1107 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1108 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1109 mouse_slip_wheel_speed = 0;
1036 1110
1037 refresh_type |= SMOOTH_REFRESH; 1111 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1112 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1114 }
1041} 1115}
1042#endif 1116#endif
1043 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1044bool 1136bool
1045rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1046{ 1138{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1140
1049 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1050 { 1142 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1144 n = 0;
1053 } 1145 }
1054 1146
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1058 1150
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1152
1061 if (n > 0) 1153 if (r > 0)
1062 { 1154 {
1063 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1064 return true; 1156 return true;
1065 } 1157 }
1066 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
1067 destroy (); 1170 destroy ();
1171 }
1068 1172
1069 return false; 1173 return false;
1070} 1174}
1071 1175
1072void 1176void
… …
1086} 1190}
1087 1191
1088void 1192void
1089rxvt_term::pointer_unblank () 1193rxvt_term::pointer_unblank ()
1090{ 1194{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1195 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1196 recolour_cursor ();
1093 1197
1094#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1199 hidden_pointer = 0;
1096 1200
1097 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1203#endif
1100} 1204}
1101 1205
1102#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1103void 1207void
1104rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1105{ 1209{
1106 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1107 return; 1211 return;
1108 1212
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1214 XFlush (display->display);
1111 1215
1112 hidden_pointer = 1; 1216 hidden_pointer = 1;
1113} 1217}
1114 1218
… …
1209 1313
1210 SET_R (this); 1314 SET_R (this);
1211 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1212 1316
1213#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1319 {
1216 if (hidden_cursor) 1320 if (hidden_cursor)
1217 { 1321 {
1218 hidden_cursor = 0; 1322 hidden_cursor = 0;
1219 want_refresh = 1; 1323 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1327 }
1224#endif 1328#endif
1225 1329
1226#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1332 {
1229 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1311 else 1415 else
1312 iso14755buf = 0; 1416 iso14755buf = 0;
1313 } 1417 }
1314#endif 1418#endif
1315 1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1320 mouse_slip_wheel_speed = 0; 1428 mouse_slip_wheel_speed = 0;
… …
1330 button_release (ev.xbutton); 1438 button_release (ev.xbutton);
1331 break; 1439 break;
1332 1440
1333 case ClientMessage: 1441 case ClientMessage:
1334 if (ev.xclient.format == 32 1442 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1446 destroy ();
1447#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev);
1452#endif
1453 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1337#ifdef OFFIX_DND 1463#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1464 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1466 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1467 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1468 || ev.xclient.data.l[0] == DndLink))
1343 { 1469 {
1344 /* Get Dnd data */ 1470 /* Get Dnd data */
1345 Atom ActualType; 1471 Atom ActualType;
1346 int ActualFormat; 1472 int ActualFormat;
1347 unsigned char *data; 1473 unsigned char *data;
… …
1390 break; 1516 break;
1391 } 1517 }
1392 break; 1518 break;
1393 1519
1394 case FocusIn: 1520 case FocusIn:
1395 if (!TermWin.focus) 1521 focus_in ();
1522 break;
1523
1524 case FocusOut:
1525 focus_out ();
1526 break;
1527
1528 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0])
1396 { 1530 {
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)); 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ;
1464 1533
1465 if (szHint.width != width || szHint.height != height) 1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1535 {
1467 seen_resize = 1; 1536 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1538 }
1470 1539
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1542 check_our_parents ();
1474#endif 1543#endif
1475 } 1544 }
1476 break; 1545 break;
1477 1546
… …
1493 1562
1494 case SelectionRequest: 1563 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1496 break; 1565 break;
1497 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1498 case UnmapNotify: 1575 case UnmapNotify:
1499 TermWin.mapped = 0; 1576 mapped = 0;
1500#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1502#endif 1579#endif
1503 break; 1580 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; 1581 break;
1511 1582
1512#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1513 case ReparentNotify: 1584 case ReparentNotify:
1514 rootwin_cb (ev); 1585 rootwin_cb (ev);
1515 break; 1586 break;
1516#endif /* TRANSPARENT */ 1587#endif /* TRANSPARENT */
1517 1588
1518 case GraphicsExpose: 1589 case GraphicsExpose:
1519 case Expose: 1590 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1591 if (ev.xany.window == vt)
1521 { 1592 {
1522 do 1593 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1594 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1595 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1597
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1599
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1601 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1602 ev.xexpose.width, ev.xexpose.height, False);
1532 1603
1533 scr_refresh (refresh_type); 1604 scr_refresh (refresh_type);
1534 } 1605 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1622 menubar_expose ();
1552#endif 1623#endif
1553 1624
1554#ifdef TRANSPARENT 1625#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1626 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1627 XClearWindow (disp, ev.xany.window);
1557#endif 1628#endif
1558 } 1629 }
1559 break; 1630 break;
1560 1631
… …
1571 } 1642 }
1572#endif 1643#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1645 break;
1575 1646
1576 if (ev.xany.window == TermWin.vt) 1647 if (ev.xany.window == vt)
1577 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1652 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1654 ;
1582 1655
1583 XQueryPointer (disp, TermWin.vt, 1656 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1659 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1660 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1661#ifdef MOUSE_THRESHOLD
… …
1600#endif 1673#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1674 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1675 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1676
1604#ifdef SELECTION_SCROLLING 1677#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1678 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1679 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1680 {
1608 int dist; 1681 int dist;
1609 1682
1610 /* don't clobber the current delay if we are 1683 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1684 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1692 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1693 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1694 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1695
1623 /* calc number of lines to scroll */ 1696 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1697 if (ev.xbutton.y < int_bwidth)
1625 { 1698 {
1626 scroll_selection_dir = UP; 1699 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1700 dist = int_bwidth - ev.xbutton.y;
1628 } 1701 }
1629 else 1702 else
1630 { 1703 {
1631 scroll_selection_dir = DN; 1704 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1705 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1706 }
1634 1707
1635 scroll_selection_lines = Pixel2Height (dist) 1708 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1709 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1710 + 1;
1638 MIN_IT (scroll_selection_lines, 1711 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1712 SELECTION_SCROLL_MAX_LINES);
1640 } 1713 }
1641 else 1714 else
1642 { 1715 {
1643 /* we are within the text window, so we 1716 /* we are within the text window, so we
… …
1671 } 1744 }
1672 break; 1745 break;
1673 } 1746 }
1674} 1747}
1675 1748
1749void
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 {
1762 IMSetStatusPosition ();
1763 XSetICFocus (Input_Context);
1764 }
1765#endif
1766#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_focused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1778}
1779
1780void
1781rxvt_term::focus_out ()
1782{
1783 if (focus)
1784 {
1785 focus = 0;
1786 want_refresh = 1;
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1793 iso14755buf = 0;
1794# if ENABLE_OVERLAY
1795 scr_overlay_off ();
1796# endif
1797 }
1798#endif
1799#if USE_XIM
1800 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context);
1802#endif
1803#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink))
1805 cursor_blink_ev.stop ();
1806 hidden_cursor = 0;
1807#endif
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1810 {
1811 pix_colors = pix_colors_unfocused;
1812 scr_recolour ();
1813 }
1814#endif
1815 }
1816}
1817
1676#if TRANSPARENT 1818#if TRANSPARENT
1677void 1819void
1678rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1821{
1680 SET_R (this); 1822 SET_R (this);
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1834 return;
1693 1835
1694 /* FALLTHROUGH */ 1836 /* FALLTHROUGH */
1695 case ReparentNotify: 1837 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1839 want_refresh = want_full_refresh = 1;
1698 break; 1840 break;
1699 } 1841 }
1700} 1842}
1701#endif 1843#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1705{ 1847{
1706 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1707 1849
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1709 if (!bypass_keystate) 1852 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1854
1712 /* 1855 /*
1713 * VT window processing of button press 1856 * VT window processing of button press
1714 */ 1857 */
1715 if (ev.window == TermWin.vt) 1858 if (ev.window == vt)
1716 { 1859 {
1717#if ISO_14755 1860#if ISO_14755
1718 // 5.4 1861 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1863 {
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1735 { 1878 {
1736 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1737 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1738 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1739 { 1883 {
1740 /* only report double clicks */ 1884 /* only report double clicks */
1741 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1742 mouse_report (ev); 1886 mouse_report (ev);
… …
1762 else 1906 else
1763 { 1907 {
1764 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1765 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1766 1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1767 switch (ev.button) 1912 switch (ev.button)
1768 { 1913 {
1769 case Button1: 1914 case Button1:
1770 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1772#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1774#else 1919#else
1775 selection.rect = false; 1920 selection.rect = false;
1776#endif 1921#endif
1777 1922
1778 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1780 { 1925 {
1781 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1783 else 1928 else
1784 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1785 } 1930 }
1786 else 1931 else
1787 { 1932 {
1788 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1789 MEvent.clicks++; 1934 MEvent.clicks++;
1790 else 1935 else
1791 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1792 1937
1793 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1794 } 1939 }
1795 1940
1796 MEvent.button = Button1; 1941 MEvent.button = Button1;
1797 break; 1942 break;
1798 1943
1799 case Button3: 1944 case Button3:
1800 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1801 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1802 else 1947 else
1803 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1804 1949
1805 MEvent.button = Button3; 1950 MEvent.button = Button3;
1806 break; 1951 break;
1807 } 1952 }
1808 } 1953 }
1809 1954
1810 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1811 return; 1956 return;
1812 } 1957 }
1813 1958
… …
1925 case Button3: 2070 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != R_SB_XTERM)
1927 { 2072 {
1928 if (scrollbar_above_slider (ev.y)) 2073 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2075 scr_page (UP, nrow - 1);
1931# else 2076# else
1932 scr_page (UP, TermWin.nrow / 4); 2077 scr_page (UP, nrow / 4);
1933# endif 2078# endif
1934 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2081 scr_page (DN, nrow - 1);
1937# else 2082# else
1938 scr_page (DN, TermWin.nrow / 4); 2083 scr_page (DN, nrow / 4);
1939# endif 2084# endif
1940 else 2085 else
1941 scrollBar.setMotion (); 2086 scrollBar.setMotion ();
1942 } 2087 }
1943 else 2088 else
1944 { 2089 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2091 (nrow
1947 * scrollbar_position (ev.y) 2092 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2093 / scrollbar_size ()));
1949 } 2094 }
1950 2095
1951 break; 2096 break;
1952 } 2097 }
1953 } 2098 }
2099
1954 return; 2100 return;
1955 } 2101 }
2102
1956#if MENUBAR 2103#if MENUBAR
1957 /* 2104 /*
1958 * Menubar window processing of button press 2105 * Menubar window processing of button press
1959 */ 2106 */
1960 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
1983#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
1986#endif 2133#endif
1987 2134
1988 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
1989 { 2136 {
1990#if ISO_14755 2137#if ISO_14755
1991 // 5.4 2138 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2140 return;
… …
2023 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2024 && bypass_keystate 2171 && bypass_keystate
2025 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2026 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2027 2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2028 switch (ev.button) 2178 switch (ev.button)
2029 { 2179 {
2030 case Button1: 2180 case Button1:
2031 case Button3: 2181 case Button3:
2032 selection_make (ev.time); 2182 selection_make (ev.time);
… …
2043 2193
2044 v = ev.button == Button4 ? UP : DN; 2194 v = ev.button == Button4 ? UP : DN;
2045 2195
2046 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2047 i = 1; 2197 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2198 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2199 i = nrow - 1;
2050 else 2200 else
2051 i = 5; 2201 i = 5;
2052 2202
2053# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2055 { 2205 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2207 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; 2208 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2209
2060 if (slip_wheel_ev.at < NOW) 2210 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2212
2063 slip_wheel_ev.start (); 2213 slip_wheel_ev.start ();
… …
2339 XWindowAttributes wattr, wrootattr; 2489 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2490 dDisp;
2341 2491
2342 pchanged = 0; 2492 pchanged = 0;
2343 2493
2344 if (!(options & Opt_transparent)) 2494 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2495 return pchanged; /* Don't try any more */
2346 2496
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2498 rootdepth = wrootattr.depth;
2349 2499
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2500 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2501
2352 if (rootdepth != wattr.depth) 2502 if (rootdepth != wattr.depth)
2353 { 2503 {
2354 if (am_transparent) 2504 if (am_transparent)
2355 { 2505 {
2356 pchanged = 1; 2506 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2508 am_transparent = am_pixmap_trans = 0;
2359 } 2509 }
2360 2510
2361 return pchanged; /* Don't try any more */ 2511 return pchanged; /* Don't try any more */
2362 } 2512 }
… …
2403 Window cr; 2553 Window cr;
2404 XImage *image; 2554 XImage *image;
2405 GC gc; 2555 GC gc;
2406 XGCValues gcvalue; 2556 XGCValues gcvalue;
2407 2557
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2558 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2559 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2560 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2561 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2562 nx = ny = 0;
2413 2563
… …
2423 nh += sy; 2573 nh += sy;
2424 ny = -sy; 2574 ny = -sy;
2425 sy = 0; 2575 sy = 0;
2426 } 2576 }
2427 2577
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2580
2431 XSync (disp, False); 2581 XSync (disp, False);
2432 allowedxerror = -1; 2582 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2584
… …
2439 if (image == NULL) 2589 if (image == NULL)
2440 { 2590 {
2441 if (am_transparent && am_pixmap_trans) 2591 if (am_transparent && am_pixmap_trans)
2442 { 2592 {
2443 pchanged = 1; 2593 pchanged = 1;
2444 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2445 { 2595 {
2446 XFreePixmap (disp, TermWin.pixmap); 2596 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2597 pixmap = None;
2448 } 2598 }
2449 } 2599 }
2450 2600
2451 am_pixmap_trans = 0; 2601 am_pixmap_trans = 0;
2452 } 2602 }
2453 else 2603 else
2454 { 2604 {
2455 if (TermWin.pixmap != None) 2605 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2606 XFreePixmap (disp, pixmap);
2457 2607
2458#if TINTING 2608#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2609 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2610 {
2461 unsigned short rm, gm, bm; 2611 unsigned short rm, gm, bm;
… …
2465 2615
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2616 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2617 }
2468#endif 2618#endif
2469 2619
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2620 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2621 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2624 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2625 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2626 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2628 XClearWindow (disp, parent[0]);
2479 2629
2480 if (!am_transparent || !am_pixmap_trans) 2630 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2631 pchanged = 1;
2482 2632
2483 am_transparent = am_pixmap_trans = 1; 2633 am_transparent = am_pixmap_trans = 1;
2484 } 2634 }
2485 } 2635 }
2486 2636
2487 if (am_pixmap_trans) 2637 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2639 else
2490 { 2640 {
2491 unsigned int n; 2641 unsigned int n;
2492 /* 2642 /*
2493 * InheritPixmap transparency 2643 * InheritPixmap transparency
2494 */ 2644 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2646 {
2497 oldp = TermWin.parent[i]; 2647 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2648 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2649 &parent[i], &list, &n);
2500 XFree (list); 2650 XFree (list);
2501 2651
2502 if (TermWin.parent[i] == display->root) 2652 if (parent[i] == display->root)
2503 { 2653 {
2504 if (oldp != None) 2654 if (oldp != None)
2505 pchanged = 1; 2655 pchanged = 1;
2506 2656
2507 break; 2657 break;
2508 } 2658 }
2509 2659
2510 if (oldp != TermWin.parent[i]) 2660 if (oldp != parent[i])
2511 pchanged = 1; 2661 pchanged = 1;
2512 } 2662 }
2513 2663
2514 n = 0; 2664 n = 0;
2515 2665
2516 if (pchanged) 2666 if (pchanged)
2517 { 2667 {
2518 for (; n < (unsigned int)i; n++) 2668 for (; n < (unsigned int)i; n++)
2519 { 2669 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2670 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2672 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2674 break;
2525 } 2675 }
2526 } 2676 }
2527 } 2677 }
2528 2678
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2680 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2683 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2684 /* XXX: also turn off Opt_transparent? */
2535 } 2685 }
2536 else 2686 else
2537 { 2687 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2690 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2691 sleep (1);
2542#endif 2692#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2693 for (n = 0; n < (unsigned int)i; n++)
2544 { 2694 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2696 XClearWindow (disp, parent[n]);
2547 } 2697 }
2548 2698
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2700 am_transparent = 1;
2551 } 2701 }
2552 2702
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2704 parent[i] = None;
2555 } 2705 }
2556 2706
2557 if (scrollBar.win) 2707 if (scrollBar.win)
2558 { 2708 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2576 2726
2577bool 2727bool
2578rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2579{ 2729{
2580 bool flag = false; 2730 bool flag = false;
2581 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2583 2733
2584 for (;;) 2734 for (;;)
2585 { 2735 {
2586 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2587 { 2737 {
2588 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2739 ch = next_char ();
2590 }
2591 2740
2592 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2593 break; 2742 break;
2743 }
2594 2744
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2746 {
2597 if (!seen_input) 2747 if (!seen_input)
2598 { 2748 {
… …
2602 // some window managers resize the window early, and these programs 2752 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2753 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2754 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2755 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2756 // resized.
2607 if (seen_resize) 2757 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2609 } 2759 }
2610 2760
2611 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2763 bool refreshnow = false;
2614 int nlines = 0; 2764 int nlines = 0;
2615 unicode_t *str = buf; 2765 wchar_t *str = buf;
2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2767
2617 for (;;) 2768 for (;;)
2618 { 2769 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2771 break;
2621 2772
2622 *str++ = ch; 2773 *str++ = ch;
2623 2774
2624 if (ch == C0_LF) 2775 if (ch == C0_LF || str >= eol)
2625 { 2776 {
2777 if (ch == C0_LF)
2626 nlines++; 2778 nlines++;
2779
2627 refresh_count++; 2780 refresh_count++;
2628 2781
2629 if (!(options & Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2784 {
2632 refreshnow = true; 2785 refreshnow = true;
2786 refresh_count = 0;
2633 ch = NOCHAR; 2787 ch = NOCHAR;
2634 break; 2788 break;
2635 } 2789 }
2636 2790
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2792 if (nlines >= nrow - 1)
2639 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2640 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2641 nlines = 0; 2797 nlines = 0;
2642 str = buf; 2798 str = buf;
2799 eol = str + min (ncol, UBUFSIZ);
2643 } 2800 }
2644 }
2645 2801
2646 if (str >= buf + UBUFSIZ) 2802 if (str >= eol)
2647 { 2803 {
2804 if (eol >= buf + UBUFSIZ)
2805 {
2648 ch = NOCHAR; 2806 ch = NOCHAR;
2649 break; 2807 break;
2808 }
2809 else
2810 eol = min (eol + ncol, buf + UBUFSIZ);
2811 }
2812
2650 } 2813 }
2651 2814
2652 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2816 ch = next_char ();
2654 } 2817 }
2655 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2656 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2657 2821
2658 /* 2822 /*
2659 * If there have been a lot of new lines, then update the screen 2823 * 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. 2824 * 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 2825 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2826 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2827 */
2664 if (refreshnow) 2828 if (refreshnow)
2665 { 2829 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2831 refresh_limit++;
2668 else 2832 else
2669 { 2833 {
2670 flag = true; 2834 flag = true;
2671 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2672 } 2837 }
2673 } 2838 }
2674 2839
2675 } 2840 }
2676 else 2841 else
… …
2691 } 2856 }
2692 2857
2693 return flag; 2858 return flag;
2694} 2859}
2695 2860
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 2861// read the next character
2706unicode_t 2862wchar_t
2707rxvt_term::next_char () 2863rxvt_term::next_char ()
2708{ 2864{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2866 {
2711 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2714 2870
2715 wchar_t wc; 2871 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2873
2718 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2719 { 2875 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2878 break;
2723 } 2879 }
2724 2880
2725 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2883
2728 // assume wchar == unicode 2884 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2731 } 2887 }
2732 2888
2733 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2734} 2899}
2735 2900
2736/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2737/* 2902/*
2738 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2739 * to the command. 2904 * to the command.
2740 */ 2905 */
2741unicode_t 2906wchar_t
2742rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2743{ 2908{
2744 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2745 2910
2746 if (c == NOCHAR) 2911 if (c == NOCHAR)
2747 throw out_of_input; 2912 throw out_of_input;
2748 2913
2749 return c; 2914 return c;
2750} 2915}
2751 2916
2752unicode_t 2917uint32_t
2753rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2754{ 2919{
2755 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2756 2921
2757 if (c == NOCHAR) 2922 if (c == NOCHAR)
2758 throw out_of_input; 2923 throw out_of_input;
2759 2924
2760 return c; 2925 return c;
… …
2860 case C0_ESC: 3025 case C0_ESC:
2861 process_escape_seq (); 3026 process_escape_seq ();
2862 break; 3027 break;
2863 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 3031 else
2868 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 3033 break;
2871 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2872 scr_bell (); 3035 scr_bell ();
2873 break; 3036 break;
2874 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
3029 break; 3192 break;
3030 3193
3031 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3033 { 3196 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3199 }
3037 break; 3200 break;
3038 3201
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3225 process_dcs_seq ();
3063 break; 3226 break;
3064 3227
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
3070 3232
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3235 process_csi_seq ();
… …
3313 3475
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3476 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3477 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3478 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3481 break;
3320 3482
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3485 break;
3325 3486
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3328 break; 3489 break;
… …
3335 break; 3496 break;
3336 case 6: /* CPR requested */ 3497 case 6: /* CPR requested */
3337 scr_report_position (); 3498 scr_report_position ();
3338 break; 3499 break;
3339 case 7: /* unofficial extension */ 3500 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3501 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3502 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3503 break;
3343 case 8: /* unofficial extension */ 3504 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3506 break;
… …
3448 { 3609 {
3449 /* 3610 /*
3450 * commands 3611 * commands
3451 */ 3612 */
3452 case 1: /* deiconify window */ 3613 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3614 XMapWindow (disp, parent[0]);
3454 break; 3615 break;
3455 case 2: /* iconify window */ 3616 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3617 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3618 break;
3458 case 3: /* set position (pixels) */ 3619 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3620 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3621 break;
3461 case 4: /* set size (pixels) */ 3622 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3624 break;
3464 case 5: /* raise window */ 3625 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3626 XRaiseWindow (disp, parent[0]);
3466 break; 3627 break;
3467 case 6: /* lower window */ 3628 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3629 XLowerWindow (disp, parent[0]);
3469 break; 3630 break;
3470 case 7: /* refresh window */ 3631 case 7: /* refresh window */
3471 scr_touch (true); 3632 scr_touch (true);
3472 break; 3633 break;
3473 case 8: /* set size (chars) */ 3634 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3635 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3476 break; 3637 break;
3477 3638
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3639 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3640 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3641 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3642 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3643 (unsigned int) (args[1] * fheight));
3483 break; 3644 break;
3484 3645
3485 3646
3486 /* 3647 /*
3487 * reports - some output format copied from XTerm 3648 * reports - some output format copied from XTerm
3488 */ 3649 */
3489 case 11: /* report window state */ 3650 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3653 break;
3493 case 13: /* report window position */ 3654 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3656 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3657 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3658 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3659 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3660 break;
3500 case 14: /* report window size (pixels) */ 3661 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3662 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3664 break;
3504 case 18: /* report text area size (chars) */ 3665 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3666 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3667 break;
3507 case 19: /* report window size (chars) */ 3668 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3669 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3670 break;
3510 case 20: /* report icon label */ 3671 case 20: /* report icon label */
3511 { 3672 {
3512 char *s; 3673 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3674 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3676 XFree (s);
3516 } 3677 }
3517 break; 3678 break;
3518 case 21: /* report window title */ 3679 case 21: /* report window title */
3519 { 3680 {
3520 char *s; 3681 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3682 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3684 XFree (s);
3524 } 3685 }
3525 break; 3686 break;
3526 } 3687 }
3527} 3688}
… …
3530/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3531/* 3692/*
3532 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3534 */ 3695 */
3535unsigned char * 3696char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3698{
3538 unicode_t ch; 3699 unicode_t ch;
3539 bool seen_esc = false; 3700 bool seen_esc = false;
3540 unsigned int n = 0; 3701 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3720 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3721 return NULL; /* other control character - exit */
3561 3722
3562 seen_esc = false; 3723 seen_esc = false;
3563 3724
3564 if (n >= sizeof (string) - 1) 3725 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3726 // stop at some sane length
3566 return NULL; 3727 return NULL;
3567 3728
3568 if (ch == C0_SYN) 3729 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3730 string[n++] = cmd_get8 ();
… …
3573 3734
3574 string[n++] = '\0'; 3735 string[n++] = '\0';
3575 3736
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3738
3578 return (unsigned char *)rxvt_wcstombs (string); 3739 return rxvt_wcstombs (string);
3579} 3740}
3580 3741
3581/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3582/* 3743/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3745 */
3585void 3746void
3586rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3587{ 3748{
3588 unsigned char *s; 3749 char *s;
3589 unicode_t eh; 3750 unicode_t eh;
3590 3751
3591 /* 3752 /*
3592 * Not handled yet 3753 * Not handled yet
3593 */ 3754 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3614 3775
3615 if (ch == ';') 3776 if (ch == ';')
3616 { 3777 {
3617 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3618 3779
3619 if (s) 3780 if (s)
3620 { 3781 {
3621 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3622 free (s); 3783 free (s);
3623 } 3784 }
3624 } 3785 }
3625} 3786}
3626 3787
3627void 3788void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3790{
3630 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3631 { 3792 {
3632 unsigned short r, g, b; 3793 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
… …
3637 set_window_color (color, str); 3798 set_window_color (color, str);
3638} 3799}
3639 3800
3640/* 3801/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * 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 */ 3803 */
3665void 3804void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3806{
3668 int changed = 0; 3807 int changed = 0;
3669 int color; 3808 int color;
3670 char *buf, *name; 3809 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
… …
3694 unsigned long bytes_after; 3833 unsigned long bytes_after;
3695 unsigned char *value = 0; 3834 unsigned char *value = 0;
3696 const char *str = ""; 3835 const char *str = "";
3697 3836
3698 if (prop 3837 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3838 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3839 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3840 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3841 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3842 && actual_type != None
3704 && actual_format == 8) 3843 && actual_format == 8)
… …
3716 { 3855 {
3717 *eq = 0; 3856 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3857 set_utf8_property (display->atom (str), eq + 1);
3719 } 3858 }
3720 else 3859 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3860 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3861 display->atom (str));
3723 } 3862 }
3724 break; 3863 break;
3725 3864
3726 case XTerm_Color: 3865 case XTerm_Color:
… …
3767 break; 3906 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3907#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3908 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3909 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3910 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3911 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3913 break;
3778 case XTerm_Color_RV: 3914 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3916 break;
3917 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919 break;
3781#endif 3920#endif
3782#if TRANSPARENT && TINTING 3921#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3922 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3924 check_our_parents ();
3786 if (am_transparent) 3925 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3926 want_full_refresh = want_refresh = 1;
3788 break; 3927 break;
3789#endif 3928#endif
… …
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 XTerm_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 if (mode)
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162
4163 scr_touch (true);
4164 break;
4165#endif
4000 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4001 case 1049: 4167 case 1049:
4002 if (options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4169 if (mode == 0)
4004 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
4005 else if (mode == 1) 4171 else if (mode == 1)
4006 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
4007 break; 4173 break;
… …
4019 */ 4185 */
4020 PrivMode (1, PrivMode_vt52); 4186 PrivMode (1, PrivMode_vt52);
4021 break; 4187 break;
4022 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4191 break;
4026 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4027 if (state) 4193 if (!state)
4028 options &= ~Opt_jumpScroll; 4194 SET_OPTION (Opt_jumpScroll);
4029 else 4195 else
4030 options |= Opt_jumpScroll; 4196 CLR_OPTION (Opt_jumpScroll);
4031 break; 4197 break;
4032 case 5: /* reverse video */ 4198 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4199 scr_rvideo_mode (state);
4034 break; 4200 break;
4035 case 6: /* relative/absolute origins */ 4201 case 6: /* relative/absolute origins */
… …
4076#if 0 4242#if 0
4077 case 1001: 4243 case 1001:
4078 break; /* X11 mouse highlighting */ 4244 break; /* X11 mouse highlighting */
4079#endif 4245#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4246 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state) 4247 if (!state)
4082 options &= ~Opt_scrollTtyOutput; 4248 SET_OPTION (Opt_scrollTtyOutput);
4083 else 4249 else
4084 options |= Opt_scrollTtyOutput; 4250 CLR_OPTION (Opt_scrollTtyOutput);
4085 break; 4251 break;
4086 case 1011: /* scroll to bottom on key press */ 4252 case 1011: /* scroll to bottom on key press */
4087 if (state) 4253 if (state)
4088 options |= Opt_scrollTtyKeypress; 4254 SET_OPTION (Opt_scrollTtyKeypress);
4089 else 4255 else
4090 options &= ~Opt_scrollTtyKeypress; 4256 CLR_OPTION (Opt_scrollTtyKeypress);
4091 break; 4257 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4258 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4259 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4260 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4261 scr_erase_screen (2);
4096 scr_change_screen (state); 4262 scr_change_screen (state);
4097 break; 4263 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4264 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4265 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4266 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4267 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4268 scr_erase_screen (2);
4103 break; 4269 break;
4104 default: 4270 default:
4105 break; 4271 break;
… …
4233 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4234 break; 4400 break;
4235 4401
4236 //case 50: // not variable spacing 4402 //case 50: // not variable spacing
4237 4403
4238#ifndef NO_BRIGHTCOLOR 4404#if ENABLE_FRILLS
4239 case 90: 4405 case 90:
4240 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4241 case 92: 4407 case 92:
4242 case 93: 4408 case 93:
4243 case 94: 4409 case 94:
… …
4255 case 106: 4421 case 106:
4256 case 107: 4422 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4423 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4424 break;
4259#endif 4425#endif
4260
4261 } 4426 }
4262 } 4427 }
4263} 4428}
4264/*}}} */ 4429/*}}} */
4265 4430
… …
4289 */ 4454 */
4290void 4455void
4291rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4292{ 4457{
4293 va_list arg_ptr; 4458 va_list arg_ptr;
4294 unsigned char buf[256]; 4459 char buf[256];
4295 4460
4296 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4463 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4464 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
4305 */ 4470 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4472
4308void 4473void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4311 if (v_buflen == 0) 4479 if (v_buflen == 0)
4312 { 4480 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4314 4482
4315 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)
… …
4317 4485
4318 data += written; 4486 data += written;
4319 len -= written; 4487 len -= written;
4320 } 4488 }
4321 4489
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4491
4324 memcpy (v_buffer + v_buflen, data, len); 4492 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4493 v_buflen += len;
4326 4494
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4495 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4346 } 4514 }
4347 4515
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4516 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4517 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4519 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4520}
4354 4521
4355/*----------------------- end-of-file (C source) -----------------------*/ 4522/*----------------------- end-of-file (C source) -----------------------*/
4356 4523

Diff Legend

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