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.198 by root, Sat Feb 19 01:07:58 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
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 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 }
1338#if ENABLE_XEMBED 1454#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1456 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1458 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1460 focus_out ();
… …
1409 case FocusOut: 1524 case FocusOut:
1410 focus_out (); 1525 focus_out ();
1411 break; 1526 break;
1412 1527
1413 case ConfigureNotify: 1528 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1529 if (ev.xconfigure.window == parent[0])
1415 { 1530 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ;
1425 1533
1426 if (szHint.width != width || szHint.height != height) 1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1535 {
1428 seen_resize = 1; 1536 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1538 }
1431 1539
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1542 check_our_parents ();
1435#endif 1543#endif
1436 } 1544 }
1437 break; 1545 break;
1438 1546
… …
1454 1562
1455 case SelectionRequest: 1563 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1457 break; 1565 break;
1458 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
1459 case UnmapNotify: 1575 case UnmapNotify:
1460 TermWin.mapped = 0; 1576 mapped = 0;
1461#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1463#endif 1579#endif
1464 break; 1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466 case MapNotify:
1467 TermWin.mapped = 1;
1468#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif
1471 break; 1581 break;
1472 1582
1473#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1474 case ReparentNotify: 1584 case ReparentNotify:
1475 rootwin_cb (ev); 1585 rootwin_cb (ev);
1476 break; 1586 break;
1477#endif /* TRANSPARENT */ 1587#endif /* TRANSPARENT */
1478 1588
1479 case GraphicsExpose: 1589 case GraphicsExpose:
1480 case Expose: 1590 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1591 if (ev.xany.window == vt)
1482 { 1592 {
1483 do 1593 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1594 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1595 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1597
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1599
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1601 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1602 ev.xexpose.width, ev.xexpose.height, False);
1493 1603
1494 scr_refresh (refresh_type); 1604 scr_refresh (refresh_type);
1495 } 1605 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1622 menubar_expose ();
1513#endif 1623#endif
1514 1624
1515#ifdef TRANSPARENT 1625#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1626 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1627 XClearWindow (disp, ev.xany.window);
1518#endif 1628#endif
1519 } 1629 }
1520 break; 1630 break;
1521 1631
… …
1532 } 1642 }
1533#endif 1643#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1645 break;
1536 1646
1537 if (ev.xany.window == TermWin.vt) 1647 if (ev.xany.window == vt)
1538 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1652 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1654 ;
1543 1655
1544 XQueryPointer (disp, TermWin.vt, 1656 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1659 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1660 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1661#ifdef MOUSE_THRESHOLD
… …
1561#endif 1673#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1674 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1675 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1676
1565#ifdef SELECTION_SCROLLING 1677#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1678 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1679 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1680 {
1569 int dist; 1681 int dist;
1570 1682
1571 /* don't clobber the current delay if we are 1683 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1684 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1692 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1693 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1694 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1695
1584 /* calc number of lines to scroll */ 1696 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1697 if (ev.xbutton.y < int_bwidth)
1586 { 1698 {
1587 scroll_selection_dir = UP; 1699 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1700 dist = int_bwidth - ev.xbutton.y;
1589 } 1701 }
1590 else 1702 else
1591 { 1703 {
1592 scroll_selection_dir = DN; 1704 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1705 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1706 }
1595 1707
1596 scroll_selection_lines = Pixel2Height (dist) 1708 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1709 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1710 + 1;
1599 MIN_IT (scroll_selection_lines, 1711 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1712 SELECTION_SCROLL_MAX_LINES);
1601 } 1713 }
1602 else 1714 else
1603 { 1715 {
1604 /* we are within the text window, so we 1716 /* we are within the text window, so we
… …
1635} 1747}
1636 1748
1637void 1749void
1638rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1639{ 1751{
1640 if (!TermWin.focus) 1752 if (!focus)
1641 { 1753 {
1642 TermWin.focus = 1; 1754 focus = 1;
1643 want_refresh = 1; 1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1644#ifdef USE_XIM 1759#if USE_XIM
1645 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1646 { 1761 {
1647 IMSetStatusPosition (); 1762 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1763 XSetICFocus (Input_Context);
1649 } 1764 }
1650#endif 1765#endif
1651#ifdef CURSOR_BLINK 1766#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1767 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1769#endif
1655#ifdef OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
1657 { 1772 {
1658 pix_colors = pix_colors_focused; 1773 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1774 scr_recolour ();
1660 } 1775 }
… …
1663} 1778}
1664 1779
1665void 1780void
1666rxvt_term::focus_out () 1781rxvt_term::focus_out ()
1667{ 1782{
1668 if (TermWin.focus) 1783 if (focus)
1669 { 1784 {
1670 TermWin.focus = 0; 1785 focus = 0;
1671 want_refresh = 1; 1786 want_refresh = 1;
1672 1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1673#if ENABLE_FRILLS || ISO_14755 1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1674 iso14755buf = 0; 1793 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY 1794# if ENABLE_OVERLAY
1677 scr_overlay_off (); 1795 scr_overlay_off ();
1678#endif 1796# endif
1797 }
1798#endif
1679#ifdef USE_XIM 1799#if USE_XIM
1680 if (Input_Context != NULL) 1800 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1801 XUnsetICFocus (Input_Context);
1682#endif 1802#endif
1683#ifdef CURSOR_BLINK 1803#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1804 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1805 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1806 hidden_cursor = 0;
1687#endif 1807#endif
1688#ifdef OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1690 { 1810 {
1691 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1812 scr_recolour ();
1693 } 1813 }
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1834 return;
1715 1835
1716 /* FALLTHROUGH */ 1836 /* FALLTHROUGH */
1717 case ReparentNotify: 1837 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1839 want_refresh = want_full_refresh = 1;
1720 break; 1840 break;
1721 } 1841 }
1722} 1842}
1723#endif 1843#endif
… …
1726rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1727{ 1847{
1728 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1729 1849
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1731 if (!bypass_keystate) 1852 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1854
1734 /* 1855 /*
1735 * VT window processing of button press 1856 * VT window processing of button press
1736 */ 1857 */
1737 if (ev.window == TermWin.vt) 1858 if (ev.window == vt)
1738 { 1859 {
1739#if ISO_14755 1860#if ISO_14755
1740 // 5.4 1861 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1863 {
… …
1755#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1756 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1757 { 1878 {
1758 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1759 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1760 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1761 { 1883 {
1762 /* only report double clicks */ 1884 /* only report double clicks */
1763 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1764 mouse_report (ev); 1886 mouse_report (ev);
… …
1784 else 1906 else
1785 { 1907 {
1786 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1787 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1788 1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1789 switch (ev.button) 1912 switch (ev.button)
1790 { 1913 {
1791 case Button1: 1914 case Button1:
1792 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1794#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1796#else 1919#else
1797 selection.rect = false; 1920 selection.rect = false;
1798#endif 1921#endif
1799 1922
1800 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1802 { 1925 {
1803 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1805 else 1928 else
1806 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1807 } 1930 }
1808 else 1931 else
1809 { 1932 {
1810 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1811 MEvent.clicks++; 1934 MEvent.clicks++;
1812 else 1935 else
1813 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1814 1937
1815 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1816 } 1939 }
1817 1940
1818 MEvent.button = Button1; 1941 MEvent.button = Button1;
1819 break; 1942 break;
1820 1943
1821 case Button3: 1944 case Button3:
1822 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1823 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1824 else 1947 else
1825 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1826 1949
1827 MEvent.button = Button3; 1950 MEvent.button = Button3;
1828 break; 1951 break;
1829 } 1952 }
1830 } 1953 }
1831 1954
1832 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1833 return; 1956 return;
1834 } 1957 }
1835 1958
… …
1947 case Button3: 2070 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != R_SB_XTERM)
1949 { 2072 {
1950 if (scrollbar_above_slider (ev.y)) 2073 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2075 scr_page (UP, nrow - 1);
1953# else 2076# else
1954 scr_page (UP, TermWin.nrow / 4); 2077 scr_page (UP, nrow / 4);
1955# endif 2078# endif
1956 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2081 scr_page (DN, nrow - 1);
1959# else 2082# else
1960 scr_page (DN, TermWin.nrow / 4); 2083 scr_page (DN, nrow / 4);
1961# endif 2084# endif
1962 else 2085 else
1963 scrollBar.setMotion (); 2086 scrollBar.setMotion ();
1964 } 2087 }
1965 else 2088 else
1966 { 2089 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2091 (nrow
1969 * scrollbar_position (ev.y) 2092 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2093 / scrollbar_size ()));
1971 } 2094 }
1972 2095
1973 break; 2096 break;
1974 } 2097 }
1975 } 2098 }
2099
1976 return; 2100 return;
1977 } 2101 }
2102
1978#if MENUBAR 2103#if MENUBAR
1979 /* 2104 /*
1980 * Menubar window processing of button press 2105 * Menubar window processing of button press
1981 */ 2106 */
1982 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
2005#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
2008#endif 2133#endif
2009 2134
2010 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
2011 { 2136 {
2012#if ISO_14755 2137#if ISO_14755
2013 // 5.4 2138 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2140 return;
… …
2045 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2046 && bypass_keystate 2171 && bypass_keystate
2047 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2048 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2049 2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2050 switch (ev.button) 2178 switch (ev.button)
2051 { 2179 {
2052 case Button1: 2180 case Button1:
2053 case Button3: 2181 case Button3:
2054 selection_make (ev.time); 2182 selection_make (ev.time);
… …
2065 2193
2066 v = ev.button == Button4 ? UP : DN; 2194 v = ev.button == Button4 ? UP : DN;
2067 2195
2068 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2069 i = 1; 2197 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2198 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2199 i = nrow - 1;
2072 else 2200 else
2073 i = 5; 2201 i = 5;
2074 2202
2075# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2077 { 2205 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += v ? -1 : 1;
2079 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;
2080 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;
2081 2209
2082 if (slip_wheel_ev.at < NOW) 2210 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2212
2085 slip_wheel_ev.start (); 2213 slip_wheel_ev.start ();
… …
2361 XWindowAttributes wattr, wrootattr; 2489 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2490 dDisp;
2363 2491
2364 pchanged = 0; 2492 pchanged = 0;
2365 2493
2366 if (!(options & Opt_transparent)) 2494 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2495 return pchanged; /* Don't try any more */
2368 2496
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2498 rootdepth = wrootattr.depth;
2371 2499
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2500 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2501
2374 if (rootdepth != wattr.depth) 2502 if (rootdepth != wattr.depth)
2375 { 2503 {
2376 if (am_transparent) 2504 if (am_transparent)
2377 { 2505 {
2378 pchanged = 1; 2506 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2508 am_transparent = am_pixmap_trans = 0;
2381 } 2509 }
2382 2510
2383 return pchanged; /* Don't try any more */ 2511 return pchanged; /* Don't try any more */
2384 } 2512 }
… …
2425 Window cr; 2553 Window cr;
2426 XImage *image; 2554 XImage *image;
2427 GC gc; 2555 GC gc;
2428 XGCValues gcvalue; 2556 XGCValues gcvalue;
2429 2557
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2558 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2559 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2560 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2561 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2562 nx = ny = 0;
2435 2563
… …
2445 nh += sy; 2573 nh += sy;
2446 ny = -sy; 2574 ny = -sy;
2447 sy = 0; 2575 sy = 0;
2448 } 2576 }
2449 2577
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2580
2453 XSync (disp, False); 2581 XSync (disp, False);
2454 allowedxerror = -1; 2582 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2584
… …
2461 if (image == NULL) 2589 if (image == NULL)
2462 { 2590 {
2463 if (am_transparent && am_pixmap_trans) 2591 if (am_transparent && am_pixmap_trans)
2464 { 2592 {
2465 pchanged = 1; 2593 pchanged = 1;
2466 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2467 { 2595 {
2468 XFreePixmap (disp, TermWin.pixmap); 2596 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2597 pixmap = None;
2470 } 2598 }
2471 } 2599 }
2472 2600
2473 am_pixmap_trans = 0; 2601 am_pixmap_trans = 0;
2474 } 2602 }
2475 else 2603 else
2476 { 2604 {
2477 if (TermWin.pixmap != None) 2605 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2606 XFreePixmap (disp, pixmap);
2479 2607
2480#if TINTING 2608#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2609 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2610 {
2483 unsigned short rm, gm, bm; 2611 unsigned short rm, gm, bm;
… …
2487 2615
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2616 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2617 }
2490#endif 2618#endif
2491 2619
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2620 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2621 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2624 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2625 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2626 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2628 XClearWindow (disp, parent[0]);
2501 2629
2502 if (!am_transparent || !am_pixmap_trans) 2630 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2631 pchanged = 1;
2504 2632
2505 am_transparent = am_pixmap_trans = 1; 2633 am_transparent = am_pixmap_trans = 1;
2506 } 2634 }
2507 } 2635 }
2508 2636
2509 if (am_pixmap_trans) 2637 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2639 else
2512 { 2640 {
2513 unsigned int n; 2641 unsigned int n;
2514 /* 2642 /*
2515 * InheritPixmap transparency 2643 * InheritPixmap transparency
2516 */ 2644 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2646 {
2519 oldp = TermWin.parent[i]; 2647 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2648 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2649 &parent[i], &list, &n);
2522 XFree (list); 2650 XFree (list);
2523 2651
2524 if (TermWin.parent[i] == display->root) 2652 if (parent[i] == display->root)
2525 { 2653 {
2526 if (oldp != None) 2654 if (oldp != None)
2527 pchanged = 1; 2655 pchanged = 1;
2528 2656
2529 break; 2657 break;
2530 } 2658 }
2531 2659
2532 if (oldp != TermWin.parent[i]) 2660 if (oldp != parent[i])
2533 pchanged = 1; 2661 pchanged = 1;
2534 } 2662 }
2535 2663
2536 n = 0; 2664 n = 0;
2537 2665
2538 if (pchanged) 2666 if (pchanged)
2539 { 2667 {
2540 for (; n < (unsigned int)i; n++) 2668 for (; n < (unsigned int)i; n++)
2541 { 2669 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2670 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2672 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2674 break;
2547 } 2675 }
2548 } 2676 }
2549 } 2677 }
2550 2678
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2680 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2683 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2684 /* XXX: also turn off Opt_transparent? */
2557 } 2685 }
2558 else 2686 else
2559 { 2687 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2690 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2691 sleep (1);
2564#endif 2692#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2693 for (n = 0; n < (unsigned int)i; n++)
2566 { 2694 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2696 XClearWindow (disp, parent[n]);
2569 } 2697 }
2570 2698
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2700 am_transparent = 1;
2573 } 2701 }
2574 2702
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2704 parent[i] = None;
2577 } 2705 }
2578 2706
2579 if (scrollBar.win) 2707 if (scrollBar.win)
2580 { 2708 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2598 2726
2599bool 2727bool
2600rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2601{ 2729{
2602 bool flag = false; 2730 bool flag = false;
2603 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2605 2733
2606 for (;;) 2734 for (;;)
2607 { 2735 {
2608 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2609 { 2737 {
2610 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2739 ch = next_char ();
2612 }
2613 2740
2614 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2615 break; 2742 break;
2743 }
2616 2744
2617 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)
2618 { 2746 {
2619 if (!seen_input) 2747 if (!seen_input)
2620 { 2748 {
… …
2629 if (seen_resize && cmd_pid) 2757 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2631 } 2759 }
2632 2760
2633 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2763 bool refreshnow = false;
2636 int nlines = 0; 2764 int nlines = 0;
2637 unicode_t *str = buf; 2765 wchar_t *str = buf;
2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2638 2767
2639 for (;;) 2768 for (;;)
2640 { 2769 {
2641 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))
2642 break; 2771 break;
2643 2772
2644 *str++ = ch; 2773 *str++ = ch;
2645 2774
2646 if (ch == C0_LF) 2775 if (ch == C0_LF || str >= eol)
2647 { 2776 {
2777 if (ch == C0_LF)
2648 nlines++; 2778 nlines++;
2779
2649 refresh_count++; 2780 refresh_count++;
2650 2781
2651 if (!(options & Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2784 {
2654 refreshnow = true; 2785 refreshnow = true;
2786 refresh_count = 0;
2655 ch = NOCHAR; 2787 ch = NOCHAR;
2656 break; 2788 break;
2657 } 2789 }
2658 2790
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2792 if (nlines >= nrow - 1)
2661 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2662 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2663 nlines = 0; 2797 nlines = 0;
2664 str = buf; 2798 str = buf;
2799 eol = str + min (ncol, UBUFSIZ);
2665 } 2800 }
2666 }
2667 2801
2668 if (str >= buf + UBUFSIZ) 2802 if (str >= eol)
2669 { 2803 {
2804 if (eol >= buf + UBUFSIZ)
2805 {
2670 ch = NOCHAR; 2806 ch = NOCHAR;
2671 break; 2807 break;
2808 }
2809 else
2810 eol = min (eol + ncol, buf + UBUFSIZ);
2811 }
2812
2672 } 2813 }
2673 2814
2674 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2816 ch = next_char ();
2676 } 2817 }
2677 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2678 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2679 2821
2680 /* 2822 /*
2681 * 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
2682 * 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.
2683 * the number of pages between refreshes is refresh_limit, which 2825 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2826 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2827 */
2686 if (refreshnow) 2828 if (refreshnow)
2687 { 2829 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2831 refresh_limit++;
2690 else 2832 else
2691 { 2833 {
2692 flag = true; 2834 flag = true;
2693 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2694 } 2837 }
2695 } 2838 }
2696 2839
2697 } 2840 }
2698 else 2841 else
… …
2713 } 2856 }
2714 2857
2715 return flag; 2858 return flag;
2716} 2859}
2717 2860
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725}
2726
2727// read the next character 2861// read the next character
2728unicode_t 2862wchar_t
2729rxvt_term::next_char () 2863rxvt_term::next_char ()
2730{ 2864{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2866 {
2733 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2735 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2736 2870
2737 wchar_t wc; 2871 wchar_t wc;
2738 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);
2739 2873
2740 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2741 { 2875 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2744 break; 2878 break;
2745 } 2879 }
2746 2880
2747 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2748 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
2749 2883
2750 // assume wchar == unicode 2884 // assume wchar == unicode
2751 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2752 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2753 } 2887 }
2754 2888
2755 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;
2756} 2899}
2757 2900
2758/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2759/* 2902/*
2760 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2761 * to the command. 2904 * to the command.
2762 */ 2905 */
2763unicode_t 2906wchar_t
2764rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2765{ 2908{
2766 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2767 2910
2768 if (c == NOCHAR) 2911 if (c == NOCHAR)
2769 throw out_of_input; 2912 throw out_of_input;
2770 2913
2771 return c; 2914 return c;
2772} 2915}
2773 2916
2774unicode_t 2917uint32_t
2775rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2776{ 2919{
2777 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2778 2921
2779 if (c == NOCHAR) 2922 if (c == NOCHAR)
2780 throw out_of_input; 2923 throw out_of_input;
2781 2924
2782 return c; 2925 return c;
… …
2882 case C0_ESC: 3025 case C0_ESC:
2883 process_escape_seq (); 3026 process_escape_seq ();
2884 break; 3027 break;
2885 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 3031 else
2890 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 3033 break;
2893 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2894 scr_bell (); 3035 scr_bell ();
2895 break; 3036 break;
2896 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
3051 break; 3192 break;
3052 3193
3053 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3054 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3055 { 3196 {
3056 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3057 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3058 } 3199 }
3059 break; 3200 break;
3060 3201
3061 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3062 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3084 process_dcs_seq (); 3225 process_dcs_seq ();
3085 break; 3226 break;
3086 3227
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
3092 3232
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3094 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 3235 process_csi_seq ();
… …
3335 3475
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3476 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3477 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3478 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3481 break;
3342 3482
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 3485 break;
3347 3486
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3350 break; 3489 break;
… …
3357 break; 3496 break;
3358 case 6: /* CPR requested */ 3497 case 6: /* CPR requested */
3359 scr_report_position (); 3498 scr_report_position ();
3360 break; 3499 break;
3361 case 7: /* unofficial extension */ 3500 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3501 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3502 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3503 break;
3365 case 8: /* unofficial extension */ 3504 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3506 break;
… …
3470 { 3609 {
3471 /* 3610 /*
3472 * commands 3611 * commands
3473 */ 3612 */
3474 case 1: /* deiconify window */ 3613 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3614 XMapWindow (disp, parent[0]);
3476 break; 3615 break;
3477 case 2: /* iconify window */ 3616 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3617 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3618 break;
3480 case 3: /* set position (pixels) */ 3619 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3620 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3621 break;
3483 case 4: /* set size (pixels) */ 3622 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3624 break;
3486 case 5: /* raise window */ 3625 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3626 XRaiseWindow (disp, parent[0]);
3488 break; 3627 break;
3489 case 6: /* lower window */ 3628 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3629 XLowerWindow (disp, parent[0]);
3491 break; 3630 break;
3492 case 7: /* refresh window */ 3631 case 7: /* refresh window */
3493 scr_touch (true); 3632 scr_touch (true);
3494 break; 3633 break;
3495 case 8: /* set size (chars) */ 3634 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3635 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3498 break; 3637 break;
3499 3638
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3639 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3640 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3641 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3642 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3643 (unsigned int) (args[1] * fheight));
3505 break; 3644 break;
3506 3645
3507 3646
3508 /* 3647 /*
3509 * reports - some output format copied from XTerm 3648 * reports - some output format copied from XTerm
3510 */ 3649 */
3511 case 11: /* report window state */ 3650 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3653 break;
3515 case 13: /* report window position */ 3654 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3656 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3657 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3658 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3659 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3660 break;
3522 case 14: /* report window size (pixels) */ 3661 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3662 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3664 break;
3526 case 18: /* report text area size (chars) */ 3665 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3666 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3667 break;
3529 case 19: /* report window size (chars) */ 3668 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3669 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3670 break;
3532 case 20: /* report icon label */ 3671 case 20: /* report icon label */
3533 { 3672 {
3534 char *s; 3673 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3674 XGetIconName (disp, parent[0], &s);
3536 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 */
3537 XFree (s); 3676 XFree (s);
3538 } 3677 }
3539 break; 3678 break;
3540 case 21: /* report window title */ 3679 case 21: /* report window title */
3541 { 3680 {
3542 char *s; 3681 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3682 XFetchName (disp, parent[0], &s);
3544 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 */
3545 XFree (s); 3684 XFree (s);
3546 } 3685 }
3547 break; 3686 break;
3548 } 3687 }
3549} 3688}
… …
3552/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3553/* 3692/*
3554 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3556 */ 3695 */
3557unsigned char * 3696char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3698{
3560 unicode_t ch; 3699 unicode_t ch;
3561 bool seen_esc = false; 3700 bool seen_esc = false;
3562 unsigned int n = 0; 3701 unsigned int n = 0;
… …
3581 else if (ch < 0x20) 3720 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3721 return NULL; /* other control character - exit */
3583 3722
3584 seen_esc = false; 3723 seen_esc = false;
3585 3724
3586 if (n >= sizeof (string) - 1) 3725 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3726 // stop at some sane length
3588 return NULL; 3727 return NULL;
3589 3728
3590 if (ch == C0_SYN) 3729 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3730 string[n++] = cmd_get8 ();
… …
3595 3734
3596 string[n++] = '\0'; 3735 string[n++] = '\0';
3597 3736
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3738
3600 return (unsigned char *)rxvt_wcstombs (string); 3739 return rxvt_wcstombs (string);
3601} 3740}
3602 3741
3603/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3604/* 3743/*
3605 * 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)'
3606 */ 3745 */
3607void 3746void
3608rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3609{ 3748{
3610 unsigned char *s; 3749 char *s;
3611 unicode_t eh; 3750 unicode_t eh;
3612 3751
3613 /* 3752 /*
3614 * Not handled yet 3753 * Not handled yet
3615 */ 3754 */
… …
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3636 3775
3637 if (ch == ';') 3776 if (ch == ';')
3638 { 3777 {
3639 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3640 3779
3641 if (s) 3780 if (s)
3642 { 3781 {
3643 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3644 free (s); 3783 free (s);
3645 } 3784 }
3646 } 3785 }
3647} 3786}
3648 3787
3649void 3788void
3650rxvt_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)
3651{ 3790{
3652 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3653 { 3792 {
3654 unsigned short r, g, b; 3793 unsigned short r, g, b;
3655 pix_colors_focused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
… …
3659 set_window_color (color, str); 3798 set_window_color (color, str);
3660} 3799}
3661 3800
3662/* 3801/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3803 */
3687void 3804void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3689{ 3806{
3690 int changed = 0; 3807 int changed = 0;
3691 int color; 3808 int color;
3692 char *buf, *name; 3809 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
… …
3716 unsigned long bytes_after; 3833 unsigned long bytes_after;
3717 unsigned char *value = 0; 3834 unsigned char *value = 0;
3718 const char *str = ""; 3835 const char *str = "";
3719 3836
3720 if (prop 3837 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3838 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3839 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3840 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3841 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3842 && actual_type != None
3726 && actual_format == 8) 3843 && actual_format == 8)
… …
3738 { 3855 {
3739 *eq = 0; 3856 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3857 set_utf8_property (display->atom (str), eq + 1);
3741 } 3858 }
3742 else 3859 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3860 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3861 display->atom (str));
3745 } 3862 }
3746 break; 3863 break;
3747 3864
3748 case XTerm_Color: 3865 case XTerm_Color:
… …
3789 break; 3906 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3907#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3908 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3909 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3910 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3911 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3913 break;
3800 case XTerm_Color_RV: 3914 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3916 break;
3917 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919 break;
3803#endif 3920#endif
3804#if TRANSPARENT && TINTING 3921#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3922 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3924 check_our_parents ();
3808 if (am_transparent) 3925 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3926 want_full_refresh = want_refresh = 1;
3810 break; 3927 break;
3811#endif 3928#endif
… …
3845 3962
3846 case XTerm_logfile: 3963 case XTerm_logfile:
3847 // TODO, when secure mode? 3964 // TODO, when secure mode?
3848 break; 3965 break;
3849 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
3850 case XTerm_font: 3985 case XTerm_font:
3851 op = URxvt_font; 3986 op = URxvt_font;
3852 case URxvt_font: 3987 case URxvt_font:
3853#if ENABLE_STYLES 3988#if ENABLE_STYLES
3854 case URxvt_boldFont: 3989 case URxvt_boldFont:
3855 case URxvt_italicFont: 3990 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3991 case URxvt_boldItalicFont:
3857#endif 3992#endif
3858 if (query) 3993 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3994 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3996 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3997 resp);
3863 else 3998 else
3864 { 3999 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4000 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 4001
… …
3869 set_fonts (); 4004 set_fonts ();
3870 } 4005 }
3871 break; 4006 break;
3872 4007
3873#if ENABLE_FRILLS 4008#if ENABLE_FRILLS
3874 case XTerm_locale: 4009 case URxvt_locale:
3875 if (query) 4010 if (query)
3876 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);
3877 else 4012 else
3878 { 4013 {
3879 set_locale (str); 4014 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 4015 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 4016 init_xlocale ();
3883# endif
3884 } 4017 }
3885 break; 4018 break;
3886#endif
3887 4019
3888#ifdef MENUBAR 4020 case URxvt_view_up:
3889 case XTerm_Menu: 4021 case URxvt_view_down:
3890 if (options & Opt_insecure) 4022 {
3891 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
3892 break; 4031 break;
3893#endif 4032#endif
3894#if 0 4033
3895 case XTerm_dumpscreen: /* no error notices */ 4034#if ENABLE_PERL
3896 { 4035 case URxvt_perl:
3897 int fd; 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4037 ; // no responses yet
3899 {
3900 scr_dump (fd);
3901 close (fd);
3902 }
3903 }
3904 break; 4038 break;
3905#endif 4039#endif
3906 } 4040 }
3907} 4041}
3908/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
4017 } 4151 }
4018 4152
4019 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4154 switch (arg[i])
4021 { 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
4022 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4023 case 1049: 4167 case 1049:
4024 if (options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4169 if (mode == 0)
4026 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
4027 else if (mode == 1) 4171 else if (mode == 1)
4028 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
4029 break; 4173 break;
… …
4041 */ 4185 */
4042 PrivMode (1, PrivMode_vt52); 4186 PrivMode (1, PrivMode_vt52);
4043 break; 4187 break;
4044 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4191 break;
4048 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4049 if (state) 4193 if (!state)
4050 options &= ~Opt_jumpScroll; 4194 SET_OPTION (Opt_jumpScroll);
4051 else 4195 else
4052 options |= Opt_jumpScroll; 4196 CLR_OPTION (Opt_jumpScroll);
4053 break; 4197 break;
4054 case 5: /* reverse video */ 4198 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4199 scr_rvideo_mode (state);
4056 break; 4200 break;
4057 case 6: /* relative/absolute origins */ 4201 case 6: /* relative/absolute origins */
… …
4098#if 0 4242#if 0
4099 case 1001: 4243 case 1001:
4100 break; /* X11 mouse highlighting */ 4244 break; /* X11 mouse highlighting */
4101#endif 4245#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4246 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state) 4247 if (!state)
4104 options &= ~Opt_scrollTtyOutput; 4248 SET_OPTION (Opt_scrollTtyOutput);
4105 else 4249 else
4106 options |= Opt_scrollTtyOutput; 4250 CLR_OPTION (Opt_scrollTtyOutput);
4107 break; 4251 break;
4108 case 1011: /* scroll to bottom on key press */ 4252 case 1011: /* scroll to bottom on key press */
4109 if (state) 4253 if (state)
4110 options |= Opt_scrollTtyKeypress; 4254 SET_OPTION (Opt_scrollTtyKeypress);
4111 else 4255 else
4112 options &= ~Opt_scrollTtyKeypress; 4256 CLR_OPTION (Opt_scrollTtyKeypress);
4113 break; 4257 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4258 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4259 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4260 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4261 scr_erase_screen (2);
4118 scr_change_screen (state); 4262 scr_change_screen (state);
4119 break; 4263 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4264 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4265 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4266 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4267 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4268 scr_erase_screen (2);
4125 break; 4269 break;
4126 default: 4270 default:
4127 break; 4271 break;
… …
4255 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4256 break; 4400 break;
4257 4401
4258 //case 50: // not variable spacing 4402 //case 50: // not variable spacing
4259 4403
4260#ifndef NO_BRIGHTCOLOR 4404#if ENABLE_FRILLS
4261 case 90: 4405 case 90:
4262 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4263 case 92: 4407 case 92:
4264 case 93: 4408 case 93:
4265 case 94: 4409 case 94:
… …
4277 case 106: 4421 case 106:
4278 case 107: 4422 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4423 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4424 break;
4281#endif 4425#endif
4282
4283 } 4426 }
4284 } 4427 }
4285} 4428}
4286/*}}} */ 4429/*}}} */
4287 4430
… …
4311 */ 4454 */
4312void 4455void
4313rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4314{ 4457{
4315 va_list arg_ptr; 4458 va_list arg_ptr;
4316 unsigned char buf[256]; 4459 char buf[256];
4317 4460
4318 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4319 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4320 va_end (arg_ptr); 4463 va_end (arg_ptr);
4321 tt_write (buf, strlen (buf)); 4464 tt_write (buf, strlen (buf));
… …
4326 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
4327 */ 4470 */
4328const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4329 4472
4330void 4473void
4331rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4332{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4333 if (v_buflen == 0) 4479 if (v_buflen == 0)
4334 { 4480 {
4335 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));
4336 4482
4337 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)
… …
4339 4485
4340 data += written; 4486 data += written;
4341 len -= written; 4487 len -= written;
4342 } 4488 }
4343 4489
4344 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4345 4491
4346 memcpy (v_buffer + v_buflen, data, len); 4492 memcpy (v_buffer + v_buflen, data, len);
4347 v_buflen += len; 4493 v_buflen += len;
4348 4494
4349 pty_ev.set (EVENT_READ | EVENT_WRITE); 4495 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4368 } 4514 }
4369 4515
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4516 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4517 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4519 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4520}
4376 4521
4377/*----------------------- end-of-file (C source) -----------------------*/ 4522/*----------------------- end-of-file (C source) -----------------------*/
4378 4523

Diff Legend

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