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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.346 by root, Wed Aug 15 06:48:16 2007 UTC

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

Diff Legend

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