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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2004 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"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
54 59
55/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
61
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63
64#if ENABLE_FRILLS || ISO_14755
65
66#define ISO_14755_STARTED 0x80000000UL
67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
68#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
69#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
70#define ISO_14755_MASK 0x0fffffffUL
71
72#if ISO_14755
73static unsigned short iso14755_symtab[] = {
74 // keysym, unicode
75 XK_Left, 0x2190,
76 XK_KP_Left, 0x2190,
77 XK_Up, 0x2191,
78 XK_KP_Up, 0x2191,
79 XK_Right, 0x2192,
80 XK_KP_Right, 0x2192,
81 XK_Down, 0x2193,
82 XK_KP_Down, 0x2193,
83 XK_Linefeed, 0x21b4,
84 XK_Return, 0x21b5,
85 XK_KP_Enter, 0x21b5,
86
87 XK_Prior, 0x21de,
88 XK_Next, 0x21df,
89 XK_Tab, 0x21e5,
90 XK_ISO_Left_Tab, 0x21e6,
91 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7,
93
94 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0,
102 XK_Home, 0x21f1,
103 XK_End, 0x21f2,
104
105 XK_Execute, 0x2318,
106 XK_Begin, 0x2320,
107 XK_Delete, 0x2326,
108 XK_Clear, 0x2327,
109 XK_BackSpace, 0x232b,
110 XK_Insert, 0x2380,
111 XK_Control_L, 0x2388,
112 XK_Control_R, 0x2388,
113 XK_Pause, 0x2389,
114 XK_Break, 0x238a,
115 XK_Escape, 0x238b,
116 XK_Undo, 0x238c,
117 XK_Print, 0x2399,
118
119 XK_space, 0x2423,
120
121#ifdef XK_KP_Begin
122 XK_KP_Prior, 0x21de,
123 XK_KP_Next, 0x21df,
124 XK_KP_Begin, 0x2320,
125 XK_KP_Insert, 0x2380,
126 XK_KP_Delete, 0x2326,
127 XK_KP_Space, 0x2422,
128#endif
129 0,
130};
131
132void
133rxvt_term::iso14755_54 (int x, int y)
134{
135 x = Pixel2Col (x);
136 y = Pixel2Row (y);
137
138 if (!IN_RANGE_EXC (x, 0, ncol)
139 || !IN_RANGE_EXC (y, 0, nrow))
140 return;
141
142 for (;;)
143 {
144 const line_t &l = ROW(y + view_start);
145
146 text_t t = l.t[x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (l.t[x], l.r[x], x, y);
151 iso14755buf = ISO_14755_54;
152 break;
153 }
154
155 x--;
156 }
157}
158
159void
160rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
161{
162 rxvt_fontset *fs = FONTSET (r);
163 rxvt_font *f = (*fs)[fs->find_font (ch)];
164 wchar_t *chr, *alloc, ch2, *fname;
165 int len;
166
167 fname = rxvt_utf8towcs (f->name);
168
169# if ENABLE_COMBINING
170 if (IS_COMPOSE (ch))
171 {
172 len = rxvt_composite.expand (ch, 0);
173 alloc = chr = new wchar_t[len];
174 rxvt_composite.expand (ch, chr);
175 }
176 else
177# endif
178 {
179 ch2 = ch;
180
181 alloc = 0;
182 chr = &ch2;
183 len = 1;
184 }
185
186 char attr[80]; // plenty
187
188 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
189 (int)r,
190 fgcolor_of (r), bgcolor_of (r),
191 r & RS_Bold ? " bold" : "",
192 r & RS_Italic ? " italic" : "",
193 r & RS_Blink ? " blink" : "",
194 r & RS_RVid ? " rvid" : "",
195 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : "");
197
198 int width = wcswidth (fname, wcslen (fname));
199
200 max_it (width, 8+5); // for char + hey
201 max_it (width, strlen (attr));
202
203 if (y >= 0)
204 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
206 x = 0;
207 }
208
209 scr_overlay_new (x, y, width, len + 2);
210
211 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
212
213 for (int y = 0; y < len; y++)
214 {
215 char buf[9];
216
217 ch = *chr++;
218
219 sprintf (buf, "%8x", ch);
220 scr_overlay_set (0, y, buf);
221 scr_overlay_set (9, y, '=');
222# if !UNICODE3
223 if (ch >= 0x10000)
224 ch = 0xfffd;
225# endif
226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r);
230 }
231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname);
239
240 free (fname);
241
242# if ENABLE_COMBINING
243 if (alloc)
244 delete [] alloc;
245# endif
246}
247#endif
248
249void
250rxvt_term::commit_iso14755 ()
251{
252 wchar_t ch[2];
253
254 ch[0] = iso14755buf & ISO_14755_MASK;
255 ch[1] = 0;
256
257 if (iso14755buf & ISO_14755_51)
258 {
259 char mb[16];
260 int len;
261
262 // allow verbatim 0-bytes and control-bytes to be entered
263 if (ch[0] >= 0x20)
264 len = wcstombs (mb, ch, 16);
265 else
266 {
267 mb[0] = ch[0];
268 len = 1;
269 }
270
271 if (len > 0)
272 tt_write (mb, len);
273 else
274 scr_bell ();
275 }
276
277 iso14755buf = 0;
278}
279
280int
281rxvt_term::hex_keyval (XKeyEvent &ev)
282{
283 // check wether this event corresponds to a hex digit
284 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++)
286 {
287 KeySym k = XLookupKeysym (&ev, index);
288
289 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
290 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
291 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
292 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
293 }
294
295 return -1;
296}
297#endif
56 298
57/*{{{ Convert the keypress event into a string */ 299/*{{{ Convert the keypress event into a string */
58void 300void
59rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
60{ 302{
61 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
62 unsigned int newlen; 304 unsigned int newlen;
63 KeySym keysym; 305 KeySym keysym;
64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */
66#endif
67 int valid_keysym; 306 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
69 308
70 /* 309 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
73 * 312 *
74 * Always permit `shift' to override the current setting 313 * Always permit `shift' to override the current setting
75 */ 314 */
76 shft = (ev.state & ShiftMask); 315 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 316 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 317 meta = ev.state & ModMetaMask;
79 318
80 if (numlock_state || (ev.state & ModNumLockMask)) 319 if (numlock_state || (ev.state & ModNumLockMask))
81 { 320 {
82 numlock_state = (ev.state & ModNumLockMask); 321 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 322 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 327#ifdef USE_XIM
89 if (Input_Context) 328 if (Input_Context)
90 { 329 {
91 Status status_return; 330 Status status_return;
92 331
332#if 0
93#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
97 else 337 else
338#endif
98#endif 339#endif
99 { 340 {
100 wchar_t wkbuf[KBUFSZ + 1]; 341 wchar_t wkbuf[KBUFSZ + 1];
101 342
102 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
106 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
109 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 353 SET_LOCALE (locale);
111 354
112 if (status_return == XLookupChars 355 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
114 { 357 {
358 /* make sure the user can type ctrl-@, i.e. NUL */
359 if (len == 1 && *wkbuf == 0)
360 {
361 kbuf[0] = 0;
362 len = 1;
363 }
364 else
365 {
115 wkbuf[len] = 0; 366 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 367 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 368 if (len < 0)
118 len = 0; 369 len = 0;
370 }
119 } 371 }
120 else 372 else
121 len = 0; 373 len = 0;
122 } 374 }
123 375
… …
125 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
126 } 378 }
127 else 379 else
128#endif 380#endif
129 { 381 {
130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
132 } 384 }
133 385
134 if (valid_keysym) 386 if (valid_keysym)
135 { 387 {
136 /* for some backwards compatibility */ 388#ifdef KEYSYM_RESOURCE
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 389 if (keyboard->dispatch (this, keysym, ev.state))
138# ifdef HOTKEY_CTRL 390 return;
139 if (ctrl)
140# else
141 if (meta)
142# endif 391#endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156 392
157 if (TermWin.saveLines) 393 if (saveLines)
158 { 394 {
159#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 396 if (!ctrl && !meta)
161 {
162#else 397#else
163 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
399#endif
164 { 400 {
165#endif
166 int lnsppg; 401 int lnsppg;
167 402
168#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
170#else 405#else
171 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
172#endif 407#endif
173 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
174 { 409 {
175 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
176 return; 411 return;
… …
204 scr_move_to (0, 1); 439 scr_move_to (0, 1);
205 return; 440 return;
206 } 441 }
207 else if (keysym == XK_End) 442 else if (keysym == XK_End)
208 { 443 {
209 scr_move_to (1, 0); 444 scr_move_to (1, 1);
210 return; 445 return;
211 } 446 }
212 } 447 }
213#endif 448#endif
214 } 449 }
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 454 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 455 {
221 keysym += (XK_F11 - XK_F1); 456 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 457 shft = 0; /* turn off Shift */
223 } 458 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 459 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 460 {
226 switch (keysym) 461 switch (keysym)
227 { 462 {
228 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
231 return; 466 return;
467#if TODO
232 /* rxvt extras */ 468 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 470 change_font (FONT_UP);
235 return; 471 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 472 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 473 change_font (FONT_DN);
238 return; 474 return;
475#endif
239 } 476 }
240 } 477 }
241 } 478 }
242#ifdef PRINTPIPE 479
243 if (keysym == XK_Print) 480#if ENABLE_FRILLS || ISO_14755
244 { 481 // ISO 14755 support
245 scr_printscreen (ctrl | shft); 482 if (shft && ctrl)
246 return;
247 } 483 {
248#endif 484 int hv;
249#ifdef GREEK_SUPPORT 485
250 if (keysym == ks_greekmodeswith) 486 if (iso14755buf & ISO_14755_51
251 { 487 && (keysym == XK_space || keysym == XK_KP_Space
252 greek_mode = !greek_mode; 488 || keysym == XK_Return || keysym == XK_KP_Enter))
253 if (greek_mode)
254 { 489 {
255 xterm_seq (XTerm_title, 490 commit_iso14755 ();
256 (greek_getmode () == GREEK_ELOT928 491 iso14755buf = ISO_14755_51;
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 492# if ISO_14755
258 greek_reset (); 493 iso14755_51 (0);
494# endif
495 return;
259 } 496 }
260 else 497 else if ((hv = hex_keyval (ev)) >= 0)
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return;
263 }
264#endif
265
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
267 {
268#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 498 {
271 unsigned int l; 499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
272 const unsigned char *kbuf0; 500 | hv | ISO_14755_51;
273 const unsigned char ch = C0_ESC; 501# if ISO_14755
274 502 iso14755_51 (iso14755buf & ISO_14755_MASK);
275 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++;
277
278 /* escape prefix */
279 if (meta)
280# ifdef META8_OPTION
281 if (meta_char == C0_ESC)
282# endif 503# endif
283 tt_write (&ch, 1);
284 tt_write (kbuf0, l);
285 return; 504 return;
286 } 505 }
287 else 506 else
507 {
508# if ENABLE_OVERLAY
509 scr_overlay_off ();
288#endif 510# endif
511 iso14755buf = 0;
512 }
513 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED))
517 {
518 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif
523 }
524#endif
525
526#ifdef PRINTPIPE
527 if (keysym == XK_Print)
528 {
529 scr_printscreen (ctrl | shft);
530 return;
531 }
532#endif
533
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 {
289 { 536 {
290 newlen = 1; 537 newlen = 1;
291 switch (keysym) 538 switch (keysym)
292 { 539 {
293#ifndef NO_BACKSPACE_KEY 540#ifndef NO_BACKSPACE_KEY
294 case XK_BackSpace: 541 case XK_BackSpace:
295 if (PrivateModes & PrivMode_HaveBackSpace) 542 if (priv_modes & PrivMode_HaveBackSpace)
296 { 543 {
297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
298 ^ !!ctrl) ? '\b' : '\177'; 545 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 546 kbuf[1] = '\0';
300 } 547 }
301 else 548 else
302 STRCPY (kbuf, key_backspace); 549 strcpy (kbuf, key_backspace);
303# ifdef MULTICHAR_SET 550 break;
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 551#endif
552#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
305 { 557 {
306 int col, row; 558 strcpy (kbuf, "\033On");
307 559 break;
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 } 560 }
561 /* FALLTHROUGH */
314# endif 562# endif
315 break;
316#endif
317#ifndef NO_DELETE_KEY
318 case XK_Delete: 563 case XK_Delete:
319 STRCPY (kbuf, key_delete); 564 strcpy (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 565 break;
333#endif 566#endif
334 case XK_Tab: 567 case XK_Tab:
335 if (shft) 568 if (shft)
336 STRCPY (kbuf, "\033[Z"); 569 strcpy (kbuf, "\033[Z");
337 else 570 else
338 { 571 {
339#ifdef CTRL_TAB_MAKES_META 572#ifdef CTRL_TAB_MAKES_META
340 if (ctrl) 573 if (ctrl)
341 meta = 1; 574 meta = 1;
… …
347 newlen = 0; 580 newlen = 0;
348 } 581 }
349 break; 582 break;
350 583
351#ifdef XK_KP_Left 584#ifdef XK_KP_Left
352 case XK_KP_Up: /* \033Ox or standard */ 585 case XK_KP_Up: /* \033Ox or standard */
353 case XK_KP_Down: /* \033Or or standard */ 586 case XK_KP_Down: /* \033Or or standard */
354 case XK_KP_Right: /* \033Ov or standard */ 587 case XK_KP_Right: /* \033Ov or standard */
355 case XK_KP_Left: /* \033Ot or standard */ 588 case XK_KP_Left: /* \033Ot or standard */
356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
357 { 590 {
358 STRCPY (kbuf, "\033OZ"); 591 strcpy (kbuf, "\033OZ");
359 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
360 break; 593 break;
361 } 594 }
362 else 595 else
363 /* translate to std. cursor key */ 596 /* translate to std. cursor key */
… …
366#endif 599#endif
367 case XK_Up: /* "\033[A" */ 600 case XK_Up: /* "\033[A" */
368 case XK_Down: /* "\033[B" */ 601 case XK_Down: /* "\033[B" */
369 case XK_Right: /* "\033[C" */ 602 case XK_Right: /* "\033[C" */
370 case XK_Left: /* "\033[D" */ 603 case XK_Left: /* "\033[D" */
371 STRCPY (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
372 kbuf[2] = "DACB"[keysym - XK_Left]; 605 kbuf[2] = "DACB"[keysym - XK_Left];
373 /* do Shift first */ 606 /* do Shift first */
374 if (shft) 607 if (shft)
375 kbuf[2] = "dacb"[keysym - XK_Left]; 608 kbuf[2] = "dacb"[keysym - XK_Left];
376 else if (ctrl) 609 else if (ctrl)
377 { 610 {
378 kbuf[1] = 'O'; 611 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 613 }
381 else if (PrivateModes & PrivMode_aplCUR) 614 else if (priv_modes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 616 break;
419 617
420#ifndef UNSHIFTED_SCROLLKEYS 618#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 619# ifdef XK_KP_Prior
422 case XK_KP_Prior: 620 case XK_KP_Prior:
423 /* allow shift to override */ 621 /* allow shift to override */
424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
425 { 623 {
426 STRCPY (kbuf, "\033Oy"); 624 strcpy (kbuf, "\033Oy");
427 break; 625 break;
428 } 626 }
429 /* FALLTHROUGH */ 627 /* FALLTHROUGH */
430# endif 628# endif
431 case XK_Prior: 629 case XK_Prior:
432 STRCPY (kbuf, "\033[5~"); 630 strcpy (kbuf, "\033[5~");
433 break; 631 break;
434# ifdef XK_KP_Next 632# ifdef XK_KP_Next
435 case XK_KP_Next: 633 case XK_KP_Next:
436 /* allow shift to override */ 634 /* allow shift to override */
437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
438 { 636 {
439 STRCPY (kbuf, "\033Os"); 637 strcpy (kbuf, "\033Os");
440 break; 638 break;
441 } 639 }
442 /* FALLTHROUGH */ 640 /* FALLTHROUGH */
443# endif 641# endif
444 case XK_Next: 642 case XK_Next:
445 STRCPY (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
446 break; 644 break;
447#endif 645#endif
448 case XK_KP_Enter: 646 case XK_KP_Enter:
449 /* allow shift to override */ 647 /* allow shift to override */
450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
451 { 649 {
452 STRCPY (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
453 } 662 }
454 else 663 else
455 { 664 {
456 kbuf[0] = '\r'; 665 kbuf[0] = '\015';
457 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
458 } 667 }
459 break; 668 break;
460 669
461#ifdef XK_KP_Begin 670#ifdef XK_KP_Begin
462 case XK_KP_Begin: 671 case XK_KP_Begin:
463 STRCPY (kbuf, "\033Ou"); 672 strcpy (kbuf, "\033Ou");
464 break; 673 break;
465 674
466 case XK_KP_Insert:
467 STRCPY (kbuf, "\033Op");
468 break;
469
470 case XK_KP_Delete:
471 STRCPY (kbuf, "\033On");
472 break;
473#endif 675#endif
474 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
475 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
476 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
477 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
478 STRCPY (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
479 kbuf[2] += (keysym - XK_KP_F1); 681 kbuf[2] += (keysym - XK_KP_F1);
480 break; 682 break;
481 683
482 case XK_KP_Multiply: /* "\033Oj" : "*" */ 684 case XK_KP_Multiply: /* "\033Oj" : "*" */
483 case XK_KP_Add: /* "\033Ok" : "+" */ 685 case XK_KP_Add: /* "\033Ok" : "+" */
… …
494 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
495 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
496 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
497 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
498 /* allow shift to override */ 700 /* allow shift to override */
499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
500 { 702 {
501 STRCPY (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
502 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
503 } 705 }
504 else 706 else
505 { 707 {
506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
507 kbuf[1] = '\0'; 709 kbuf[1] = '\0';
508 } 710 }
509 break; 711 break;
510 712
511 case XK_Find: 713 case XK_Find:
512 STRCPY (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
513 break; 715 break;
716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
514 case XK_Insert: 727 case XK_Insert:
515 STRCPY (kbuf, "\033[2~"); 728 strcpy (kbuf, "\033[2~");
516 break; 729 break;
517#ifdef DXK_Remove /* support for DEC remove like key */ 730#ifdef DXK_Remove /* support for DEC remove like key */
518 case DXK_Remove: 731 case DXK_Remove:
519 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
520#endif 733#endif
521 case XK_Execute: 734 case XK_Execute:
522 STRCPY (kbuf, "\033[3~"); 735 strcpy (kbuf, "\033[3~");
523 break; 736 break;
524 case XK_Select: 737 case XK_Select:
525 STRCPY (kbuf, "\033[4~"); 738 strcpy (kbuf, "\033[4~");
526 break; 739 break;
527#ifdef XK_KP_End 740#ifdef XK_KP_End
528 case XK_KP_End: 741 case XK_KP_End:
529 /* allow shift to override */ 742 /* allow shift to override */
530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 { 744 {
532 STRCPY (kbuf, "\033Oq"); 745 strcpy (kbuf, "\033Oq");
533 break; 746 break;
534 } 747 }
535 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
536#endif 749#endif
537 case XK_End: 750 case XK_End:
538 STRCPY (kbuf, KS_END); 751 strcpy (kbuf, KS_END);
539 break; 752 break;
540#ifdef XK_KP_Home 753#ifdef XK_KP_Home
541 case XK_KP_Home: 754 case XK_KP_Home:
542 /* allow shift to override */ 755 /* allow shift to override */
543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
544 { 757 {
545 STRCPY (kbuf, "\033Ow"); 758 strcpy (kbuf, "\033Ow");
546 break; 759 break;
547 } 760 }
548 /* FALLTHROUGH */ 761 /* FALLTHROUGH */
549#endif 762#endif
550 case XK_Home: 763 case XK_Home:
551 STRCPY (kbuf, KS_HOME); 764 strcpy (kbuf, KS_HOME);
552 break; 765 break;
553 766
554#define FKEY(n, fkey) \ 767#define FKEY(n, fkey) \
555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 768 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
556 769
… …
608#undef FKEY 821#undef FKEY
609 default: 822 default:
610 newlen = 0; 823 newlen = 0;
611 break; 824 break;
612 } 825 }
826
613 if (newlen) 827 if (newlen)
614 len = STRLEN (kbuf); 828 len = strlen (kbuf);
615 } 829 }
830
616 /* 831 /*
617 * Pass meta for all function keys, if 'meta' option set 832 * Pass meta for all function keys, if 'meta' option set
618 */ 833 */
619#ifdef META8_OPTION 834#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 835 if (meta && (meta_char == 0x80) && len > 0)
… …
625 else if (ctrl && keysym == XK_minus) 840 else if (ctrl && keysym == XK_minus)
626 { 841 {
627 len = 1; 842 len = 1;
628 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 843 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
629 } 844 }
845 else if (keysym == XK_ISO_Left_Tab)
846 {
847 strcpy (kbuf, "\033[Z");
848 len = 3;
849 }
630 else 850 else
631 { 851 {
632#ifdef META8_OPTION 852#ifdef META8_OPTION
633 /* set 8-bit on */ 853 /* set 8-bit on */
634 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
635 { 855 {
636 unsigned char *ch; 856 char *ch;
637 857
638 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 859 *ch |= 0x80;
860
640 meta = 0; 861 meta = 0;
641 } 862 }
642#endif 863#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif
647 /* nil */ ; 864 /* nil */ ;
648 } 865 }
649 } 866 }
867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
650 870
651 if (len <= 0) 871 if (len <= 0)
652 return; /* not mapped */ 872 return; /* not mapped */
653 873
654 if (Options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
655 if (TermWin.view_start) 875 if (view_start)
656 { 876 {
657 TermWin.view_start = 0; 877 view_start = 0;
658 want_refresh = 1; 878 want_refresh = 1;
659 } 879 }
660 880
661 /* 881 /*
662 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 893 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 894
675 /* escape prefix */ 895 /* escape prefix */
676 if (meta 896 if (meta
677#ifdef META8_OPTION 897#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 898 && meta_char == C0_ESC
679#endif 899#endif
680 ) 900 )
681 { 901 {
682 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
683
684 tt_write (&ch, 1); 903 tt_write (&ch, 1);
685 } 904 }
686#ifdef DEBUG_CMD
687 if (debug_key)
688 { /* Display keyboard buffer contents */
689 char *p;
690 int i;
691 905
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
699} 907}
700/*}}} */ 908/*}}} */
701 909
702#if (MENUBAR_MAX) 910#if defined (KEYSYM_RESOURCE)
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */
705unsigned int 911unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
707{ 913{
708 unsigned int n, s; 914 unsigned int n, s;
709 915
710 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
918
712 if (n > 0 && s < count) 919 if (n > 0 && s < count)
713 { 920 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 921 memmove (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 922 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 923 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 924 cmdbuf_endp -= n;
718 s += n; 925 s += n;
719 } 926 }
927
720 if (count > s) 928 if (count > s)
721 { 929 {
722 rxvt_print_error ("data loss: cmd_write too large"); 930 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 931 count = s;
724 } 932 }
933
725 for (; count--;) 934 for (; count--;)
726 *cmdbuf_endp++ = *str++; 935 *cmdbuf_endp++ = *str++;
936
937 cmd_parse ();
938
727 return 0; 939 return 0;
728} 940}
729#endif /* MENUBAR_MAX */ 941#endif
730 942
731void 943void
732rxvt_term::flush () 944rxvt_term::flush ()
733{ 945{
946 flush_ev.stop ();
947
734#ifdef TRANSPARENT 948#ifdef TRANSPARENT
735 if (want_full_refresh) 949 if (want_full_refresh)
736 { 950 {
737 want_full_refresh = 0; 951 want_full_refresh = 0;
738 scr_clear (); 952 scr_clear ();
739 scr_touch (false); 953 scr_touch (false);
740 want_refresh = 1;
741 } 954 }
742#endif 955#endif
743 956
744 if (want_refresh) 957 if (want_refresh)
745 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
746 scr_refresh (refresh_type); 997 scr_refresh ();
747 scrollbar_show (1); 998 scrollbar_show (1);
748#ifdef USE_XIM 999#ifdef USE_XIM
749 IMSendSpot (); 1000 IMSendSpot ();
750#endif 1001#endif
751
752 } 1002 }
753 1003
754 display->flush (); 1004 display->flush ();
755} 1005}
756 1006
757void 1007void
758rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
759{ 1009{
760 SET_R (this); 1010 make_current ();
761 SET_LOCALE (locale);
762 1011
1012 display->flush ();
1013
1014 if (want_refresh && !flush_ev.active)
1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1016}
1017
1018void
1019rxvt_term::flush_cb (time_watcher &w)
1020{
1021 make_current ();
1022
1023 refresh_limit = 1;
1024 refresh_count = 0;
763 flush (); 1025 flush ();
764} 1026}
765 1027
766#ifdef CURSOR_BLINK 1028#ifdef CURSOR_BLINK
767void 1029void
768rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
769{ 1031{
770 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
771 want_refresh = 1; 1033 want_refresh = 1;
772 1034
773 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
774} 1036}
775#endif 1037#endif
776 1038
777#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
778void 1040void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 1047 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 1048 }
787} 1049}
788#endif 1050#endif
789 1051
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void
1054rxvt_term::cont_scroll_cb (time_watcher &w)
1055{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1058 {
1059 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1061 }
1062}
1063#endif
1064
1065#ifdef SELECTION_SCROLLING
1066void
1067rxvt_term::sel_scroll_cb (time_watcher &w)
1068{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1074 }
1075}
1076#endif
1077
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void
1080rxvt_term::slip_wheel_cb (time_watcher &w)
1081{
1082 if (mouse_slip_wheel_speed == 0
1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1084 : scr_page (UP, mouse_slip_wheel_speed))
1085 {
1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1089 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 }
1092}
1093#endif
1094
790bool 1095bool
791rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
792{ 1097{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099
1100 if (CBUFSIZ == n)
1101 {
1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1103 n = 0;
1104 }
794 1105
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
798 1109
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
800 1111
801 if (n > 0) 1112 if (r > 0)
802 { 1113 {
803 cmdbuf_endp += n; 1114 cmdbuf_endp += r;
804 return true; 1115 return true;
805 } 1116 }
806 else if (n < 0 && errno != EAGAIN) 1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 {
1119#if HAVE_SCHED_YIELD
1120 if (display->is_local)
1121 event_handler.cw_yield.start ();
1122#endif
1123 }
1124 else
1125 {
1126 pty_ev.stop ();
1127
1128 if (!OPTION (Opt_hold))
807 destroy (); 1129 destroy ();
808 1130 }
1131
809 return false; 1132 return false;
810} 1133}
811 1134
812void 1135void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1137{
815 SET_R (this); 1138 make_current ();
816 SET_LOCALE (locale); 1139
1140 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ())
1143 if (cmd_parse ())
1144 break;
817 1145
818 if (revents & EVENT_WRITE) 1146 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1147 pty_write ();
820 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ())
827 {
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935} 1148}
936 1149
937// read the next character, currently handles UTF-8 1150void
938// will probably handle all sorts of other stuff in the future 1151rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1152{
942 while (cmdbuf_ptr < cmdbuf_endp) 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
943 { 1154 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1155
947 wchar_t wc; 1156#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1157 hidden_pointer = 0;
949 1158
950 if (len == (size_t)-2) 1159 if (OPTION (Opt_pointerBlank))
951 return NOCHAR; 1160 pointer_ev.start (NOW + pointerBlankDelay);
952 1161#endif
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 1162}
985 1163
986#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
987void 1165void
988rxvt_term::pointer_unblank ()
989{
990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
991 recolour_cursor ();
992
993 hidden_pointer = 0;
994
995 if (Options & Opt_pointerBlank)
996 pointer_ev.start (NOW + pointerBlankDelay);
997}
998
999void
1000rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1001{ 1167{
1002 if (! (Options & Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1003 return; 1169 return;
1004 1170
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1006 XFlush (display->display); 1172 XFlush (xdisp);
1007 1173
1008 hidden_pointer = 1; 1174 hidden_pointer = 1;
1009} 1175}
1010 1176
1011void 1177void
1012rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
1013{ 1179{
1014 SET_R (this); 1180 make_current ();
1015 SET_LOCALE (locale);
1016 1181
1017 pointer_blank (); 1182 pointer_blank ();
1018} 1183}
1019#endif 1184#endif
1020 1185
1021void 1186void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1187rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1188{
1024 int button_number, key_state = 0; 1189 int button_number, key_state = 0;
1025 int x, y; 1190 int x, y;
1026 1191
1027 x = ev.x; 1192 x = ev.x;
1028 y = ev.y; 1193 y = ev.y;
1029 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
1030 1195
1031 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1197 button_number = 3;
1034 }
1035 else 1198 else
1036 { 1199 {
1037 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1202 if (button_number >= 3)
1040 button_number += (64 - 3); 1203 button_number += (64 - 3);
1041 } 1204 }
1042 1205
1043 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
1044 { 1207 {
1045 /* 1208 /*
1046 * do not report ButtonRelease 1209 * do not report ButtonRelease
1047 * no state info allowed 1210 * no state info allowed
1048 */ 1211 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1230#endif
1068
1069 } 1231 }
1070 1232
1071#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1235 if (key_state & 16)
1074 fputc ('C', stderr); 1236 fputc ('C', stderr);
1075 if (key_state & 4) 1237 if (key_state & 4)
1076 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1242 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1244 button_number,
1083 x + 1, 1245 x + 1,
1084 y + 1); 1246 y + 1);
1085#else 1247#endif
1248
1086 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1088 (32 + x + 1), 1251 (32 + x + 1),
1089 (32 + y + 1)); 1252 (32 + y + 1));
1090#endif
1091} 1253}
1092
1093#ifdef USING_W11LIB
1094void
1095rxvt_W11_process_x_event (XEvent *ev)
1096{
1097 rxvt_t *r = rxvt_get_r ();
1098
1099 x_cb (*ev);
1100}
1101#endif
1102 1254
1103/*{{{ process an X event */ 1255/*{{{ process an X event */
1104void 1256void
1105rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1106{ 1258{
1107 SET_R (this); 1259 make_current ();
1108 SET_LOCALE (locale);
1109 1260
1110#if defined(CURSOR_BLINK) 1261 dLocal (Display *, xdisp);
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118 1262
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 if (ev.xany.window == vt
1120 } 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1121#endif 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1122
1123#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 {
1126 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease)
1129 if (hidden_pointer)
1130 pointer_unblank ();
1131
1132 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank ();
1134 }
1135#endif
1136
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return; 1266 return;
1140#endif
1141 1267
1268 // for XQueryPointer
1142 Window unused_root, unused_child; 1269 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1271 unsigned int unused_mask;
1145
1146#ifdef DEBUG_X
1147 const char *const eventnames[] =
1148 { /* mason - this matches my system */
1149 "",
1150 "",
1151 "KeyPress",
1152 "KeyRelease",
1153 "ButtonPress",
1154 "ButtonRelease",
1155 "MotionNotify",
1156 "EnterNotify",
1157 "LeaveNotify",
1158 "FocusIn",
1159 "FocusOut",
1160 "KeymapNotify",
1161 "Expose",
1162 "GraphicsExpose",
1163 "NoExpose",
1164 "VisibilityNotify",
1165 "CreateNotify",
1166 "DestroyNotify",
1167 "UnmapNotify",
1168 "MapNotify",
1169 "MapRequest",
1170 "ReparentNotify",
1171 "ConfigureNotify",
1172 "ConfigureRequest",
1173 "GravityNotify",
1174 "ResizeRequest",
1175 "CirculateNotify",
1176 "CirculateRequest",
1177 "PropertyNotify",
1178 "SelectionClear",
1179 "SelectionRequest",
1180 "SelectionNotify",
1181 "ColormapNotify",
1182 "ClientMessage",
1183 "MappingNotify"
1184 };
1185#endif
1186
1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime (& (tp.tv_sec));
1192 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1193#endif
1194 1272
1195 switch (ev.type) 1273 switch (ev.type)
1196 { 1274 {
1197 case KeyPress: 1275 case KeyPress:
1276#if ISO_14755
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1198 lookup_key (ev.xkey); 1279 lookup_key (ev.xkey);
1280
1281 break;
1282
1283 case KeyRelease:
1284 {
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1199 break; 1347 break;
1200 1348
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1206 else 1354#endif
1207 {
1208 KeySym ks;
1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break; 1355 break;
1215 } 1356 }
1216#endif
1217 1357
1218 case ButtonPress: 1358 case ButtonPress:
1219 button_press (ev.xbutton); 1359 button_press (ev.xbutton);
1220 break; 1360 break;
1221 1361
… …
1223 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1224 break; 1364 break;
1225 1365
1226 case ClientMessage: 1366 case ClientMessage:
1227 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1229 destroy ();
1230#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink))
1236 { 1369 {
1237 /* Get Dnd data */ 1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1238 Atom ActualType; 1371 {
1239 int ActualFormat; 1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1240 unsigned char *data; 1373 {
1241 unsigned long Size, RemainingBytes; 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1242 1375 {
1243 XGetWindowProperty (display->display, display->root, 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1244 xa[XA_DNDSELECTION], 1377 destroy ();
1245 0L, 1000000L, 1378 }
1246 False, AnyPropertyType, 1379#if ENABLE_EWMH
1247 &ActualType, &ActualFormat, 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1248 &Size, &RemainingBytes, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1249 &data); 1383 &ev);
1250 XChangeProperty (display->display, display->root, 1384#endif
1251 XA_CUT_BUFFER0, XA_STRING, 1385 }
1252 8, PropModeReplace, 1386 }
1253 data, STRLEN (data)); 1387#if ENABLE_XEMBED
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1256 } 1396 }
1257#endif /* OFFIX_DND */
1258 break; 1397 break;
1259 1398
1260 case MappingNotify: 1399 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1401 break;
1263 1402
1264 /* 1403 /*
1265 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1285 break; 1424 break;
1286 } 1425 }
1287 break; 1426 break;
1288 1427
1289 case FocusIn: 1428 case FocusIn:
1290 if (!TermWin.focus) 1429 focus_in ();
1430 break;
1431
1432 case FocusOut:
1433 focus_out ();
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0])
1291 { 1438 {
1292 TermWin.focus = 1; 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1440 ;
1294#ifdef USE_XIM
1295 if (Input_Context != NULL)
1296 XSetICFocus (Input_Context);
1297#endif
1298#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink)
1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1301#endif
1302 1441
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 {
1444 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 }
1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1303 } 1454 }
1304 break; 1455 break;
1305 1456
1306 case FocusOut:
1307 if (TermWin.focus)
1308 {
1309 TermWin.focus = 0;
1310 want_refresh = 1;
1311#ifdef USE_XIM
1312 if (Input_Context != NULL)
1313 XUnsetICFocus (Input_Context);
1314#endif
1315#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink)
1317 cursor_blink_ev.stop ();
1318 hidden_cursor = 0;
1319#endif
1320
1321 }
1322 break;
1323
1324 case ConfigureNotify: 1457 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1326 { 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1327 int height, width; 1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1462
1329 do
1330 { /* Wrap lots of configures into one */
1331 width = ev.xconfigure.width;
1332 height = ev.xconfigure.height;
1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1334 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1337 if (szHint.width != width || szHint.height != height)
1338 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1340 resize_all_windows (width, height, 1);
1341 }
1342#ifdef DEBUG_SIZE
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent)
1350 {
1351 check_our_parents ();
1352 if (am_transparent)
1353 want_full_refresh = 1;
1354 }
1355#endif
1356
1357 }
1358 break; 1463 break;
1359 1464
1360 case SelectionClear: 1465 case SelectionClear:
1361 display->set_selection_owner (0); 1466 selection_clear ();
1362 break; 1467 break;
1363 1468
1364 case SelectionNotify: 1469 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1472 break;
1369 1473
1370 case SelectionRequest: 1474 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1372 break; 1476 break;
1373 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1374 case UnmapNotify: 1486 case UnmapNotify:
1375 TermWin.mapped = 0; 1487 mapped = 0;
1376#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1378#endif 1490#endif
1379 break; 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1380
1381 case MapNotify:
1382 TermWin.mapped = 1;
1383#ifdef TEXT_BLINK
1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1385#endif
1386 break; 1492 break;
1387 1493
1388#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1389 case ReparentNotify: 1495 case ReparentNotify:
1390 rootwin_cb (ev); 1496 rootwin_cb (ev);
1391 break; 1497 break;
1392#endif /* TRANSPARENT */ 1498#endif /* TRANSPARENT */
1393 1499
1394 case GraphicsExpose: 1500 case GraphicsExpose:
1395 case Expose: 1501 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == vt)
1397 { 1503 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1508
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1514
1406 // ev.xexpose.width, TermWin.height, False);
1407#endif
1408 want_refresh = 1; 1515 want_refresh = 1;
1409 } 1516 }
1410 else 1517 else
1411 { 1518 {
1412 XEvent unused_event; 1519 XEvent unused_event;
1413 1520
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1415 Expose, 1522 ;
1416 &unused_event)) ; 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1524 ;
1418 GraphicsExpose, 1525
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1421 { 1527 {
1422 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1423 scrollbar_show (0); 1529 scrollbar_show (0);
1424 } 1530 }
1425#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose ();
1428#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1535#endif
1433 } 1536 }
1434 break; 1537 break;
1435 1538
1436 case MotionNotify: 1539 case MotionNotify:
1437#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1541 if (hidden_pointer)
1439 pointer_unblank (); 1542 pointer_unblank ();
1440#endif 1543#endif
1441#if MENUBAR 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1442 if (isMenuBarWindow (ev.xany.window)) 1545 break;
1546
1547 if (ev.xany.window == vt)
1443 { 1548 {
1444 menubar_control (& (ev.xbutton)); 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1445 break; 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 } 1551 ; // nop
1447#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break;
1450
1451 if (ev.xany.window == TermWin.vt)
1452 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1553 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1456 ; 1555 ;
1457 1556
1458 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (xdisp, vt,
1459 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1560 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1561 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1563 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1564 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1565 {
1467#endif 1566#endif
1567#if ISO_14755
1568 // 5.4
1569 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1570 {
1571 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1572 break;
1573 }
1574#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1575 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1576 ev.xbutton.state & Button3Mask ? 2 : 0);
1577
1470#ifdef SELECTION_SCROLLING 1578#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1579 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1580 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1581 {
1474 int dist; 1582 int dist;
1475
1476 pending_scroll_selection=1;
1477 1583
1478 /* don't clobber the current delay if we are 1584 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1585 * already in the middle of scrolling.
1480 */ 1586 */
1481 if (scroll_selection_delay<=0) 1587 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1589
1484 /* save the event params so we can highlight 1590 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1591 * the selection in the pending-scroll loop
1486 */ 1592 */
1487 selection_save_x=ev.xbutton.x; 1593 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1594 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1596
1492 /* calc number of lines to scroll */ 1597 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1598 if (ev.xbutton.y < int_bwidth)
1494 { 1599 {
1495 scroll_selection_dir = UP; 1600 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1601 dist = int_bwidth - ev.xbutton.y;
1497 } 1602 }
1498 else 1603 else
1499 { 1604 {
1500 scroll_selection_dir = DN; 1605 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1606 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1607 }
1608
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1609 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1610 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1;
1506 MIN_IT (scroll_selection_lines, 1612 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1613 SELECTION_SCROLL_MAX_LINES);
1508 } 1614 }
1509 else 1615 else
1510 { 1616 {
1511 /* we are within the text window, so we 1617 /* we are within the text window, so we
1512 * shouldn't be scrolling 1618 * shouldn't be scrolling
1513 */ 1619 */
1514 pending_scroll_selection = 0; 1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop();
1515 } 1622 }
1516#endif 1623#endif
1517#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1518
1519 } 1625 }
1520#endif 1626#endif
1521
1522 } 1627 }
1523 } 1628 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1630 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1527 MotionNotify, &ev)) ; 1632 MotionNotify, &ev))
1633 ;
1634
1528 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1529 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1638 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1639 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1641 scrollbar_size ());
1535 scr_refresh (refresh_type); 1642 want_refresh = 1;
1536 refresh_limit = 0; 1643 refresh_limit = 0;
1537 scrollbar_show (1); 1644 scrollbar_show (1);
1538 } 1645 }
1539 break; 1646 break;
1540 } 1647 }
1541}
1542 1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1677}
1678
1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1689#if USE_XIM
1690 if (Input_Context != NULL)
1691 {
1692 IMSetStatusPosition ();
1693 XSetICFocus (Input_Context);
1694 }
1695#endif
1696#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif
1700#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade])
1702 {
1703 pix_colors = pix_colors_focused;
1704 scr_recolour ();
1705 }
1706#endif
1707 }
1708}
1709
1710void
1711rxvt_term::focus_out ()
1712{
1713 if (focus)
1714 {
1715 focus = 0;
1716 want_refresh = 1;
1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1723 iso14755buf = 0;
1724# if ENABLE_OVERLAY
1725 scr_overlay_off ();
1726# endif
1727 }
1728#endif
1729#if USE_XIM
1730 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context);
1732#endif
1733#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink))
1735 cursor_blink_ev.stop ();
1736 hidden_cursor = 0;
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_unfocused;
1742 scr_recolour ();
1743 }
1744#endif
1745 }
1746}
1747
1748#if TRANSPARENT
1543void 1749void
1544rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1751{
1546 SET_R (this); 1752 make_current ();
1547 SET_LOCALE (locale);
1548 1753
1549 switch (ev.type) 1754 switch (ev.type)
1550 { 1755 {
1551 case PropertyNotify: 1756 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /* 1757 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1758 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on. 1759 * use the property to determine the pixmap. We use it later on.
1564 */ 1760 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1569 return; 1763 return;
1570 }
1571 1764
1572 /* FALLTHROUGH */ 1765 /* FALLTHROUGH */
1573 case ReparentNotify: 1766 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1768 want_refresh = want_full_refresh = 1;
1577 break; 1769 break;
1578#endif
1579 } 1770 }
1580} 1771}
1772#endif
1581 1773
1582void 1774void
1583rxvt_term::button_press (const XButtonEvent &ev) 1775rxvt_term::button_press (XButtonEvent &ev)
1584{ 1776{
1585 int reportmode = 0, clickintime; 1777 int reportmode = 0, clickintime;
1586 1778
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1779 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1780
1588 if (!bypass_keystate) 1781 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1782 reportmode = !! (priv_modes & PrivMode_mouse_report);
1783
1590 /* 1784 /*
1591 * VT window processing of button press 1785 * VT window processing of button press
1592 */ 1786 */
1593 if (ev.window == TermWin.vt) 1787 if (ev.window == vt)
1594 { 1788 {
1595#if RXVT_GRAPHICS 1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1596 if (ev.subwindow != None) 1790 return;
1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1598 else
1599#endif
1600 1791
1792#if ISO_14755
1793 // 5.4
1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1795 {
1796 iso14755_54 (ev.x, ev.y);
1797 return;
1601 { 1798 }
1799#endif
1800
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1801 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1802
1603 if (reportmode) 1803 if (reportmode)
1804 {
1805 /* mouse report from vt window */
1806 /* save the xbutton state (for ButtonRelease) */
1807 MEvent.state = ev.state;
1808#ifdef MOUSE_REPORT_DOUBLECLICK
1809 if (ev.button == MEvent.button && clickintime)
1604 { 1810 {
1605 /* mouse report from vt window */ 1811 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1812 MEvent.clicks++;
1607 MEvent.state = ev.state; 1813
1608#ifdef MOUSE_REPORT_DOUBLECLICK 1814 if (MEvent.clicks > 1)
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1815 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1816 /* only report double clicks */
1616 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1617 mouse_report (ev); 1818 mouse_report (ev);
1618 1819
1619 /* don't report the release */ 1820 /* don't report the release */
1620 MEvent.clicks = 0; 1821 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1822 MEvent.button = AnyButton;
1622 }
1623 } 1823 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1824 }
1637 else 1825 else
1638 { 1826 {
1827 /* different button, or time expired */
1828 MEvent.clicks = 1;
1829 MEvent.button = ev.button;
1830 mouse_report (ev);
1831 }
1832#else
1833 MEvent.button = ev.button;
1834 mouse_report (ev);
1835#endif /* MOUSE_REPORT_DOUBLECLICK */
1836
1837 }
1838 else
1839 {
1639 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1842
1641 switch (ev.button) 1843 switch (ev.button)
1642 { 1844 {
1643 case Button1: 1845 case Button1:
1846 /* allow meta + click to select rectangular areas */
1847 /* should be done in screen.C */
1848#if ENABLE_FRILLS
1849 selection.rect = !!(ev.state & ModMetaMask);
1850#else
1851 selection.rect = false;
1852#endif
1853
1644 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1646 { 1856 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1668 else 1859 else
1669 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
1861 }
1862 else
1863 {
1864 if (MEvent.button == Button1 && clickintime)
1865 MEvent.clicks++;
1866 else
1867 MEvent.clicks = 1;
1868
1869 selection_click (MEvent.clicks, ev.x, ev.y);
1870 }
1871
1872 MEvent.button = Button1;
1873 break;
1874
1875 case Button3:
1876 if (MEvent.button == Button3 && clickintime)
1877 selection_rotate (ev.x, ev.y);
1878 else
1879 selection_extend (ev.x, ev.y, 1);
1880
1670 MEvent.button = Button3; 1881 MEvent.button = Button3;
1671 break; 1882 break;
1672 }
1673 } 1883 }
1884 }
1885
1674 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1675 return; 1887 return;
1676 }
1677 } 1888 }
1678 1889
1679 /* 1890 /*
1680 * Scrollbar window processing of button press 1891 * Scrollbar window processing of button press
1681 */ 1892 */
… …
1745 upordown = 1; /* down */ 1956 upordown = 1; /* down */
1746 } 1957 }
1747 if (upordown) 1958 if (upordown)
1748 { 1959 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1962#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1963 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1964 {
1754 if (upordown < 0) 1965 if (upordown < 0)
1755 scrollBar.setUp (); 1966 scrollBar.setUp ();
… …
1771 break; 1982 break;
1772 case R_SB_ALIGN_BOTTOM: 1983 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1984 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1985 break;
1775 } 1986 }
1987
1776 if (scrollBar.style == R_SB_XTERM 1988 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 1989 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 1990 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 1992
1781 scrollBar.setMotion (); 1993 scrollBar.setMotion ();
1782 break; 1994 break;
1783 1995
1784 case Button1: 1996 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1997 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 2001 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 2002 if (scrollBar.style != R_SB_XTERM)
1791 { 2003 {
1792 if (scrollbar_above_slider (ev.y)) 2004 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 2005# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 2006 scr_page (UP, nrow - 1);
1795# else 2007# else
1796 scr_page (UP, TermWin.nrow / 4); 2008 scr_page (UP, nrow / 4);
1797# endif 2009# endif
1798 else if (scrollbar_below_slider (ev.y)) 2010 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 2011# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 2012 scr_page (DN, nrow - 1);
1801# else 2013# else
1802 scr_page (DN, TermWin.nrow / 4); 2014 scr_page (DN, nrow / 4);
1803# endif 2015# endif
1804 else 2016 else
1805 scrollBar.setMotion (); 2017 scrollBar.setMotion ();
1806 } 2018 }
1807 else 2019 else
1808 { 2020 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 2021 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 2022 (nrow
1811 * scrollbar_position (ev.y) 2023 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 2024 / scrollbar_size ()));
1813 } 2025 }
2026
1814 break; 2027 break;
1815 } 2028 }
1816 } 2029 }
2030
1817 return; 2031 return;
1818 } 2032 }
1819#if MENUBAR
1820 /*
1821 * Menubar window processing of button press
1822 */
1823 if (isMenuBarWindow (ev.window))
1824 menubar_control (ev);
1825#endif
1826} 2033}
1827 2034
1828void 2035void
1829rxvt_term::button_release (const XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
1830{ 2037{
1831 int reportmode = 0; 2038 int reportmode = 0;
1832 2039
1833 csrO = 0; /* reset csr Offset */ 2040 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 2041 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2042 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2043
1837 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
1838 { 2045 {
1839 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
1840 scrollbar_show (0); 2047 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH;
1843#endif
1844
1845 } 2048 }
2049
1846#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2051 if (sel_scroll_ev.active)
2052 sel_scroll_ev.stop();
1848#endif 2053#endif
2054
1849 if (ev.window == TermWin.vt) 2055 if (ev.window == vt)
1850 { 2056 {
1851#ifdef RXVT_GRAPHICS 2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1852 if (ev.subwindow != None) 2058 return;
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1854 else
1855#endif
1856 2059
1857 { 2060#if ISO_14755
2061 // 5.4
2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2063 return;
2064#endif
2065
1858 if (reportmode) 2066 if (reportmode)
2067 {
2068 /* mouse report from vt window */
2069 /* don't report release of wheel "buttons" */
2070 if (ev.button >= 4)
2071 return;
2072#ifdef MOUSE_REPORT_DOUBLECLICK
2073 /* only report the release of 'slow' single clicks */
2074 if (MEvent.button != AnyButton
2075 && (ev.button != MEvent.button
2076 || (ev.time - MEvent.time
2077 > MULTICLICK_TIME / 2)))
1859 { 2078 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 2079 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2080 MEvent.button = AnyButton;
1877 mouse_report (ev); 2081 mouse_report (ev);
2082 }
2083#else /* MOUSE_REPORT_DOUBLECLICK */
2084 MEvent.button = AnyButton;
2085 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2086#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2087 return;
2088 }
2089
2090 /*
2091 * dumb hack to compensate for the failure of click-and-drag
2092 * when overriding mouse reporting
2093 */
2094 if (priv_modes & PrivMode_mouse_report
2095 && bypass_keystate
2096 && ev.button == Button1 && MEvent.clicks <= 1)
2097 selection_extend (ev.x, ev.y, 0);
2098
2099 switch (ev.button)
2100 {
2101 case Button1:
2102 case Button3:
2103 selection_make (ev.time);
2104 break;
2105
2106 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2109 break;
2110
2111#ifdef MOUSE_WHEEL
2112 case Button4:
2113 case Button5:
2114 {
2115 int i;
2116 page_dirn v;
2117
2118 v = ev.button == Button4 ? UP : DN;
2119
2120 if (ev.state & ShiftMask)
2121 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage))
2123 i = nrow - 1;
2124 else
2125 i = 5;
2126
2127# ifdef MOUSE_SLIP_WHEELING
2128 if (ev.state & ControlMask)
2129 {
2130 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133
2134 if (slip_wheel_ev.at < NOW)
2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2136
2137 slip_wheel_ev.start ();
2138 }
2139 else
2140 {
2141# endif
2142 scr_page (v, i);
2143 scrollbar_show (1);
2144# ifdef MOUSE_SLIP_WHEELING
2145 }
2146# endif
1880 } 2147 }
1881 /*
1882 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting
1884 */
1885 if (PrivateModes & PrivMode_mouse_report
1886 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0);
1889
1890 switch (ev.button)
1891 {
1892 case Button1:
1893 case Button3:
1894 selection_make (ev.time);
1895 break; 2148 break;
1896 case Button2:
1897 selection_request (ev.time, ev.x, ev.y);
1898 break;
1899#ifdef MOUSE_WHEEL
1900 case Button4:
1901 case Button5:
1902 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1918 }
1919# endif 2149#endif
1920# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1);
1924# else
1925 while (i--)
1926 {
1927 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1);
1930 }
1931# endif
1932
1933 }
1934 break;
1935#endif
1936
1937 } 2150 }
1938 }
1939 } 2151 }
1940#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev);
1943#endif
1944} 2152}
1945
1946 2153
1947#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
1948/* 2386/*
1949 * Check our parents are still who we think they are. 2387 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2388 * Do transparency updates if required
1951 */ 2389 */
1952int 2390int
1953rxvt_term::check_our_parents () 2391rxvt_term::check_our_parents ()
1954{ 2392{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2393 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2394 unsigned long nitems, bytes_after;
1957 Atom atype; 2395 Atom atype;
1958 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2397 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
1962 2400
1963 pchanged = 0; 2401 pchanged = 0;
1964 2402
1965 if (! (Options & Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
1967 2405
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
1970 2408
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
1972 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
1973 { 2412 {
1974 if (am_transparent) 2413 if (am_transparent)
1975 { 2414 {
1976 pchanged = 1; 2415 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
1980 } 2418 }
2419
1981 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
1982 } 2421 }
1983 2422
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2424 XSync (xdisp, False);
1986 2425
1987 /* 2426 /*
1988 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
1991 */ 2430 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2431 i = (xa[XA_XROOTPMAP_ID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2434 &nitems, &bytes_after, &prop) == Success);
2435
1996 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
1997 have_pixmap = 0; 2447 have_pixmap = 0;
1998 else 2448 else
1999 { 2449 {
2000 have_pixmap = 1; 2450 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2451 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2452 XFree (prop);
2003 } 2453 }
2454
2004 if (have_pixmap) 2455 if (have_pixmap)
2005 { 2456 {
2006 /* 2457 /*
2007 * Copy display->root pixmap transparency 2458 * Copy display->root pixmap transparency
2008 */ 2459 */
2009 int sx, sy, nx, ny; 2460 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2461 unsigned int nw, nh;
2011 Window cr; 2462 Window cr;
2012 XImage *image; 2463 XImage *image;
2013 GC gc; 2464 GC gc;
2014 XGCValues gcvalue; 2465 XGCValues gcvalue;
2015 2466
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2471 nx = ny = 0;
2472
2021 if (sx < 0) 2473 if (sx < 0)
2022 { 2474 {
2023 nw += sx; 2475 nw += sx;
2024 nx = -sx; 2476 nx = -sx;
2025 sx = 0; 2477 sx = 0;
2026 } 2478 }
2479
2027 if (sy < 0) 2480 if (sy < 0)
2028 { 2481 {
2029 nh += sy; 2482 nh += sy;
2030 ny = -sy; 2483 ny = -sy;
2031 sy = 0; 2484 sy = 0;
2032 } 2485 }
2486
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2035 allowedxerror = -1; 2491 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2493
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2496 allowedxerror = 0;
2497
2041 if (image == NULL) 2498 if (image == NULL)
2042 { 2499 {
2043 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2044 { 2501 {
2045 pchanged = 1; 2502 pchanged = 1;
2046 if (TermWin.pixmap != None) 2503 if (pixmap != None)
2047 { 2504 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (xdisp, pixmap);
2049 TermWin.pixmap = None; 2506 pixmap = None;
2050 } 2507 }
2051 } 2508 }
2509
2052 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2053 } 2511 }
2054 else 2512 else
2055 { 2513 {
2056 if (TermWin.pixmap != None) 2514 if (pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2515 XFreePixmap (xdisp, pixmap);
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2516
2059 (unsigned int)szHint.width, 2517#if TINTING
2060 (unsigned int)szHint.height, 2518 if (ISSET_PIXCOLOR (Color_tint))
2061 (unsigned int)image->depth); 2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2532 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2533 XFreeGC (xdisp, gc);
2067 XDestroyImage (image); 2534 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2069 TermWin.pixmap); 2536 XClearWindow (xdisp, parent[0]);
2537
2070 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2539 pchanged = 1;
2540
2072 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2073 } 2542 }
2074 } 2543 }
2544
2075 if (!am_pixmap_trans) 2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2076 { 2548 {
2077 unsigned int n; 2549 unsigned int n;
2078 /* 2550 /*
2079 * InheritPixmap transparency 2551 * InheritPixmap transparency
2080 */ 2552 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2554 {
2085 oldp = TermWin.parent[i]; 2555 oldp = parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2087 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2557 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2558
2090 if (TermWin.parent[i] == display->root) 2559 if (parent[i] == display->root)
2091 { 2560 {
2092 if (oldp != None) 2561 if (oldp != None)
2093 pchanged = 1; 2562 pchanged = 1;
2563
2094 break; 2564 break;
2095 } 2565 }
2566
2096 if (oldp != TermWin.parent[i]) 2567 if (oldp != parent[i])
2097 pchanged = 1; 2568 pchanged = 1;
2098 } 2569 }
2570
2099 n = 0; 2571 n = 0;
2572
2100 if (pchanged) 2573 if (pchanged)
2101 {
2102 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2103 { 2595 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2597 XClearWindow (xdisp, parent[n]);
2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625
2626/*}}} */
2627
2628bool
2629rxvt_term::cmd_parse ()
2630{
2631 bool flag = false;
2632 wchar_t ch = NOCHAR;
2633 char *seq_begin; // remember start of esc-sequence here
2634
2635 for (;;)
2636 {
2637 if (ch == NOCHAR)
2638 {
2639 seq_begin = cmdbuf_ptr;
2640 ch = next_char ();
2641
2642 if (ch == NOCHAR)
2643 break;
2644 }
2645
2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2647 {
2648 if (!seen_input)
2649 {
2650 seen_input = 1;
2651 // many badly-written programs (e.g. jed) contain a race condition:
2652 // they first read the screensize and then install a SIGWINCH handler.
2653 // some window managers resize the window early, and these programs
2654 // then sometimes get the size wrong.
2655 // unfortunately other programs are even more buggy and dislike
2656 // being sent SIGWINCH, so only do it when we were in fact being
2657 // resized.
2658 if (seen_resize && cmd_pid)
2659 kill (-cmd_pid, SIGWINCH);
2660 }
2661
2662 /* Read a text string from the input buffer */
2663 wchar_t buf[UBUFSIZ];
2664 bool refreshnow = false;
2665 int nlines = 0;
2666 wchar_t *str = buf;
2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2668
2669 for (;;)
2670 {
2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2672 break;
2673
2674 *str++ = ch;
2675
2676 if (ch == C0_LF || str >= eol)
2107 { 2677 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2678 if (ch == C0_LF)
2679 nlines++;
2680
2681 refresh_count++;
2682
2683 if (!OPTION (Opt_jumpScroll)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 {
2686 refreshnow = true;
2687 refresh_count = 0;
2688 ch = NOCHAR;
2109 break; 2689 break;
2690 }
2691
2692 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1)
2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2697 scr_add_lines (buf, str - buf, nlines);
2698
2699 nlines = 0;
2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2702 }
2703
2704 if (str >= eol)
2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2708 ch = NOCHAR;
2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2715 }
2716
2717 seq_begin = cmdbuf_ptr;
2718 ch = next_char ();
2719 }
2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2723 scr_add_lines (buf, str - buf, nlines);
2724
2725 /*
2726 * If there have been a lot of new lines, then update the screen
2727 * What the heck I'll cheat and only refresh less than every page-full.
2728 * the number of pages between refreshes is refresh_limit, which
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */
2731 if (refreshnow)
2732 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true;
2738 scr_refresh ();
2739 want_refresh = 1;
2110 } 2740 }
2111 } 2741 }
2112 } 2742
2113 if (n > (int) (sizeof (TermWin.parent)
2114 / sizeof (TermWin.parent[0])))
2115 {
2116 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0],
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt,
2120 PixColors[Color_bg]);
2121 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */
2123 } 2743 }
2124 else 2744 else
2125 { 2745 {
2126 /* wait (an arbitrary period) for the WM to do its thing 2746 try
2127 * needed for fvwm2.2.2 (and before?) */ 2747 {
2128# ifdef HAVE_NANOSLEEP 2748 process_nonprinting (ch);
2129 struct timespec rqt; 2749 }
2750 catch (const class out_of_input &o)
2751 {
2752 // we ran out of input, retry later
2753 cmdbuf_ptr = seq_begin;
2754 break;
2755 }
2130 2756
2131 rqt.tv_sec = 1; 2757 ch = NOCHAR;
2132 rqt.tv_nsec = 0; 2758 }
2133 nanosleep (&rqt, NULL); 2759 }
2134# else 2760
2135 sleep (1); 2761 return flag;
2136# endif 2762}
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2763
2138 for (n = 0; n < (unsigned int)i; n++) 2764// read the next character
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2765wchar_t
2140 ParentRelative); 2766rxvt_term::next_char () NOTHROW
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2767{
2142 ParentRelative); 2768 while (cmdbuf_ptr < cmdbuf_endp)
2143 am_transparent = 1; 2769 {
2770 // assume 7-bit to be ascii ALWAYS
2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++;
2773
2774 wchar_t wc;
2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776
2777 if (len == (size_t)-2)
2144 } 2778 {
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2779 // the mbstate stores incomplete sequences. didn't know this :/
2146 TermWin.parent[i] = None; 2780 cmdbuf_ptr = cmdbuf_endp;
2781 break;
2782 }
2783
2784 if (len == (size_t)-1)
2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786
2787 // assume wchar == unicode
2788 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK;
2147 } 2790 }
2791
2792 return NOCHAR;
2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2805
2806/* rxvt_cmd_getc () - Return next input character */
2807/*
2808 * Return the next input character after first passing any keyboard input
2809 * to the command.
2810 */
2811wchar_t
2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2813{
2814 wchar_t c = next_char ();
2815
2816 if (c == NOCHAR)
2817 throw out_of_input;
2818
2148 return pchanged; 2819 return c;
2149} 2820}
2150#endif
2151 2821
2152/*}}} */ 2822uint32_t
2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2824{
2825 uint32_t c = next_octet ();
2826
2827 if (c == NOCHAR)
2828 throw out_of_input;
2829
2830 return c;
2831}
2153 2832
2154/*{{{ print pipe */ 2833/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2834/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2835#ifdef PRINTPIPE
2157FILE * 2836FILE *
2158rxvt_term::popen_printer () 2837rxvt_term::popen_printer ()
2159{ 2838{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2839 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2840
2162 if (stream == NULL) 2841 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2842 rxvt_warn ("can't open printer pipe, not printing.\n");
2843
2164 return stream; 2844 return stream;
2165} 2845}
2166 2846
2167int 2847int
2168rxvt_term::pclose_printer (FILE *stream) 2848rxvt_term::pclose_printer (FILE *stream)
2169{ 2849{
2170 fflush (stream); 2850 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2851 return pclose (stream);
2177# endif
2178} 2852}
2179 2853
2180/* 2854/*
2181 * simulate attached vt100 printer 2855 * simulate attached vt100 printer
2182 */ 2856 */
2183void 2857void
2184rxvt_term::process_print_pipe () 2858rxvt_term::process_print_pipe ()
2185{ 2859{
2186 int done; 2860 int done;
2187 FILE *fd; 2861 FILE *fd;
2188 2862
2189 if ((fd = popen_printer ()) == NULL) 2863 if ((fd = popen_printer ()) == NULL)
2190 return; 2864 return;
2191 2865
2192 /* 2866 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2867 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2868 * is received.
2195 */ 2869 */
2196 for (done = 0; !done;) 2870 for (done = 0; !done;)
2197 { 2871 {
2198 unsigned char buf[8]; 2872 unsigned char buf[8];
2199 unsigned char ch; 2873 unicode_t ch;
2200 unsigned int i, len; 2874 unsigned int i, len;
2201 2875
2202 if ((ch = cmd_getc ()) != C0_ESC) 2876 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2877 {
2204 if (putc (ch, fd) == EOF) 2878 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2879 break; /* done = 1 */
… …
2220 { 2894 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2895 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2896 break; /* done = 1 */
2223 } 2897 }
2224 } 2898 }
2899
2225 for (i = 0; i < len; i++) 2900 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2901 if (putc (buf[i], fd) == EOF)
2227 { 2902 {
2228 done = 1; 2903 done = 1;
2229 break; 2904 break;
2230 } 2905 }
2231 } 2906 }
2232 } 2907 }
2908
2233 pclose_printer (fd); 2909 pclose_printer (fd);
2234} 2910}
2235#endif /* PRINTPIPE */ 2911#endif /* PRINTPIPE */
2236/*}}} */ 2912/*}}} */
2237 2913
2238/* *INDENT-OFF* */ 2914/* *INDENT-OFF* */
2239enum { 2915enum {
2240 C1_40 = 0x40, 2916 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2917 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2918 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2919 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2920 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2921};
2246/* *INDENT-ON* */ 2922/* *INDENT-ON* */
2247 2923
2248/*{{{ process non-printing single characters */ 2924/*{{{ process non-printing single characters */
2249void 2925void
2250rxvt_term::process_nonprinting (unsigned char ch) 2926rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2927{
2252 switch (ch) 2928 switch (ch)
2253 { 2929 {
2930 case C0_ESC:
2931 process_escape_seq ();
2932 break;
2254 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2256 tt_write ( 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2257 (const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2259 else 2936 else
2260 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2261 (unsigned int)STRLEN (VT100_ANS));
2262 break; 2938 break;
2263 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2264 scr_bell (); 2940 scr_bell ();
2265 break; 2941 break;
2266 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2957 scr_charset_choose (1);
2282 break; 2958 break;
2283 case C0_SI: /* shift in - acs */ 2959 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2960 scr_charset_choose (0);
2285 break; 2961 break;
2962
2963#ifdef EIGHT_BIT_CONTROLS
2964 // 8-bit controls
2965 case 0x90: /* DCS */
2966 process_dcs_seq ();
2967 break;
2968 case 0x9b: /* CSI */
2969 process_csi_seq ();
2970 break;
2971 case 0x9d: /* CSI */
2972 process_osc_seq ();
2973 break;
2974#endif
2286 } 2975 }
2287} 2976}
2288/*}}} */ 2977/*}}} */
2289 2978
2290 2979
2291/*{{{ process VT52 escape sequences */ 2980/*{{{ process VT52 escape sequences */
2292void 2981void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2982rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2983{
2295 int row, col; 2984 int row, col;
2296 2985
2297 switch (ch) 2986 switch (ch)
2298 { 2987 {
… …
2350 3039
2351/*{{{ process escape sequences */ 3040/*{{{ process escape sequences */
2352void 3041void
2353rxvt_term::process_escape_seq () 3042rxvt_term::process_escape_seq ()
2354{ 3043{
2355 unsigned char ch = cmd_getc (); 3044 unicode_t ch = cmd_getc ();
2356 3045
2357 if (PrivateModes & PrivMode_vt52) 3046 if (priv_modes & PrivMode_vt52)
2358 { 3047 {
2359 process_escape_vt52 (ch); 3048 process_escape_vt52 (ch);
2360 return; 3049 return;
2361 } 3050 }
2362 3051
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 3067 break;
2379 case '+': 3068 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 3070 break;
2382#ifdef MULTICHAR_SET 3071#if !ENABLE_MINIMAL
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS
2388 case '6': 3072 case '6':
2389 scr_backindex (); 3073 scr_backindex ();
2390 break; 3074 break;
2391#endif 3075#endif
2392 case '7': 3076 case '7':
2393 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
2394 break; 3078 break;
2395 case '8': 3079 case '8':
2396 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
2397 break; 3081 break;
2398#ifndef NO_FRILLS 3082#if !ENABLE_MINIMAL
2399 case '9': 3083 case '9':
2400 scr_forwardindex (); 3084 scr_forwardindex ();
2401 break; 3085 break;
2402#endif 3086#endif
2403 case '=': 3087 case '=':
… …
2413 break; 3097 break;
2414 3098
2415 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
2417 { 3101 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2420 } 3104 }
2421 break; 3105 break;
2422 3106
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
2424 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
2434 case C1_RI: /* ESC M */ 3118 case C1_RI: /* ESC M */
2435 scr_index (DN); 3119 scr_index (DN);
2436 break; 3120 break;
2437 3121
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3122 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3123 /*case C1_SS2: scr_single_shift (2); break; */
2440 3124
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3125 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3126 /*case C1_SS3: scr_single_shift (3); break; */
2443 3127
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3128 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3129 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3130 process_dcs_seq ();
2447 break; 3131 break;
2448 3132
2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2450 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
2451 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2453 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
2454 3137
2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2456 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
2457 process_csi_seq (); 3140 process_csi_seq ();
… …
2462 process_osc_seq (); 3145 process_osc_seq ();
2463 break; 3146 break;
2464 3147
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3148 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3149 case 'c':
3150 mbstate.reset ();
2467 scr_poweron (); 3151 scr_poweron ();
2468 scrollbar_show (1); 3152 scrollbar_show (1);
2469 break; 3153 break;
2470 3154
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3155 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3167
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3168/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3169/* *INDENT-OFF* */
2486enum { 3170enum {
2487 CSI_ICH = 0x40, 3171 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3172 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2489 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3173 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2490 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3174 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2491 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3175 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2492 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3176 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2493 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3177 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3192 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3193 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3194 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3195 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3196 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3197 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3198 };
2515/* *INDENT-ON* */ 3199/* *INDENT-ON* */
2516 3200
2517void 3201void
2518rxvt_term::process_csi_seq () 3202rxvt_term::process_csi_seq ()
2519{ 3203{
2520 unsigned char ch, priv, i; 3204 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3205 unsigned int nargs, p;
2522 int n, ndef; 3206 int n, ndef;
2523 int arg[ESC_ARGS]; 3207 int arg[ESC_ARGS];
2524 3208
2525 for (nargs = ESC_ARGS; nargs > 0;) 3209 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3210 arg[--nargs] = 0;
2527 3211
2528 priv = 0; 3212 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3214 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3215 { /* '<' '=' '>' '?' */
2532 priv = ch; 3216 priv = ch;
2533 ch = cmd_getc (); 3217 ch = cmd_getc ();
2534 } 3218 }
3219
2535 /* read any numerical arguments */ 3220 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3221 for (n = -1; ch < CSI_ICH; )
2537 { 3222 {
2538 if (isdigit (ch)) 3223 if (isdigit (ch))
2539 { 3224 {
… …
2546 { 3231 {
2547 if (nargs < ESC_ARGS) 3232 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3233 arg[nargs++] = n;
2549 n = -1; 3234 n = -1;
2550 } 3235 }
2551 else if (ch == '\b') 3236 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 3237 process_nonprinting (ch);
2563 } 3238
2564 ch = cmd_getc (); 3239 ch = cmd_getc ();
2565 } 3240 }
2566 3241
2567 if (ch > CSI_7F) 3242 if (ch > CSI_7F)
2568 return; 3243 return;
… …
2574 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
2575 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
2576 if (arg[p] == -1) 3251 if (arg[p] == -1)
2577 arg[p] = ndef; 3252 arg[p] = ndef;
2578 3253
2579#ifdef DEBUG_CMD
2580 fprintf (stderr, "CSI ");
2581 for (p = 0; p < nargs; p++)
2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2583 fprintf (stderr, "%c\n", ch);
2584#endif
2585
2586 /* 3254 /*
2587 * private mode handling 3255 * private mode handling
2588 */ 3256 */
2589 if (priv) 3257 if (priv)
2590 { 3258 {
2591 switch (priv) 3259 switch (priv)
2592 { 3260 {
2593 case '>': 3261 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
2596 break; 3273 break;
2597 case '?': 3274 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 3277 break;
… …
2705 3382
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3383 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 3384 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 3385 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 3388 break;
2712 3389
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3392 break;
2717 3393
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
2720 break; 3396 break;
… …
2726 tt_printf ("\033[0n"); 3402 tt_printf ("\033[0n");
2727 break; 3403 break;
2728 case 6: /* CPR requested */ 3404 case 6: /* CPR requested */
2729 scr_report_position (); 3405 scr_report_position ();
2730 break; 3406 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3407 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure))
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3409 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3410 break;
2735#endif
2736 case 8: /* unofficial extension */ 3411 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3413 break;
2739 } 3414 }
2740 break; 3415 break;
2741 3416
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3417 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3450 break;
2776 3451
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3452 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3453 if (arg[0] == 4)
2779 scr_insert_mode (0); 3454 scr_insert_mode (0);
3455 else if (arg[0] == 20)
3456 priv_modes &= ~PrivMode_LFNL;
2780 break; 3457 break;
2781 3458
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3459 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3460 if (arg[0] == 4)
2784 scr_insert_mode (1); 3461 scr_insert_mode (1);
3462 else if (arg[0] == 20)
3463 priv_modes |= PrivMode_LFNL;
2785 break; 3464 break;
2786 3465
2787 /* 3466 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3467 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3468 */
… …
2801 break; 3480 break;
2802 case CSI_75: 3481 case CSI_75:
2803 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
2804 break; 3483 break;
2805 3484
2806#ifndef NO_FRILLS 3485#if !ENABLE_MINIMAL
2807 case CSI_74: 3486 case CSI_74:
2808 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
2809 break; 3488 break;
2810#endif 3489#endif
2811 3490
2812 case CSI_78: /* DECREQTPARM */ 3491 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3492 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3493 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3494 break;
2816 3495
2817 default: 3496 default:
2818 break; 3497 break;
2819 } 3498 }
2820} 3499}
2821/*}}} */ 3500/*}}} */
2822 3501
2823#ifndef NO_FRILLS 3502#if !ENABLE_MINIMAL
2824/* ARGSUSED */ 3503/* ARGSUSED */
2825void 3504void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3506{
2828 int x, y; 3507 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
2833 Window wdummy; 3509 Window wdummy;
3510
3511 dLocal (Display *, xdisp);
2834 3512
2835 if (nargs == 0) 3513 if (nargs == 0)
2836 return; 3514 return;
3515
2837 switch (args[0]) 3516 switch (args[0])
2838 { 3517 {
2839 /* 3518 /*
2840 * commands 3519 * commands
2841 */ 3520 */
2842 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3522 XMapWindow (xdisp, parent[0]);
2844 break; 3523 break;
2845 case 2: /* iconify window */ 3524 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3525 XIconifyWindow (xdisp, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3526 break;
2849 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
2851 break; 3529 break;
2852 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3532 break;
2855 case 5: /* raise window */ 3533 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
2857 break; 3535 break;
2858 case 6: /* lower window */ 3536 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
2860 break; 3538 break;
2861 case 7: /* refresh window */ 3539 case 7: /* refresh window */
2862 scr_touch (true); 3540 scr_touch (true);
2863 break; 3541 break;
2864 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3543 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3544 (unsigned int) (args[1] * fheight));
2867 break; 3545 break;
3546
3547 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3548 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3550 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3551 (unsigned int) (args[1] * fheight));
2872 break; 3552 break;
3553
2873 /* 3554 /*
2874 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
2875 */ 3556 */
2876 case 11: /* report window state */ 3557 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3560 break;
2880 case 13: /* report window position */ 3561 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3567 break;
2887 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3571 break;
3572 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break;
2891 case 18: /* report window size (chars) */ 3575 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3577 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3579 {
3580 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s);
3584 }
2898 break; 3585 break;
2899 case 21: /* report window title */ 3586 case 21: /* report window title */
3587 {
3588 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s);
3592 }
2902 break; 3593 break;
2903#endif
2904
2905 } 3594 }
2906} 3595}
2907#endif 3596#endif
2908 3597
2909/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
2910/* 3599/*
2911 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3601 * ends_how is terminator used. returned input must be free()'d
2913 */ 3602 */
2914unsigned char * 3603char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3605{
2917 int seen_esc = 0; /* seen escape? */ 3606 unicode_t ch;
3607 bool seen_esc = false;
2918 unsigned int n = 0; 3608 unsigned int n = 0;
2919 unsigned char *s; 3609 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3610
2922 for (; (ch = cmd_getc ());) 3611 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3612 {
2924 if (ch == C0_BEL 3613 if (seen_esc)
2925 || ch == CHAR_ST 3614 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3615 if (ch == 0x5c) /* 7bit ST */
2927 break; 3616 break;
3617 else
3618 return NULL;
3619 }
2928 if (ch == C0_ESC) 3620 else if (ch == C0_ESC)
2929 { 3621 {
2930 seen_esc = 1; 3622 seen_esc = true;
2931 continue; 3623 continue;
2932 } 3624 }
2933 else if (ch == '\t') 3625 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3626 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3627 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3628 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3629
3630 seen_esc = false;
3631
3632 if (n >= STRING_MAX - 1)
3633 // stop at some sane length
3634 return NULL;
3635
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
2938 string[n++] = ch; 3639 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3640 }
3641
2941 string[n++] = '\0'; 3642 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3643
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3645
2946 return s; 3646 return rxvt_wcstombs (string);
2947} 3647}
2948 3648
2949/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
2950/* 3650/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3652 */
2953void 3653void
2954rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
2955{ 3655{
2956 unsigned char eh, *s; 3656 char *s;
3657 unicode_t eh;
3658
2957 /* 3659 /*
2958 * Not handled yet 3660 * Not handled yet
2959 */ 3661 */
2960 s = get_to_st (&eh); 3662 s = get_to_st (eh);
2961 if (s) 3663 if (s)
2962 free (s); 3664 free (s);
3665
2963 return; 3666 return;
2964} 3667}
2965 3668
2966/*----------------------------------------------------------------------*/ 3669/*----------------------------------------------------------------------*/
2967/* 3670/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3671 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3672 */
2970void 3673void
2971rxvt_term::process_osc_seq () 3674rxvt_term::process_osc_seq ()
2972{ 3675{
2973 unsigned char ch, eh, *s; 3676 unicode_t ch, eh;
2974 int arg; 3677 int arg;
2975 3678
2976 ch = cmd_getc (); 3679 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
2979 3682
2980 if (ch == ';') 3683 if (ch == ';')
2981 { 3684 {
2982 s = get_to_st (&eh); 3685 char *s = get_to_st (eh);
3686
2983 if (s) 3687 if (s)
2984 { 3688 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
2997 free (s); 3690 free (s);
2998 } 3691 }
2999 } 3692 }
3000} 3693}
3694
3695void
3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3697{
3698 if (str[0] == '?' && !str[1])
3699 {
3700 rgba c;
3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3709 }
3710 else
3711 set_window_color (color, str);
3712}
3713
3001/* 3714/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title
3004 * 1 = change iconName
3005 * 2 = change title
3006 * 4 = change color
3007 * 12 = change text color
3008 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour
3010 * 18 = change bold character color
3011 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented)
3013 * 50 = change font
3014 *
3015 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap
3018 * 39 = change default fg color
3019 * 49 = change default bg color
3020 * 55 = dump scrollback buffer and all of screen
3021 */ 3716 */
3022void 3717void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3024{ 3719{
3025 int changed = 0; 3720 int color;
3026 int color;
3027 char *buf, *name; 3721 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724
3725 dLocal (Display *, xdisp);
3028 3726
3029 assert (str != NULL); 3727 assert (str != NULL);
3030 switch (op) 3728 switch (op)
3031 { 3729 {
3032 case XTerm_name: 3730 case XTerm_name:
3033 set_title (str); 3731 set_title (str);
3034 /* FALLTHROUGH */ 3732 /* FALLTHROUGH */
3035 case XTerm_iconName: 3733 case XTerm_iconName:
3036 set_iconName (str); 3734 set_icon_name (str);
3037 break; 3735 break;
3038 case XTerm_title: 3736 case XTerm_title:
3039 set_title (str); 3737 set_title (str);
3040 break; 3738 break;
3739 case XTerm_property:
3740 if (str[0] == '?')
3741 {
3742 Atom prop = display->atom (str + 1);
3743 Atom actual_type;
3744 int actual_format;
3745 unsigned long nitems;
3746 unsigned long bytes_after;
3747 unsigned char *value = 0;
3748 const char *str = "";
3749
3750 if (prop
3751 && XGetWindowProperty (xdisp, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None
3756 && actual_format == 8)
3757 str = (const char *)(value);
3758
3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3760
3761 XFree (value);
3762 }
3763 else
3764 {
3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3766
3767 if (eq)
3768 {
3769 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1);
3771 }
3772 else
3773 XDeleteProperty (xdisp, parent[0],
3774 display->atom (str));
3775 }
3776 break;
3777
3041 case XTerm_Color: 3778 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3779 for (buf = (char *)str; buf && *buf;)
3043 { 3780 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3782 break;
3783
3046 *name++ = '\0'; 3784 *name++ = '\0';
3047 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3048 if (color < 0 || color >= TOTAL_COLORS) 3786
3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3049 break; 3788 break;
3789
3050 if ((buf = STRCHR (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3791 *buf++ = '\0';
3052 set_window_color (color + minCOLOR, name); 3792
3793 process_color_seq (op, color, name, resp);
3053 } 3794 }
3795 break;
3796 case XTerm_Color00:
3797 process_color_seq (op, Color_fg, str, resp);
3798 break;
3799 case XTerm_Color01:
3800 process_color_seq (op, Color_bg, str, resp);
3054 break; 3801 break;
3055#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3804 process_color_seq (op, Color_cursor, str, resp);
3058 break; 3805 break;
3059#endif 3806#endif
3060 case XTerm_Color_pointer: 3807 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3809 break;
3810 case XTerm_Color_pointer_bg:
3811 process_color_seq (op, Color_pointer_bg, str, resp);
3062 break; 3812 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str);
3066 break;
3067 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str);
3069 break;
3070 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3815 process_color_seq (op, Color_RV, str, resp);
3072 break; 3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3824 break;
3825 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp);
3827 break;
3073#endif 3828#endif
3829#if TRANSPARENT && TINTING
3830 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp);
3074 3832
3075 case XTerm_Menu: 3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break;
3839#endif
3840
3841 case Rxvt_Pixmap:
3076 /* 3842 {
3077 * rxvt_menubar_dispatch () violates the constness of the string,
3078 * so DON'T do it here
3079 */
3080 break;
3081 case XTerm_Pixmap:
3082 if (*str != ';') 3843 if (*str != ';')
3083 { 3844 {
3084#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3087#endif
3088 scr_touch (true); 3848 scr_touch (true);
3849#endif
3089 } 3850 }
3851
3852 int changed = 0;
3853
3090 while ((str = STRCHR (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3091 { 3855 {
3092 str++; 3856 str++;
3093#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3095#endif 3859#endif
3096
3097 } 3860 }
3861
3098 if (changed) 3862 if (changed)
3099 { 3863 {
3100#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3101 resize_pixmap (); 3865 resize_pixmap ();
3102#endif
3103 scr_touch (true); 3866 scr_touch (true);
3867#endif
3104 } 3868 }
3869 }
3105 break; 3870 break;
3106 3871
3107 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3108 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3109 break; 3874 break;
3110 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3111 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3112 break; 3877 break;
3878
3113 case XTerm_logfile: 3879 case XTerm_logfile:
3880 // TODO, when secure mode?
3114 break; 3881 break;
3115 case XTerm_font: 3882
3116 change_font (0, str);
3117 break;
3118#if 0 3883#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3120 { 3885 {
3121 int fd; 3886 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3888 {
3124 scr_dump (fd); 3889 scr_dump (fd);
3125 close (fd); 3890 close (fd);
3126 } 3891 }
3127 } 3892 }
3128 break; 3893 break;
3129#endif 3894#endif
3895 case XTerm_font:
3896 op = URxvt_font;
3897 case URxvt_font:
3898#if ENABLE_STYLES
3899 case URxvt_boldFont:
3900 case URxvt_italicFont:
3901 case URxvt_boldItalicFont:
3902#endif
3903 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp);
3908 else
3909 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3911
3912 res = strdup (str);
3913 allocated.push_back ((void *)res);
3914 set_fonts ();
3915 }
3916 break;
3917
3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3927 case URxvt_locale:
3928 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3930 else
3931 {
3932 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale ();
3935 }
3936 break;
3937
3938 case URxvt_view_up:
3939 case URxvt_view_down:
3940 {
3941 int lines = atoi (str);
3942
3943 if (lines)
3944 scr_page (op == URxvt_view_up ? UP : DN, lines);
3945 else
3946 scr_erase_savelines ();
3947 }
3948
3949 break;
3950#endif
3951
3952#if ENABLE_PERL
3953 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3955 ; // no responses yet
3956 break;
3957#endif
3131 } 3958 }
3132} 3959}
3133/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
3134 3961
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3962/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3970 * so no need for fancy checking
3144 */ 3971 */
3145int 3972int
3146rxvt_term::privcases (int mode, unsigned long bit) 3973rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3974{
3148 int state; 3975 int state;
3149 3976
3150 if (mode == 's') 3977 if (mode == 's')
3151 { 3978 {
3152 SavedModes |= (PrivateModes & bit); 3979 SavedModes |= (priv_modes & bit);
3153 return -1; 3980 return -1;
3154 } 3981 }
3155 else 3982 else
3156 { 3983 {
3157 if (mode == 'r') 3984 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3985 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3986 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3987 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 3988 PrivMode (state, bit);
3162 } 3989 }
3990
3163 return state; 3991 return state;
3164} 3992}
3165 3993
3166/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
3167void 3995void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3169{ 3997{
3170 unsigned int i, j; 3998 unsigned int i, j;
3171 int state; 3999 int state;
4000
3172 static const struct 4001 static const struct
3173 { 4002 {
3174 const int argval; 4003 const int argval;
3175 const unsigned long bit; 4004 const unsigned long bit;
3176 } 4005 }
4006
3177 argtopriv[] = { 4007 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 4008 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 4009 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 4010 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 4011 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
4015 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 4017 // 18, 19 printing-related
3187 { menuBar_esc, PrivMode_menuBar }, 4018 { 25, PrivMode_VisibleCursor },
3188#endif
3189#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 4021#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 4022 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 4023 { 40, PrivMode_132OK },
4024 // 41 xterm more fixes NYI
4025 // 45 margin bell NYI
4026 // 46 start logging
3195 { 47, PrivMode_Screen }, 4027 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 4028 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 4029#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 4030 { 67, PrivMode_BackSpace },
3199#endif 4031#endif
3200 { 1000, PrivMode_MouseX11 }, 4032 { 1000, PrivMode_MouseX11 },
4033 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4034 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4035 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 4036 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 4037 { 1011, PrivMode_Keypress }, // rxvt extension
4038 // 1035 enable modifiers for alt, numlock NYI
4039 // 1036 send ESC for meta keys NYI
4040 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 4041 { 1047, PrivMode_Screen },
4042 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4043 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4044 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 4045 };
3206 4046
3207 if (nargs == 0) 4047 if (nargs == 0)
3208 return; 4048 return;
3209 4049
… …
3224 state = privcases (mode, argtopriv[j].bit); 4064 state = privcases (mode, argtopriv[j].bit);
3225 break; 4065 break;
3226 } 4066 }
3227 4067
3228 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 4069 switch (arg[i])
3231 { 4070 {
4071#if ENABLE_STYLES
4072 case 1021:
4073 set_option (Opt_intensityStyles, mode);
4074
4075 scr_touch (true);
4076 break;
4077#endif
3232 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
4079 case 1049:
4080 if (OPTION (Opt_secondaryScreen))
3233 if (mode == 0) 4081 if (mode == 0)
3234 scr_cursor (RESTORE); 4082 scr_cursor (RESTORE);
3235 else if (mode == 1) 4083 else if (mode == 1)
3236 scr_cursor (SAVE); 4084 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 4085 break;
4086 }
4087
4088 if (state >= 0)
4089 /* extra handling for values with valid 0 or 1 state */
4090 switch (arg[i])
4091 {
4092 /* case 1: - application cursor keys */
4093 case 2: /* VT52 mode */
4094 /* oddball mode. should be set regardless of set/reset
4095 * parameter. Return from VT52 mode with an ESC < from
4096 * within VT52 mode
4097 */
4098 PrivMode (1, PrivMode_vt52);
4099 break;
3253 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 4103 break;
3258 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
3259 if (state)
3260 Options &= ~Opt_jumpScroll;
3261 else
3262 Options |= Opt_jumpScroll; 4105 set_option (Opt_jumpScroll, !state);
3263 break; 4106 break;
3264 case 5: /* reverse video */ 4107 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
3266 break; 4109 break;
3267 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4111 scr_relative_origin (state);
3269 break; 4112 break;
3270 case 7: /* autowrap */ 4113 case 7: /* autowrap */
3271 scr_autowrap (state); 4114 scr_autowrap (state);
3272 break; 4115 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4119 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4120 break;
3278#ifdef menuBar_esc
3279 case menuBar_esc:
3280#ifdef MENUBAR
3281 map_menuBar (state);
3282#endif
3283 break;
3284#endif
3285#ifdef scrollBar_esc 4121#ifdef scrollBar_esc
3286 case scrollBar_esc: 4122 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
3288 { 4124 {
3289 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4126 scr_touch (true);
3291 } 4127 }
3292 break; 4128 break;
3293#endif 4129#endif
3294 case 25: /* visible/invisible cursor */ 4130 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4131 scr_cursor_visible (state);
3296 break; 4132 break;
3297 /* case 35: - shift keys */ 4133 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4134 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4135 case 47: /* secondary screen */
3300 scr_change_screen (state); 4136 scr_change_screen (state);
3301 break; 4137 break;
3302 /* case 66: - application key pad */ 4138 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4139 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4140 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4142 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4143 break;
3308#if 0 4144#if 0
3309 case 1001: 4145 case 1001:
3310 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
3311#endif 4147#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state)
3314 Options &= ~Opt_scrollTtyOutput;
3315 else
3316 Options |= Opt_scrollTtyOutput; 4149 set_option (Opt_scrollTtyOutput, !state);
3317 break; 4150 break;
3318 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
3319 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4152 set_option (Opt_scrollTtyKeypress, state);
3321 else
3322 Options &= ~Opt_scrollTtyKeypress;
3323 break; 4153 break;
3324 case 1047: /* secondary screen w/ clearing */ 4154 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4155 if (OPTION (Opt_secondaryScreen))
3326 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4157 scr_erase_screen (2);
3328 scr_change_screen (state); 4158 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4159 break;
4160 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY)
4164 scr_erase_screen (2);
4165 break;
4166 default:
4167 break;
3332 } 4168 }
3333 } 4169 }
3334} 4170}
3335/*}}} */ 4171/*}}} */
3336 4172
3337/*{{{ process sgr sequences */ 4173/*{{{ process sgr sequences */
3338void 4174void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4175rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4176{
3341 unsigned int i; 4177 unsigned int i;
3342 short rendset; 4178 short rendset;
3343 int rendstyle; 4179 int rendstyle;
3344 4180
3345 if (nargs == 0) 4181 if (nargs == 0)
3346 { 4182 {
3347 scr_rendition (0, ~RS_None); 4183 scr_rendition (0, ~RS_None);
3348 return; 4184 return;
3349 } 4185 }
4186
3350 for (i = 0; i < nargs; i++) 4187 for (i = 0; i < nargs; i++)
3351 { 4188 {
3352 rendset = -1; 4189 rendset = -1;
3353 switch (arg[i]) 4190 switch (arg[i])
3354 { 4191 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4193 rendset = 0, rendstyle = ~RS_None;
3357 break; 4194 break;
3358 case 1: 4195 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4196 rendset = 1, rendstyle = RS_Bold;
3360 break; 4197 break;
4198 //case 2: // low intensity
4199 case 3:
4200 rendset = 1, rendstyle = RS_Italic;
4201 break;
3361 case 4: 4202 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4203 rendset = 1, rendstyle = RS_Uline;
3363 break; 4204 break;
3364 case 5: 4205 case 5: // slowly blinking
4206 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4207 rendset = 1, rendstyle = RS_Blink;
3366 break; 4208 break;
4209 //case 6: // scoansi light background
3367 case 7: 4210 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4211 rendset = 1, rendstyle = RS_RVid;
3369 break; 4212 break;
3370 case 22: 4213 case 8:
4214 // invisible. NYI
4215 break;
4216 //case 9: // crossed out
4217 //case 10: // scoansi acs off, primary font
4218 //case 11: // scoansi acs on, first alt font
4219 //case 12: // scoansi acs on, |0x80, second alt font
4220 //...
4221 //case 19: // ninth alt font
4222 //case 20: // gothic
4223 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4224 rendset = 0, rendstyle = RS_Bold;
4225 break;
4226 case 22: // normal intensity
4227 rendset = 0, rendstyle = RS_Bold;
4228 break;
4229 case 23: // disable italic
4230 rendset = 0, rendstyle = RS_Italic;
3372 break; 4231 break;
3373 case 24: 4232 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4233 rendset = 0, rendstyle = RS_Uline;
3375 break; 4234 break;
3376 case 25: 4235 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4236 rendset = 0, rendstyle = RS_Blink;
3378 break; 4237 break;
4238 case 26: // variable spacing (iso 8613)
4239 rendset = 0, rendstyle = RS_Blink;
4240 break;
3379 case 27: 4241 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4242 rendset = 0, rendstyle = RS_RVid;
3381 break; 4243 break;
4244 //case 28: // visible. NYI
4245 //case 29: // not crossed-out
3382 } 4246 }
4247
3383 if (rendset != -1) 4248 if (rendset != -1)
3384 { 4249 {
3385 scr_rendition (rendset, rendstyle); 4250 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4251 continue; /* for (;i;) */
3387 } 4252 }
… …
3394 case 33: 4259 case 33:
3395 case 34: 4260 case 34:
3396 case 35: 4261 case 35:
3397 case 36: 4262 case 36:
3398 case 37: 4263 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4264 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4265 break;
3402#ifdef TTY_256COLOR 4266 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4267 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4268 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4269 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4270 i += 2;
3409 } 4271 }
3410 break; 4272 break;
3411#endif
3412 case 39: /* default fg */ 4273 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4274 scr_color (Color_fg, Color_fg);
3414 break; 4275 break;
3415 4276
3416 case 40: 4277 case 40:
… …
3419 case 43: 4280 case 43:
3420 case 44: 4281 case 44:
3421 case 45: 4282 case 45:
3422 case 46: 4283 case 46:
3423 case 47: 4284 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4285 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4286 break;
3427#ifdef TTY_256COLOR 4287 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4288 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4289 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4290 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4291 i += 2;
3434 } 4292 }
3435 break; 4293 break;
3436#endif
3437 case 49: /* default bg */ 4294 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
3439 break; 4296 break;
3440 4297
3441#ifndef NO_BRIGHTCOLOR 4298 //case 50: // not variable spacing
4299
4300#if !ENABLE_MINIMAL
3442 case 90: 4301 case 90:
3443 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
3444 case 92: 4303 case 92:
3445 case 93: 4304 case 93:
3446 case 94: 4305 case 94:
3447 case 95: 4306 case 95:
3448 case 96: 4307 case 96:
3449 case 97: 4308 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4309 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4310 break;
3453 case 100: 4311 case 100:
3454 case 101: /* set bright bg color */ 4312 case 101: /* set bright bg color */
3455 case 102: 4313 case 102:
3456 case 103: 4314 case 103:
3457 case 104: 4315 case 104:
3458 case 105: 4316 case 105:
3459 case 106: 4317 case 106:
3460 case 107: 4318 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4320 break;
3464#endif 4321#endif
3465
3466 } 4322 }
3467 } 4323 }
3468} 4324}
3469/*}}} */ 4325/*}}} */
3470 4326
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4327/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4328void
3473rxvt_term::process_graphics () 4329rxvt_term::process_graphics ()
3474{ 4330{
3475 unsigned char ch, cmd = cmd_getc (); 4331 unicode_t ch, cmd = cmd_getc ();
3476 4332
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4333 if (cmd == 'Q')
3479 { /* query graphics */ 4334 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4335 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4336 return;
3482 } 4337 }
3483 /* swallow other graphics sequences until terminating ':' */ 4338 /* swallow other graphics sequences until terminating ':' */
3484 do 4339 do
3485 ch = cmd_getc (); 4340 ch = cmd_getc ();
3486 while (ch != ':'); 4341 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 4342}
3533/*}}} */ 4343/*}}} */
3534 4344
3535/* ------------------------------------------------------------------------- */ 4345/* ------------------------------------------------------------------------- */
3536 4346
… …
3540 */ 4350 */
3541void 4351void
3542rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
3543{ 4353{
3544 va_list arg_ptr; 4354 va_list arg_ptr;
3545 unsigned char buf[256]; 4355 char buf[256];
3546 4356
3547 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4359 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4360 tt_write (buf, strlen (buf));
3551} 4361}
3552 4362
3553/* ---------------------------------------------------------------------- */ 4363/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4364/* Write data to the pty as typed by the user, pasted with the mouse,
3555 * or generated by us in response to a query ESC sequence. 4365 * or generated by us in response to a query ESC sequence.
3556 */ 4366 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368
3557void 4369void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
3559{ 4371{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
3561 4374
3562 if (len) 4375 if (pty->pty < 0)
4376 return;
4377
4378 if (v_buflen == 0)
4379 {
4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4381
4382 if ((unsigned int)written == len)
4383 return;
4384
4385 data += written;
4386 len -= written;
3563 { 4387 }
4388
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390
4391 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len;
4393
4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4395}
4396
4397void rxvt_term::pty_write ()
4398{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4400
4401 if (written > 0)
4402 {
4403 v_buflen -= written;
4404
3564 if (v_buflen == 0) 4405 if (v_buflen == 0)
3565 { 4406 {
3566 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3567
3568 if ((unsigned int)written == len)
3569 return;
3570
3571 data += written;
3572 len -= written;
3573 }
3574
3575
3576 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3577
3578 memcpy (v_buffer + v_buflen, data, len);
3579 v_buflen += len;
3580 }
3581
3582 for (;;)
3583 {
3584 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3585
3586 if (written > 0)
3587 {
3588 v_buflen -= written;
3589
3590 if (v_buflen == 0)
3591 {
3592 free (v_buffer); 4407 free (v_buffer);
3593 v_buffer = 0; 4408 v_buffer = 0;
3594 v_buflen = 0; 4409 v_buflen = 0;
3595 4410
3596 pty_ev.set (EVENT_READ); 4411 pty_ev.set (EVENT_READ);
3597 return;
3598 }
3599
3600 memmove (v_buffer, v_buffer + written, v_buflen);
3601 }
3602 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3603 // original code just ignores this...
3604 destroy ();
3605 else
3606 {
3607 pty_ev.set (EVENT_READ | EVENT_WRITE);
3608 return; 4412 return;
3609 } 4413 }
4414
4415 memmove (v_buffer, v_buffer + written, v_buflen);
3610 } 4416 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ);
3611} 4419}
3612 4420
3613/*----------------------- end-of-file (C source) -----------------------*/ 4421/*----------------------- end-of-file (C source) -----------------------*/
3614 4422

Diff Legend

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