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

Diff Legend

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