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.364 by ayin, Mon Nov 12 14:53:13 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-2006 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 + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
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
761void 1046void
762rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
763{ 1048{
764 SET_R (this); 1049 make_current ();
765 SET_LOCALE (locale);
766 1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1059{
1060 make_current ();
1061
1062 refresh_count = 0;
767 flush (); 1063 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} 1064}
813 1065
814#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
815void 1067void
816rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
817{ 1069{
818 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
819 want_refresh = 1; 1071 want_refresh = 1;
820
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);
834 } 1083 }
835} 1084}
836#endif 1085#endif
837 1086
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
838void 1088void
839rxvt_term::x_cb (io_watcher &w, short revents) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
840{ 1090{
841 SET_R (this); 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
842 SET_LOCALE (locale); 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
843 1093 want_refresh = 1;
844 process_x_events (); 1094 else
1095 w.stop ();
845} 1096}
1097#endif
1098
1099#ifdef SELECTION_SCROLLING
1100void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1;
1107 }
1108 else
1109 w.stop ();
1110}
1111#endif
1112
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{
1117 if (mouse_slip_wheel_speed == 0
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1;
1125 }
1126 else
1127 w.stop ();
1128}
1129#endif
1130
1131#if LINUX_YIELD_HACK
1132static struct event_handler
1133{
1134 ev::prepare yield_ev;
1135
1136 void yield_cb (ev::prepare &w, int revents)
1137 {
1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
1147 }
1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
1154#endif
846 1155
847bool 1156bool
848rxvt_term::pty_fill () 1157rxvt_term::pty_fill ()
849{ 1158{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1160
1161 if (CBUFSIZ == n)
1162 {
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1164 n = 0;
1165 }
851 1166
852 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
853 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
854 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
855 1170
856 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
857 1172
858 if (n > 0) 1173 if (r > 0)
859 { 1174 {
860 cmdbuf_endp += n; 1175 cmdbuf_endp += r;
861 return true; 1176 return true;
862 } 1177 }
863 else if (n < 0 && errno != EAGAIN) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1179 {
1180#if LINUX_YIELD_HACK
1181 if (display->is_local)
1182 event_handler.yield_ev.start ();
1183#endif
1184 }
1185 else
1186 {
1187 pty_ev.stop ();
1188
1189 if (!option (Opt_hold))
864 destroy (); 1190 destroy ();
1191 }
865 1192
866 return false; 1193 return false;
867} 1194}
868 1195
869void 1196void
870rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
871{ 1198{
872 SET_R (this); 1199 make_current ();
873 SET_LOCALE (locale);
874 1200
875 if (revents & EVENT_WRITE) 1201 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 1202 // 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 ()) 1203 while (pty_fill ())
884 { 1204 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; 1205 break;
901 1206
902 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 1207 if (revents & ev::WRITE)
903 { 1208 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
910 *str++ = ch;
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} 1209}
985 1210
986// read the next character, currently handles UTF-8 1211void
987// will probably handle all sorts of other stuff in the future 1212rxvt_term::pointer_unblank ()
988uint32_t
989rxvt_term::next_char ()
990{ 1213{
991 while (cmdbuf_ptr < cmdbuf_endp) 1214 XDefineCursor (dpy, vt, TermWin_cursor);
992 { 1215 recolour_cursor ();
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++;
995 1216
996 wchar_t wc; 1217#ifdef POINTER_BLANK
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 1218 hidden_pointer = 0;
998 1219
999 if (len == (size_t)-2) 1220 if (option (Opt_pointerBlank))
1000 return NOCHAR; 1221 pointer_ev.start (pointerBlankDelay);
1001 1222#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} 1223}
1034 1224
1035#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1036void 1226void
1037rxvt_term::pointer_unblank () 1227rxvt_term::pointer_blank ()
1038{ 1228{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1229 if (!option (Opt_pointerBlank))
1040 recolour_cursor (); 1230 return;
1041 1231
1232 XDefineCursor (dpy, vt, display->blank_cursor);
1233 XFlush (dpy);
1234
1042 hidden_pointer = 0; 1235 hidden_pointer = 1;
1043
1044 if (Options & Opt_pointerBlank)
1045 pointer_ev.start (NOW + pointerBlankDelay);
1046} 1236}
1047 1237
1048void 1238void
1049rxvt_term::pointer_blank () 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1050{ 1240{
1051 if (!(Options & Opt_pointerBlank)) 1241 make_current ();
1052 return;
1053 1242
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1243 pointer_blank ();
1055 XFlush (Xdisplay);
1056
1057 hidden_pointer = 1;
1058} 1244}
1245#endif
1059 1246
1060void 1247void
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) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1072{ 1249{
1073 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1074 int x, y; 1251 int x, y;
1252 int code = 32;
1075 1253
1076 x = ev->x; 1254 x = Pixel2Col (ev.x);
1077 y = ev->y; 1255 y = Pixel2Row (ev.y);
1078 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify) {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1079 1263
1080 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1081 {
1082 button_number = 3; 1265 button_number = 3;
1083 }
1084 else 1266 else
1085 { 1267 {
1086 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1087 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1088 if (button_number >= 3) 1270 if (button_number >= 3)
1089 button_number += (64 - 3); 1271 button_number += (64 - 3);
1090 } 1272 }
1091 1273
1092 if (PrivateModes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1093 { 1275 {
1094 /* 1276 /*
1095 * do not report ButtonRelease 1277 * do not report ButtonRelease
1096 * no state info allowed 1278 * no state info allowed
1097 */ 1279 */
… …
1112 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1294 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1113 + ((MEvent.state & ControlMask) ? 16 : 0); 1295 + ((MEvent.state & ControlMask) ? 16 : 0);
1114#ifdef MOUSE_REPORT_DOUBLECLICK 1296#ifdef MOUSE_REPORT_DOUBLECLICK
1115 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1297 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1116#endif 1298#endif
1117
1118 } 1299 }
1119 1300
1120#ifdef DEBUG_MOUSEREPORT 1301#if DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 1302 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 1303 if (key_state & 16)
1123 fputc('C', stderr); 1304 fputc ('C', stderr);
1124 if (key_state & 4) 1305 if (key_state & 4)
1125 fputc('S', stderr); 1306 fputc ('S', stderr);
1126 if (key_state & 8) 1307 if (key_state & 8)
1127 fputc('A', stderr); 1308 fputc ('A', stderr);
1128 if (key_state & 32) 1309 if (key_state & 32)
1129 fputc('2', stderr); 1310 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 1312 button_number,
1132 x + 1, 1313 x + 1,
1133 y + 1); 1314 y + 1);
1134#else 1315#endif
1316
1135 tt_printf("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1137 (32 + x + 1), 1319 (32 + x + 1),
1138 (32 + y + 1)); 1320 (32 + y + 1));
1139#endif
1140} 1321}
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 1322
1152/*{{{ process an X event */ 1323/*{{{ process an X event */
1153void 1324void
1154rxvt_term::process_x_event (XEvent *ev) 1325rxvt_term::x_cb (XEvent &ev)
1155{ 1326{
1327 make_current ();
1328
1329 dLocal (Display *, dpy);
1330
1331 if (ev.xany.window == vt
1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1333 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1334 return;
1335
1336 // for XQueryPointer
1156 Window unused_root, unused_child; 1337 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1338 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1339 unsigned int unused_mask;
1159 1340
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) 1341 switch (ev.type)
1210 { 1342 {
1211 case KeyPress: 1343 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1344 key_press (ev.xkey);
1213 break; 1345 break;
1214 1346
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1347 case KeyRelease:
1217 { 1348 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; 1349 break;
1229 }
1230#endif
1231 1350
1232 case ButtonPress: 1351 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1352 button_press (ev.xbutton);
1234 break; 1353 break;
1235 1354
1236 case ButtonRelease: 1355 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1356 button_release (ev.xbutton);
1238 break; 1357 break;
1239 1358
1240 case ClientMessage: 1359 case ClientMessage:
1241 if (ev->xclient.format == 32 1360 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1361 && !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 { 1362 {
1251 /* Get Dnd data */ 1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1252 Atom ActualType; 1364 {
1253 int ActualFormat; 1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1254 unsigned char *data; 1366 {
1255 unsigned long Size, RemainingBytes; 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1256 1368 {
1257 XGetWindowProperty(Xdisplay, Xroot, 1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1258 xa[XA_DNDSELECTION], 1370 destroy ();
1259 0L, 1000000L, 1371 }
1260 False, AnyPropertyType, 1372#if ENABLE_EWMH
1261 &ActualType, &ActualFormat, 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1262 &Size, &RemainingBytes, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1263 &data); 1376 &ev);
1264 XChangeProperty(Xdisplay, Xroot, 1377#endif
1265 XA_CUT_BUFFER0, XA_STRING, 1378 }
1266 8, PropModeReplace, 1379 }
1267 data, STRLEN(data)); 1380#if ENABLE_XEMBED
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1382 {
1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1388#endif
1270 } 1389 }
1271#endif /* OFFIX_DND */
1272 break;
1273
1274 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping));
1276 break; 1390 break;
1277 1391
1278 /* 1392 /*
1279 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1398 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1399 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1400 * which ought to make things real slow!
1287 */ 1401 */
1288 case VisibilityNotify: 1402 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1403 switch (ev.xvisibility.state)
1290 { 1404 {
1291 case VisibilityUnobscured: 1405 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1406 refresh_type = FAST_REFRESH;
1293 break; 1407 break;
1294 case VisibilityPartiallyObscured: 1408 case VisibilityPartiallyObscured:
… …
1299 break; 1413 break;
1300 } 1414 }
1301 break; 1415 break;
1302 1416
1303 case FocusIn: 1417 case FocusIn:
1304 if (!TermWin.focus) 1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1421 focus_in ();
1422 break;
1423
1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1435 if (ev.xconfigure.window == parent[0])
1305 { 1436 {
1306 TermWin.focus = 1; 1437 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 } 1438 ;
1318 break;
1319 1439
1320 case FocusOut: 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1321 if (TermWin.focus)
1322 { 1441 {
1323 TermWin.focus = 0; 1442 seen_resize = 1;
1324 want_refresh = 1; 1443 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 } 1444 }
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 1445 else
1358 { 1446 {
1359 D_SIZE((stderr, "Size: Not resizing")); 1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1360 } 1451 }
1361#endif 1452 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 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1372 break; 1462 break;
1373 1463
1374 case SelectionClear: 1464 case SelectionClear:
1375 selection_clear (); 1465 selection_clear ();
1376 break; 1466 break;
1377 1467
1378 case SelectionNotify: 1468 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1469 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1381 ev->xselection.property, True);
1382 break; 1471 break;
1383 1472
1384 case SelectionRequest: 1473 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1474 selection_send (ev.xselectionrequest);
1475 break;
1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1481#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1386 break; 1483 break;
1387 1484
1388 case UnmapNotify: 1485 case UnmapNotify:
1389 TermWin.mapped = 0; 1486 mapped = 0;
1390#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1391 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1392#endif 1489#endif
1393 break; 1490 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; 1491 break;
1429 1492
1430 case GraphicsExpose: 1493 case GraphicsExpose:
1431 case Expose: 1494 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1495 if (ev.xany.window == vt)
1433 { 1496 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1497 do
1498 {
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1501 }
1438 // don't understand this, so commented it out 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1510 }
1442 // ev->xexpose.width, TermWin.height, False);
1443#endif
1444 want_refresh = 1; 1511 want_refresh = 1;
1445 } 1512 }
1446 else 1513 else
1447 { 1514 {
1448 XEvent unused_xevent; 1515 XEvent unused_event;
1449 1516
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1451 Expose, 1518 ;
1452 &unused_xevent)) ; 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1520 ;
1454 GraphicsExpose, 1521
1455 &unused_xevent)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1457 { 1523 {
1458 scrollBar.setIdle(); 1524 scrollBar.setIdle ();
1459 scrollbar_show (0); 1525 scrollbar_show (0);
1460 } 1526 }
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 } 1527 }
1470 break; 1528 break;
1471 1529
1472 case MotionNotify: 1530 case MotionNotify:
1473#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1532 if (hidden_pointer)
1475 pointer_unblank (); 1533 pointer_unblank ();
1476#endif 1534#endif
1477#if MENUBAR 1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1478 if (isMenuBarWindow(ev->xany.window)) 1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1539 break;
1540
1541 if (ev.xany.window == vt)
1479 { 1542 {
1480 menubar_control (&(ev->xbutton)); 1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1481 break; 1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1482 } 1545 ; // 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))) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1490 { 1547 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1549 ;
1550
1493 XQueryPointer(Xdisplay, TermWin.vt, 1551 XQueryPointer (dpy, vt,
1494 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1497 &unused_mask); 1555 &ev.xbutton.state);
1498#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1559 {
1502#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1505#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1508 { 1575 {
1509 int dist; 1576 int dist;
1510
1511 pending_scroll_selection=1;
1512 1577
1513 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1514 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1515 */ 1580 */
1516 if (scroll_selection_delay<=0) 1581 if (!sel_scroll_ev.active)
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1518 1583
1519 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1521 */ 1586 */
1522 selection_save_x=ev->xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1524 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1590
1527 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1529 { 1593 {
1530 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1532 } 1596 }
1533 else 1597 else
1534 { 1598 {
1535 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1600 dist = ev.xbutton.y - (int_bwidth + height);
1537 (TermWin.int_bwidth + TermWin.height);
1538 } 1601 }
1602
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1541 MIN_IT(scroll_selection_lines, 1606 min_it (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1543 } 1608 }
1544 else 1609 else
1545 { 1610 {
1546 /* we are within the text window, so we 1611 /* we are within the text window, so we
1547 * shouldn't be scrolling 1612 * shouldn't be scrolling
1548 */ 1613 */
1549 pending_scroll_selection = 0; 1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop();
1550 } 1616 }
1551#endif 1617#endif
1552#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1553
1554 } 1619 }
1555#endif 1620#endif
1556
1557 } 1621 }
1558 } 1622 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1624 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1562 MotionNotify, ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1563 XQueryPointer(Xdisplay, scrollBar.win, 1629 XQueryPointer (dpy, scrollBar.win,
1564 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1567 &unused_mask); 1633 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1635 scrollbar_size ());
1570 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1636 want_refresh = 1;
1572 scrollbar_show (1); 1637 scrollbar_show (1);
1573 } 1638 }
1574 break; 1639 break;
1575 } 1640 }
1641
1642#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again ();
1652 }
1653#endif
1654
1655#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 {
1658 if (ev.type == MotionNotify
1659 || ev.type == ButtonPress
1660 || ev.type == ButtonRelease)
1661 if (hidden_pointer)
1662 pointer_unblank ();
1663
1664 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank ();
1666 }
1667#endif
1576} 1668}
1577 1669
1578void 1670void
1671rxvt_term::focus_in ()
1672{
1673 if (!focus)
1674 {
1675 focus = 1;
1676 want_refresh = 1;
1677
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM
1681 if (Input_Context != NULL)
1682 {
1683 IMSetPosition ();
1684 XSetICFocus (Input_Context);
1685 }
1686#endif
1687#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1690#endif
1691#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade])
1693 {
1694 pix_colors = pix_colors_focused;
1695 scr_recolour ();
1696 }
1697#endif
1698#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell))
1700 {
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1708 }
1709}
1710
1711void
1712rxvt_term::focus_out ()
1713{
1714 if (focus)
1715 {
1716 focus = 0;
1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1720
1721#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf)
1723 {
1724 iso14755buf = 0;
1725# if ISO_14755
1726 scr_overlay_off ();
1727# endif
1728 }
1729#endif
1730#if USE_XIM
1731 if (Input_Context != NULL)
1732 XUnsetICFocus (Input_Context);
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.stop ();
1737
1738 hidden_cursor = 0;
1739#endif
1740#if OFF_FOCUS_FADING
1741 if (rs[Rs_fade])
1742 {
1743 pix_colors = pix_colors_unfocused;
1744 scr_recolour ();
1745 }
1746#endif
1747 }
1748}
1749
1750void
1751rxvt_term::update_fade_color (unsigned int idx)
1752{
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 rgba c;
1757 pix_colors [Color_fade].get (c);
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 }
1760#endif
1761}
1762
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL
1764void
1765rxvt_term::rootwin_cb (XEvent &ev)
1766{
1767 make_current ();
1768
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return;
1772
1773# if ENABLE_TRANSPARENCY
1774 switch (ev.type)
1775 {
1776 case PropertyNotify:
1777 /*
1778 * if user used some Esetroot compatible prog to set the root bg,
1779 * use the property to determine the pixmap. We use it later on.
1780 */
1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 {
1784 bgPixmap.set_root_pixmap ();
1785 update_background ();
1786 }
1787 break;
1788 }
1789# endif
1790}
1791#endif
1792
1793void
1579rxvt_term::button_press (XButtonEvent *ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1580{ 1795{
1581 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1582 1797
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1799
1584 if (!bypass_keystate) 1800 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1586 /* 1803 /*
1587 * VT window processing of button press 1804 * VT window processing of button press
1588 */ 1805 */
1589 if (ev->window == TermWin.vt) 1806 if (ev.window == vt)
1590 { 1807 {
1591#if RXVT_GRAPHICS 1808 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1592 if (ev->subwindow != None) 1809 return;
1593 rxvt_Gr_ButtonPress (ev->x, ev->y);
1594 else
1595#endif
1596 1810
1811#if ISO_14755
1812 // 5.4
1813 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1814 {
1815 iso14755_54 (ev.x, ev.y);
1816 return;
1597 { 1817 }
1818#endif
1819
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1820 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1821
1599 if (reportmode) 1822 if (reportmode)
1823 {
1824 /* mouse report from vt window */
1825 /* save the xbutton state (for ButtonRelease) */
1826 MEvent.state = ev.state;
1827#ifdef MOUSE_REPORT_DOUBLECLICK
1828 if (ev.button == MEvent.button && clickintime)
1600 { 1829 {
1601 /* mouse report from vt window */ 1830 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1831 MEvent.clicks++;
1603 MEvent.state = ev->state; 1832
1604#ifdef MOUSE_REPORT_DOUBLECLICK 1833 if (MEvent.clicks > 1)
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1834 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1835 /* only report double clicks */
1612 MEvent.clicks = 2; 1836 MEvent.clicks = 2;
1613 mouse_report (ev); 1837 mouse_report (ev);
1614 1838
1615 /* don't report the release */ 1839 /* don't report the release */
1616 MEvent.clicks = 0; 1840 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1841 MEvent.button = AnyButton;
1618 }
1619 } 1842 }
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 } 1843 }
1633 else 1844 else
1634 { 1845 {
1635 if (ev->button != MEvent.button) 1846 /* different button, or time expired */
1636 MEvent.clicks = 0; 1847 MEvent.clicks = 1;
1848 MEvent.button = ev.button;
1849 mouse_report (ev);
1850 }
1851#else
1852 MEvent.button = ev.button;
1853 mouse_report (ev);
1854#endif /* MOUSE_REPORT_DOUBLECLICK */
1855
1856 }
1857 else
1858 {
1859 if (ev.button != MEvent.button)
1860 MEvent.clicks = 0;
1861
1637 switch (ev->button) 1862 switch (ev.button)
1638 { 1863 {
1639 case Button1: 1864 case Button1:
1865 /* allow meta + click to select rectangular areas */
1866 /* should be done in screen.C */
1867#if ENABLE_FRILLS
1868 selection.rect = !!(ev.state & ModMetaMask);
1869#else
1870 selection.rect = false;
1871#endif
1872
1640 /* allow shift+left click to extend selection */ 1873 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1874 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1642 { 1875 {
1643 if (MEvent.button == Button1 && clickintime) 1876 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1877 selection_rotate (ev.x, ev.y);
1645 else
1646 selection_extend (ev->x, ev->y, 1);
1647 }
1648 else 1878 else
1649 { 1879 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 } 1880 }
1657 1881 else
1658 MEvent.button = Button1;
1659 break; 1882 {
1660
1661 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1884 MEvent.clicks++;
1664 else 1885 else
1886 MEvent.clicks = 1;
1887
1888 selection_click (MEvent.clicks, ev.x, ev.y);
1889 }
1890
1891 MEvent.button = Button1;
1892 break;
1893
1894 case Button3:
1895 if (MEvent.button == Button3 && clickintime)
1896 selection_rotate (ev.x, ev.y);
1897 else
1665 selection_extend (ev->x, ev->y, 1); 1898 selection_extend (ev.x, ev.y, 1);
1899
1666 MEvent.button = Button3; 1900 MEvent.button = Button3;
1667 break; 1901 break;
1668 }
1669 } 1902 }
1903 }
1904
1670 MEvent.time = ev->time; 1905 MEvent.time = ev.time;
1671 return; 1906 return;
1672 }
1673 } 1907 }
1674 1908
1675 /* 1909 /*
1676 * Scrollbar window processing of button press 1910 * Scrollbar window processing of button press
1677 */ 1911 */
1678 if (isScrollbarWindow(ev->window)) 1912 if (isScrollbarWindow (ev.window))
1679 { 1913 {
1680 scrollBar.setIdle (); 1914 scrollBar.setIdle ();
1681 /* 1915 /*
1682 * Rxvt-style scrollbar: 1916 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1917 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1929 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1930 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1931 * click on scrollbar - send pageup/down
1698 */ 1932 */
1699 if ((scrollBar.style == R_SB_NEXT 1933 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1934 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1935 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1936 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1937 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1938 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1939 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1940 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1941 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1942 tt_printf ("\033[B");
1709 else 1943 else
1710 switch (ev->button) 1944 switch (ev.button)
1711 { 1945 {
1712 case Button2: 1946 case Button2:
1713 tt_printf("\014"); 1947 tt_printf ("\014");
1714 break; 1948 break;
1715 case Button1: 1949 case Button1:
1716 tt_printf("\033[6~"); 1950 tt_printf ("\033[6~");
1717 break; 1951 break;
1718 case Button3: 1952 case Button3:
1719 tt_printf("\033[5~"); 1953 tt_printf ("\033[5~");
1720 break; 1954 break;
1721 } 1955 }
1722 } 1956 }
1723 else 1957 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1958#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1960 {
1727 char upordown = 0; 1961 char upordown = 0;
1728 1962
1729 if (scrollBar.style == R_SB_NEXT) 1963 if (scrollBar.style == R_SB_NEXT)
1730 { 1964 {
1731 if (scrollbarnext_upButton(ev->y)) 1965 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1966 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1967 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1968 upordown = 1; /* down */
1735 } 1969 }
1736 else if (scrollBar.style == R_SB_RXVT) 1970 else if (scrollBar.style == R_SB_RXVT)
1737 { 1971 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1972 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1973 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1974 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1975 upordown = 1; /* down */
1742 } 1976 }
1743 if (upordown) 1977 if (upordown)
1744 { 1978 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1746 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1747#endif 1981#endif
1748 if (scr_page (upordown < 0 ? UP : DN, 1)) 1982 if (scr_page (upordown < 0 ? UP : DN, 1))
1749 { 1983 {
1750 if (upordown < 0) 1984 if (upordown < 0)
1751 scrollBar.setUp (); 1985 scrollBar.setUp ();
1752 else 1986 else
1753 scrollBar.setDn (); 1987 scrollBar.setDn ();
1754 } 1988 }
1755 } 1989 }
1756 else 1990 else
1757 switch (ev->button) 1991 switch (ev.button)
1758 { 1992 {
1759 case Button2: 1993 case Button2:
1760 switch (scrollbar_align) 1994 switch (scrollbar_align)
1761 { 1995 {
1762 case R_SB_ALIGN_TOP: 1996 case R_SB_ALIGN_TOP:
… …
1767 break; 2001 break;
1768 case R_SB_ALIGN_BOTTOM: 2002 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 2003 csrO = scrollBar.bot - scrollBar.top;
1770 break; 2004 break;
1771 } 2005 }
2006
1772 if (scrollBar.style == R_SB_XTERM 2007 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 2008 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 2009 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 2010 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1776 scrollbar_size()); 2011
1777 scrollBar.setMotion (); 2012 scrollBar.setMotion ();
1778 break; 2013 break;
1779 2014
1780 case Button1: 2015 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2016 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 2017 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 2018 /* FALLTHROUGH */
1784 2019
1785 case Button3: 2020 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 2021 if (scrollBar.style != R_SB_XTERM)
1787 { 2022 {
1788 if (scrollbar_above_slider(ev->y)) 2023 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 2024# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 2025 scr_page (UP, nrow - 1);
1791# else 2026# else
1792 scr_page (UP, TermWin.nrow / 4); 2027 scr_page (UP, nrow / 4);
1793# endif 2028# endif
1794 else if (scrollbar_below_slider(ev->y)) 2029 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 2030# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 2031 scr_page (DN, nrow - 1);
1797# else 2032# else
1798 scr_page (DN, TermWin.nrow / 4); 2033 scr_page (DN, nrow / 4);
1799# endif 2034# endif
1800 else 2035 else
1801 scrollBar.setMotion (); 2036 scrollBar.setMotion ();
1802 } 2037 }
1803 else 2038 else
1804 { 2039 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 2040 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 2041 (nrow
1807 * scrollbar_position(ev->y) 2042 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 2043 / scrollbar_size ()));
1809 } 2044 }
2045
1810 break; 2046 break;
1811 } 2047 }
1812 } 2048 }
2049
1813 return; 2050 return;
1814 } 2051 }
1815#if MENUBAR
1816 /*
1817 * Menubar window processing of button press
1818 */
1819 if (isMenuBarWindow(ev->window))
1820 menubar_control (ev);
1821#endif
1822} 2052}
1823 2053
1824void 2054void
1825rxvt_term::button_release (XButtonEvent *ev) 2055rxvt_term::button_release (XButtonEvent &ev)
1826{ 2056{
1827 int reportmode = 0; 2057 int reportmode = 0;
1828 2058
1829 csrO = 0; /* reset csr Offset */ 2059 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 2060 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2061 reportmode = !! (priv_modes & PrivMode_mouse_report);
1832 2062
1833 if (scrollbar_isUpDn()) 2063 if (scrollbar_isUpDn ())
1834 { 2064 {
1835 scrollBar.setIdle (); 2065 scrollBar.setIdle ();
1836 scrollbar_show (0); 2066 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH;
1839#endif
1840
1841 } 2067 }
2068
1842#ifdef SELECTION_SCROLLING 2069#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 2070 if (sel_scroll_ev.active)
2071 sel_scroll_ev.stop();
1844#endif 2072#endif
2073
1845 if (ev->window == TermWin.vt) 2074 if (ev.window == vt)
1846 { 2075 {
1847#ifdef RXVT_GRAPHICS 2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1848 if (ev->subwindow != None) 2077 return;
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1850 else
1851#endif
1852 2078
1853 { 2079#if ISO_14755
2080 // 5.4
2081 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2082 return;
2083#endif
2084
1854 if (reportmode) 2085 if (reportmode)
2086 {
2087 /* mouse report from vt window */
2088 /* don't report release of wheel "buttons" */
2089 if (ev.button >= 4)
2090 return;
2091#ifdef MOUSE_REPORT_DOUBLECLICK
2092 /* only report the release of 'slow' single clicks */
2093 if (MEvent.button != AnyButton
2094 && (ev.button != MEvent.button
2095 || (ev.time - MEvent.time
2096 > MULTICLICK_TIME / 2)))
1855 { 2097 {
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; 2098 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 2099 MEvent.button = AnyButton;
1873 mouse_report (ev); 2100 mouse_report (ev);
2101 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */
2103 MEvent.button = AnyButton;
2104 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 2106 return;
2107 }
2108
2109 /*
2110 * dumb hack to compensate for the failure of click-and-drag
2111 * when overriding mouse reporting
2112 */
2113 if (priv_modes & PrivMode_mouse_report
2114 && bypass_keystate
2115 && ev.button == Button1 && MEvent.clicks <= 1)
2116 selection_extend (ev.x, ev.y, 0);
2117
2118 switch (ev.button)
2119 {
2120 case Button1:
2121 case Button3:
2122 selection_make (ev.time);
2123 break;
2124
2125 case Button2:
2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2128 break;
2129
2130#ifdef MOUSE_WHEEL
2131 case Button4:
2132 case Button5:
2133 {
2134 int i;
2135 page_dirn v;
2136
2137 v = ev.button == Button4 ? UP : DN;
2138
2139 if (ev.state & ShiftMask)
2140 i = 1;
2141 else if (option (Opt_mouseWheelScrollPage))
2142 i = nrow - 1;
2143 else
2144 i = 5;
2145
2146# ifdef MOUSE_SLIP_WHEELING
2147 if (ev.state & ControlMask)
2148 {
2149 mouse_slip_wheel_speed += v ? -1 : 1;
2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2152
2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2154 }
2155 else
2156 {
2157# endif
2158 scr_page (v, i);
2159 scrollbar_show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 }
2162# endif
1876 } 2163 }
2164 break;
2165#endif
2166 }
2167 }
2168}
2169
2170/*}}} */
2171
2172bool
2173rxvt_term::cmd_parse ()
2174{
2175 bool flag = false;
2176 wchar_t ch = NOCHAR;
2177 char *seq_begin; // remember start of esc-sequence here
2178
2179 for (;;)
2180 {
2181 if (ch == NOCHAR)
2182 {
2183 seq_begin = cmdbuf_ptr;
2184 ch = next_char ();
2185
2186 if (ch == NOCHAR)
2187 break;
2188 }
2189
2190 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2191 {
2192 if (!seen_input)
2193 {
2194 seen_input = 1;
2195 // many badly-written programs (e.g. jed) contain a race condition:
2196 // they first read the screensize and then install a SIGWINCH handler.
2197 // some window managers resize the window early, and these programs
2198 // then sometimes get the size wrong.
2199 // unfortunately other programs are even more buggy and dislike
2200 // being sent SIGWINCH, so only do it when we were in fact being
2201 // resized.
2202 if (seen_resize && cmd_pid)
2203 kill (-cmd_pid, SIGWINCH);
2204 }
2205
2206 /* Read a text string from the input buffer */
2207 wchar_t buf[UBUFSIZ];
2208 bool refreshnow = false;
2209 int nlines = 0;
2210 wchar_t *str = buf;
2211 wchar_t *eol = str + min (ncol, UBUFSIZ);
2212
2213 for (;;)
2214 {
2215 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2216 break;
2217
2218 *str++ = ch;
2219
2220 if (ch == C0_LF || str >= eol)
2221 {
2222 if (ch == C0_LF)
2223 nlines++;
2224
2225 refresh_count++;
2226
2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2228 {
2229 refresh_count = 0;
2230
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2232 {
2233 refreshnow = true;
2234 ch = NOCHAR;
2235 break;
2236 }
2237 }
2238
2239 // scr_add_lines only works for nlines <= nrow - 1.
2240 if (nlines >= nrow - 1)
2241 {
2242 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2243 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2244 scr_add_lines (buf, str - buf, nlines);
2245
2246 nlines = 0;
2247 str = buf;
2248 eol = str + min (ncol, UBUFSIZ);
2249 }
2250
2251 if (str >= eol)
2252 {
2253 if (eol >= buf + UBUFSIZ)
2254 {
2255 ch = NOCHAR;
2256 break;
2257 }
2258 else
2259 eol = min (eol + ncol, buf + UBUFSIZ);
2260 }
2261
2262 }
2263
2264 seq_begin = cmdbuf_ptr;
2265 ch = next_char ();
2266 }
2267
2268 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2269 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2270 scr_add_lines (buf, str - buf, nlines);
2271
1877 /* 2272 /*
1878 * dumb hack to compensate for the failure of click-and-drag 2273 * If there have been a lot of new lines, then update the screen
1879 * when overriding mouse reporting 2274 * What the heck we'll cheat and only refresh less than every page-full.
2275 * if skipScroll is enabled.
1880 */ 2276 */
1881 if (PrivateModes & PrivMode_mouse_report 2277 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 { 2278 {
1888 case Button1: 2279 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); 2280 scr_refresh ();
1919 scrollbar_show (1); 2281 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 } 2282 }
1934 }
1935 }
1936#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window))
1938 menubar_control (ev);
1939#endif
1940}
1941 2283
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 { 2284 }
1972 pchanged = 1; 2285 else
1973 XSetWindowBackground(Xdisplay, TermWin.vt,
1974 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0;
1976 } 2286 {
1977 return pchanged; /* Don't try any more */ 2287 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 { 2288 {
2041 pchanged = 1; 2289 process_nonprinting (ch);
2042 if (TermWin.pixmap != None)
2043 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap);
2045 TermWin.pixmap = None;
2046 }
2047 } 2290 }
2048 am_pixmap_trans = 0; 2291 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 { 2292 {
2088 if (oldp != None) 2293 // we ran out of input, retry later
2089 pchanged = 1; 2294 cmdbuf_ptr = seq_begin;
2090 break; 2295 break;
2091 } 2296 }
2092 if (oldp != TermWin.parent[i]) 2297
2093 pchanged = 1; 2298 ch = NOCHAR;
2094 }
2095 n = 0;
2096 if (pchanged)
2097 { 2299 }
2098 for (; n < (unsigned int)i; n++) 2300 }
2099 { 2301
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2302 return flag;
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2303}
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2304
2103 { 2305// read the next character
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2306wchar_t
2105 break; 2307rxvt_term::next_char () NOTHROW
2106 } 2308{
2107 } 2309 while (cmdbuf_ptr < cmdbuf_endp)
2310 {
2311 // assume 7-bit to be ascii ALWAYS
2312 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2313 return *cmdbuf_ptr++;
2314
2315 wchar_t wc;
2316 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2317
2318 if (len == (size_t)-2)
2108 } 2319 {
2109 if (n > (int)(sizeof(TermWin.parent) 2320 // the mbstate stores incomplete sequences. didn't know this :/
2110 / sizeof(TermWin.parent[0]))) 2321 cmdbuf_ptr = cmdbuf_endp;
2322 break;
2111 { 2323 }
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 2324
2127 rqt.tv_sec = 1; 2325 if (len == (size_t)-1)
2128 rqt.tv_nsec = 0; 2326 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2129 nanosleep(&rqt, NULL); 2327
2130# else 2328 // assume wchar == unicode
2131 sleep(1); 2329 cmdbuf_ptr += len;
2132# endif 2330 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 } 2331 }
2332
2333 return NOCHAR;
2334}
2335
2336// read the next octet
2337uint32_t
2338rxvt_term::next_octet () NOTHROW
2339{
2340 return cmdbuf_ptr < cmdbuf_endp
2341 ? (unsigned char)*cmdbuf_ptr++
2342 : NOCHAR;
2343}
2344
2345static class out_of_input out_of_input;
2346
2347/* rxvt_cmd_getc () - Return next input character */
2348/*
2349 * Return the next input character after first passing any keyboard input
2350 * to the command.
2351 */
2352wchar_t
2353rxvt_term::cmd_getc () THROW ((class out_of_input))
2354{
2355 wchar_t c = next_char ();
2356
2357 if (c == NOCHAR)
2358 throw out_of_input;
2359
2144 return pchanged; 2360 return c;
2145} 2361}
2146#endif
2147 2362
2148/*}}} */ 2363uint32_t
2364rxvt_term::cmd_get8 () THROW ((class out_of_input))
2365{
2366 uint32_t c = next_octet ();
2367
2368 if (c == NOCHAR)
2369 throw out_of_input;
2370
2371 return c;
2372}
2149 2373
2150/*{{{ print pipe */ 2374/*{{{ print pipe */
2151/*----------------------------------------------------------------------*/ 2375/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2376#ifdef PRINTPIPE
2153FILE * 2377FILE *
2154rxvt_term::popen_printer () 2378rxvt_term::popen_printer ()
2155{ 2379{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2380 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2381
2158 if (stream == NULL) 2382 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2383 rxvt_warn ("can't open printer pipe, not printing.\n");
2384
2160 return stream; 2385 return stream;
2161} 2386}
2162 2387
2163int 2388int
2164rxvt_term::pclose_printer (FILE *stream) 2389rxvt_term::pclose_printer (FILE *stream)
2165{ 2390{
2166 fflush (stream); 2391 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); 2392 return pclose (stream);
2173# endif
2174} 2393}
2175 2394
2176/* 2395/*
2177 * simulate attached vt100 printer 2396 * simulate attached vt100 printer
2178 */ 2397 */
2179void 2398void
2180rxvt_term::process_print_pipe () 2399rxvt_term::process_print_pipe ()
2181{ 2400{
2182 int done; 2401 int done;
2183 FILE *fd; 2402 FILE *fd;
2184 2403
2185 if ((fd = popen_printer ()) == NULL) 2404 if ((fd = popen_printer ()) == NULL)
2186 return; 2405 return;
2187 2406
2188 /* 2407 /*
2189 * Send all input to the printer until either ESC[4i or ESC[?4i 2408 * Send all input to the printer until either ESC[4i or ESC[?4i
2190 * is received. 2409 * is received.
2191 */ 2410 */
2192 for (done = 0; !done;) 2411 for (done = 0; !done;)
2193 { 2412 {
2194 unsigned char buf[8]; 2413 unsigned char buf[8];
2195 unsigned char ch; 2414 unicode_t ch;
2196 unsigned int i, len; 2415 unsigned int i, len;
2197 2416
2198 if ((ch = cmd_getc ()) != C0_ESC) 2417 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2418 {
2200 if (putc(ch, fd) == EOF) 2419 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2420 break; /* done = 1 */
2202 } 2421 }
2203 else 2422 else
2204 { 2423 {
2205 len = 0; 2424 len = 0;
… …
2216 { 2435 {
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2436 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2437 break; /* done = 1 */
2219 } 2438 }
2220 } 2439 }
2440
2221 for (i = 0; i < len; i++) 2441 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2442 if (putc (buf[i], fd) == EOF)
2223 { 2443 {
2224 done = 1; 2444 done = 1;
2225 break; 2445 break;
2226 } 2446 }
2227 } 2447 }
2228 } 2448 }
2449
2229 pclose_printer (fd); 2450 pclose_printer (fd);
2230} 2451}
2231#endif /* PRINTPIPE */ 2452#endif /* PRINTPIPE */
2232/*}}} */ 2453/*}}} */
2233 2454
2234/* *INDENT-OFF* */ 2455/* *INDENT-OFF* */
2235enum { 2456enum {
2236 C1_40 = 0x40, 2457 C1_40 = 0x40,
2237 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2458 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, 2459 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, 2460 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 2461 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2241}; 2462};
2242/* *INDENT-ON* */ 2463/* *INDENT-ON* */
2243 2464
2244/*{{{ process non-printing single characters */ 2465/*{{{ process non-printing single characters */
2245void 2466void
2246rxvt_term::process_nonprinting (unsigned char ch) 2467rxvt_term::process_nonprinting (unicode_t ch)
2247{ 2468{
2248 switch (ch) 2469 switch (ch)
2249 { 2470 {
2471 case C0_ESC:
2472 process_escape_seq ();
2473 break;
2250 case C0_ENQ: /* terminal Status */ 2474 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2475 if (rs[Rs_answerbackstring])
2252 tt_write( 2476 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 2477 else
2256 tt_write((unsigned char *)VT100_ANS, 2478 tt_write (VT100_ANS, strlen (VT100_ANS));
2257 (unsigned int)STRLEN(VT100_ANS));
2258 break; 2479 break;
2259 case C0_BEL: /* bell */ 2480 case C0_BEL: /* bell */
2260 scr_bell (); 2481 scr_bell ();
2261 break; 2482 break;
2262 case C0_BS: /* backspace */ 2483 case C0_BS: /* backspace */
… …
2277 scr_charset_choose (1); 2498 scr_charset_choose (1);
2278 break; 2499 break;
2279 case C0_SI: /* shift in - acs */ 2500 case C0_SI: /* shift in - acs */
2280 scr_charset_choose (0); 2501 scr_charset_choose (0);
2281 break; 2502 break;
2503
2504#ifdef EIGHT_BIT_CONTROLS
2505 // 8-bit controls
2506 case 0x90: /* DCS */
2507 process_dcs_seq ();
2508 break;
2509 case 0x9b: /* CSI */
2510 process_csi_seq ();
2511 break;
2512 case 0x9d: /* OSC */
2513 process_osc_seq ();
2514 break;
2515#endif
2282 } 2516 }
2283} 2517}
2284/*}}} */ 2518/*}}} */
2285 2519
2286 2520
2287/*{{{ process VT52 escape sequences */ 2521/*{{{ process VT52 escape sequences */
2288void 2522void
2289rxvt_term::process_escape_vt52 (unsigned char ch) 2523rxvt_term::process_escape_vt52 (unicode_t ch)
2290{ 2524{
2291 int row, col; 2525 int row, col;
2292 2526
2293 switch (ch) 2527 switch (ch)
2294 { 2528 {
… …
2324 row = cmd_getc () - ' '; 2558 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2559 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2560 scr_gotorc (row, col, 0);
2327 break; 2561 break;
2328 case 'Z': /* identify the terminal type */ 2562 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2563 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2564 break;
2331 case '<': /* turn off VT52 mode */ 2565 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2566 PrivMode (0, PrivMode_vt52);
2333 break; 2567 break;
2334 case 'F': /* use special graphics character set */ 2568 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2569 case 'G': /* use regular character set */
2336 /* unimplemented */ 2570 /* unimplemented */
2337 break; 2571 break;
… …
2346 2580
2347/*{{{ process escape sequences */ 2581/*{{{ process escape sequences */
2348void 2582void
2349rxvt_term::process_escape_seq () 2583rxvt_term::process_escape_seq ()
2350{ 2584{
2351 unsigned char ch = cmd_getc (); 2585 unicode_t ch = cmd_getc ();
2352 2586
2353 if (PrivateModes & PrivMode_vt52) 2587 if (priv_modes & PrivMode_vt52)
2354 { 2588 {
2355 process_escape_vt52 (ch); 2589 process_escape_vt52 (ch);
2356 return; 2590 return;
2357 } 2591 }
2358 2592
… …
2373 scr_charset_set (2, (unsigned int)cmd_getc ()); 2607 scr_charset_set (2, (unsigned int)cmd_getc ());
2374 break; 2608 break;
2375 case '+': 2609 case '+':
2376 scr_charset_set (3, (unsigned int)cmd_getc ()); 2610 scr_charset_set (3, (unsigned int)cmd_getc ());
2377 break; 2611 break;
2378#ifdef MULTICHAR_SET 2612#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': 2613 case '6':
2385 scr_backindex (); 2614 scr_backindex ();
2386 break; 2615 break;
2387#endif 2616#endif
2388 case '7': 2617 case '7':
2389 scr_cursor (SAVE); 2618 scr_cursor (SAVE);
2390 break; 2619 break;
2391 case '8': 2620 case '8':
2392 scr_cursor (RESTORE); 2621 scr_cursor (RESTORE);
2393 break; 2622 break;
2394#ifndef NO_FRILLS 2623#if !ENABLE_MINIMAL
2395 case '9': 2624 case '9':
2396 scr_forwardindex (); 2625 scr_forwardindex ();
2397 break; 2626 break;
2398#endif 2627#endif
2399 case '=': 2628 case '=':
2400 case '>': 2629 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2630 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2631 break;
2403 2632
2404 case C1_40: 2633 case C1_40:
2405 cmd_getc (); 2634 cmd_getc ();
2406 break; 2635 break;
… …
2409 break; 2638 break;
2410 2639
2411 /* 8.3.87: NEXT LINE */ 2640 /* 8.3.87: NEXT LINE */
2412 case C1_NEL: /* ESC E */ 2641 case C1_NEL: /* ESC E */
2413 { 2642 {
2414 uint32_t nlcr[] = { '\n', '\r' }; 2643 wchar_t nlcr[] = { C0_LF, C0_CR };
2415 scr_add_lines (nlcr, 1, 2); 2644 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2416 } 2645 }
2417 break; 2646 break;
2418 2647
2419 /* kidnapped escape sequence: Should be 8.3.48 */ 2648 /* kidnapped escape sequence: Should be 8.3.48 */
2420 case C1_ESA: /* ESC G */ 2649 case C1_ESA: /* ESC G */
… …
2430 case C1_RI: /* ESC M */ 2659 case C1_RI: /* ESC M */
2431 scr_index (DN); 2660 scr_index (DN);
2432 break; 2661 break;
2433 2662
2434 /* 8.3.142: SINGLE-SHIFT TWO */ 2663 /* 8.3.142: SINGLE-SHIFT TWO */
2435 /*case C1_SS2: scr_single_shift (2); break; */ 2664 /*case C1_SS2: scr_single_shift (2); break; */
2436 2665
2437 /* 8.3.143: SINGLE-SHIFT THREE */ 2666 /* 8.3.143: SINGLE-SHIFT THREE */
2438 /*case C1_SS3: scr_single_shift (3); break; */ 2667 /*case C1_SS3: scr_single_shift (3); break; */
2439 2668
2440 /* 8.3.27: DEVICE CONTROL STRING */ 2669 /* 8.3.27: DEVICE CONTROL STRING */
2441 case C1_DCS: /* ESC P */ 2670 case C1_DCS: /* ESC P */
2442 process_dcs_seq (); 2671 process_dcs_seq ();
2443 break; 2672 break;
2444 2673
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2674 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2675 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2676 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2677 break; /* steal obsolete ESC [ c */
2450 2678
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2679 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2680 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2681 process_csi_seq ();
… …
2458 process_osc_seq (); 2686 process_osc_seq ();
2459 break; 2687 break;
2460 2688
2461 /* 8.3.106: RESET TO INITIAL STATE */ 2689 /* 8.3.106: RESET TO INITIAL STATE */
2462 case 'c': 2690 case 'c':
2691 mbstate.reset ();
2463 scr_poweron (); 2692 scr_poweron ();
2464 scrollbar_show (1); 2693 scrollbar_show (1);
2465 break; 2694 break;
2466 2695
2467 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2696 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2479 2708
2480/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2709/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2481/* *INDENT-OFF* */ 2710/* *INDENT-OFF* */
2482enum { 2711enum {
2483 CSI_ICH = 0x40, 2712 CSI_ICH = 0x40,
2484 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2713 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 , 2714 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, 2715 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, 2716 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, 2717 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, 2718 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2493 2722
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2723#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2724 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2725 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2726#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2727 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2728
2500const unsigned char csi_defaults[] = 2729const unsigned char csi_defaults[] =
2501 { 2730 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2731 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, */ 2732 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, */ 2733 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, [, \, ], ^, _, */ 2734 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, */ 2735 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, */ 2736 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, */ 2737 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, {, |, }, ~, */ 2738 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2510 }; 2739 };
2511/* *INDENT-ON* */ 2740/* *INDENT-ON* */
2512 2741
2513void 2742void
2514rxvt_term::process_csi_seq () 2743rxvt_term::process_csi_seq ()
2515{ 2744{
2516 unsigned char ch, priv, i; 2745 unicode_t ch, priv, i;
2517 unsigned int nargs, p; 2746 unsigned int nargs, p;
2518 int n, ndef; 2747 int n, ndef;
2519 int arg[ESC_ARGS]; 2748 int arg[ESC_ARGS] = { };
2520 2749
2521 for (nargs = ESC_ARGS; nargs > 0;) 2750 nargs = 0;
2522 arg[--nargs] = 0;
2523 2751
2524 priv = 0; 2752 priv = 0;
2525 ch = cmd_getc (); 2753 ch = cmd_getc ();
2526 if (ch >= '<' && ch <= '?') 2754 if (ch >= '<' && ch <= '?')
2527 { /* '<' '=' '>' '?' */ 2755 { /* '<' '=' '>' '?' */
2528 priv = ch; 2756 priv = ch;
2529 ch = cmd_getc (); 2757 ch = cmd_getc ();
2530 } 2758 }
2759
2531 /* read any numerical arguments */ 2760 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2761 for (n = -1; ch < CSI_ICH; )
2533 { 2762 {
2534 if (isdigit(ch)) 2763 if (isdigit (ch))
2535 { 2764 {
2536 if (n < 0) 2765 if (n < 0)
2537 n = ch - '0'; 2766 n = ch - '0';
2538 else 2767 else
2539 n = n * 10 + ch - '0'; 2768 n = n * 10 + ch - '0';
… …
2542 { 2771 {
2543 if (nargs < ESC_ARGS) 2772 if (nargs < ESC_ARGS)
2544 arg[nargs++] = n; 2773 arg[nargs++] = n;
2545 n = -1; 2774 n = -1;
2546 } 2775 }
2547 else if (ch == '\b') 2776 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); 2777 process_nonprinting (ch);
2559 } 2778
2560 ch = cmd_getc (); 2779 ch = cmd_getc ();
2561 } 2780 }
2562 2781
2563 if (ch > CSI_7F) 2782 if (ch > CSI_7F)
2564 return; 2783 return;
2565 2784
2566 if (nargs < ESC_ARGS) 2785 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2786 arg[nargs++] = n;
2568 2787
2569 i = ch - CSI_ICH; 2788 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2789 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2790 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2791 if (arg[p] == -1)
2573 arg[p] = ndef; 2792 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 2793
2582 /* 2794 /*
2583 * private mode handling 2795 * private mode handling
2584 */ 2796 */
2585 if (priv) 2797 if (priv)
2586 { 2798 {
2587 switch (priv) 2799 switch (priv)
2588 { 2800 {
2589 case '>': 2801 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2802 if (ch == CSI_DA) /* secondary device attributes */
2803 {
2804 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2805 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2806 //
2807 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2808 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2809 // versions.
2810 //
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2811 tt_printf ("\033[>%d;95;0c", 'U');
2812 }
2592 break; 2813 break;
2593 case '?': 2814 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2816 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2817 break;
… …
2599 } 2820 }
2600 2821
2601 switch (ch) 2822 switch (ch)
2602 { 2823 {
2603 /* 2824 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2825 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2826 */
2606#ifdef PRINTPIPE 2827#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2828 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2829 switch (arg[0])
2609 { 2830 {
… …
2701 2922
2702 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2923 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2703 arg[0] = -arg[0]; 2924 arg[0] = -arg[0];
2704 /* FALLTHROUGH */ 2925 /* FALLTHROUGH */
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2926 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2927 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2707 break; 2928 break;
2708 2929
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2930 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2931 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2711 (unsigned int)(sizeof(VT100_ANS) - 1));
2712 break; 2932 break;
2713 2933
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2934 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 2935 process_sgr_mode (nargs, arg);
2716 break; 2936 break;
2717 2937
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2938 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 2939 switch (arg[0])
2720 { 2940 {
2721 case 5: /* DSR requested */ 2941 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 2942 tt_printf ("\033[0n");
2723 break; 2943 break;
2724 case 6: /* CPR requested */ 2944 case 6: /* CPR requested */
2725 scr_report_position (); 2945 scr_report_position ();
2726 break; 2946 break;
2727#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2947 case 7: /* unofficial extension */
2948 if (option (Opt_insecure))
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 2949 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2730 break; 2950 break;
2731#endif
2732 case 8: /* unofficial extension */ 2951 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2952 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2734 break; 2953 break;
2735 } 2954 }
2736 break; 2955 break;
2737 2956
2738 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2957 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2771 break; 2990 break;
2772 2991
2773 case CSI_RM: /* 8.3.107: RESET MODE */ 2992 case CSI_RM: /* 8.3.107: RESET MODE */
2774 if (arg[0] == 4) 2993 if (arg[0] == 4)
2775 scr_insert_mode (0); 2994 scr_insert_mode (0);
2995 else if (arg[0] == 20)
2996 priv_modes &= ~PrivMode_LFNL;
2776 break; 2997 break;
2777 2998
2778 case CSI_SM: /* 8.3.126: SET MODE */ 2999 case CSI_SM: /* 8.3.126: SET MODE */
2779 if (arg[0] == 4) 3000 if (arg[0] == 4)
2780 scr_insert_mode (1); 3001 scr_insert_mode (1);
3002 else if (arg[0] == 20)
3003 priv_modes |= PrivMode_LFNL;
2781 break; 3004 break;
2782 3005
2783 /* 3006 /*
2784 * PRIVATE USE beyond this point. All CSI_7? sequences here 3007 * PRIVATE USE beyond this point. All CSI_7? sequences here
2785 */ 3008 */
… …
2797 break; 3020 break;
2798 case CSI_75: 3021 case CSI_75:
2799 scr_cursor (RESTORE); 3022 scr_cursor (RESTORE);
2800 break; 3023 break;
2801 3024
2802#ifndef NO_FRILLS 3025#if !ENABLE_MINIMAL
2803 case CSI_74: 3026 case CSI_74:
2804 process_window_ops (arg, nargs); 3027 process_window_ops (arg, nargs);
2805 break; 3028 break;
2806#endif 3029#endif
2807 3030
2808 case CSI_78: /* DECREQTPARM */ 3031 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 3032 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3033 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 3034 break;
2812 3035
2813 default: 3036 default:
2814 break; 3037 break;
2815 } 3038 }
2816} 3039}
2817/*}}} */ 3040/*}}} */
2818 3041
2819#ifndef NO_FRILLS 3042#if !ENABLE_MINIMAL
2820/* ARGSUSED */ 3043/* ARGSUSED */
2821void 3044void
2822rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3045rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2823{ 3046{
2824 int x, y; 3047 int x, y;
2825#if 0
2826 char *s;
2827#endif
2828 XWindowAttributes wattr; 3048 XWindowAttributes wattr;
2829 Window wdummy; 3049 Window wdummy;
3050
3051 dLocal (Display *, dpy);
2830 3052
2831 if (nargs == 0) 3053 if (nargs == 0)
2832 return; 3054 return;
3055
2833 switch (args[0]) 3056 switch (args[0])
2834 { 3057 {
2835 /* 3058 /*
2836 * commands 3059 * commands
2837 */ 3060 */
2838 case 1: /* deiconify window */ 3061 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 3062 XMapWindow (dpy, parent[0]);
2840 break; 3063 break;
2841 case 2: /* iconify window */ 3064 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 3065 XIconifyWindow (dpy, parent[0], display->screen);
2843 DefaultScreen(Xdisplay));
2844 break; 3066 break;
2845 case 3: /* set position (pixels) */ 3067 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 3068 XMoveWindow (dpy, parent[0], args[1], args[2]);
2847 break; 3069 break;
2848 case 4: /* set size (pixels) */ 3070 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3071 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 3072 break;
2851 case 5: /* raise window */ 3073 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 3074 XRaiseWindow (dpy, parent[0]);
2853 break; 3075 break;
2854 case 6: /* lower window */ 3076 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 3077 XLowerWindow (dpy, parent[0]);
2856 break; 3078 break;
2857 case 7: /* refresh window */ 3079 case 7: /* refresh window */
2858 scr_touch (true); 3080 scr_touch (true);
2859 break; 3081 break;
2860 case 8: /* set size (chars) */ 3082 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3083 set_widthheight ((unsigned int) (args[2] * fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 3084 (unsigned int) (args[1] * fheight));
2863 break; 3085 break;
3086
3087 //case 9: NYI, TODO, restore maximized window or maximize window
2864 default: 3088 default:
2865 if (args[0] >= 24) /* set height (chars) */ 3089 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 3090 set_widthheight ((unsigned int)width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 3091 (unsigned int) (args[1] * fheight));
2868 break; 3092 break;
3093
2869 /* 3094 /*
2870 * reports - some output format copied from XTerm 3095 * reports - some output format copied from XTerm
2871 */ 3096 */
2872 case 11: /* report window state */ 3097 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3098 XGetWindowAttributes (dpy, parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3099 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 3100 break;
2876 case 13: /* report window position */ 3101 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 3103 XTranslateCoordinates (dpy, parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 3104 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 3105 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 3106 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 3107 break;
2883 case 14: /* report window size (pixels) */ 3108 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3110 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 3111 break;
3112 case 18: /* report text area size (chars) */
3113 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3114 break;
2887 case 18: /* report window size (chars) */ 3115 case 19: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3116 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2889 break; 3117 break;
2890#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 3118 case 20: /* report icon label */
3119 {
3120 char *s;
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 3121 XGetIconName (dpy, parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3122 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3123 XFree (s);
3124 }
2894 break; 3125 break;
2895 case 21: /* report window title */ 3126 case 21: /* report window title */
3127 {
3128 char *s;
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 3129 XFetchName (dpy, parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3130 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3131 XFree (s);
3132 }
2898 break; 3133 break;
2899#endif
2900
2901 } 3134 }
2902} 3135}
2903#endif 3136#endif
2904 3137
2905/*----------------------------------------------------------------------*/ 3138/*----------------------------------------------------------------------*/
2906/* 3139/*
2907 * get input up until STRING TERMINATOR (or BEL) 3140 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 3141 * ends_how is terminator used. returned input must be free()'d
2909 */ 3142 */
2910unsigned char * 3143char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 3144rxvt_term::get_to_st (unicode_t &ends_how)
2912{ 3145{
2913 int seen_esc = 0; /* seen escape? */ 3146 unicode_t ch;
3147 bool seen_esc = false;
2914 unsigned int n = 0; 3148 unsigned int n = 0;
2915 unsigned char *s; 3149 wchar_t string[STRING_MAX];
2916 unsigned char ch, string[STRING_MAX];
2917 3150
2918 for (; (ch = cmd_getc ());) 3151 while ((ch = cmd_getc ()) != NOCHAR)
2919 { 3152 {
2920 if (ch == C0_BEL 3153 if (seen_esc)
2921 || ch == CHAR_ST 3154 {
2922 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3155 if (ch == 0x5c) /* 7bit ST */
2923 break; 3156 break;
3157 else
3158 return NULL;
3159 }
2924 if (ch == C0_ESC) 3160 else if (ch == C0_ESC)
2925 { 3161 {
2926 seen_esc = 1; 3162 seen_esc = true;
2927 continue; 3163 continue;
2928 } 3164 }
3165 else if (ch == C0_BEL || ch == CHAR_ST)
3166 break;
2929 else if (ch == '\t') 3167 else if (ch == C0_SYN)
2930 ch = ' '; /* translate '\t' to space */ 3168 ch = cmd_get8 ();
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3169 else if (ch < 0x20)
2932 return NULL; /* other control character - exit */ 3170 return NULL; /* other control character - exit */
2933 if (n < sizeof(string) - 1) 3171
3172 seen_esc = false;
3173
3174 if (n >= STRING_MAX - 1)
3175 // stop at some sane length
3176 return NULL;
3177
2934 string[n++] = ch; 3178 string[n++] = ch;
2935 seen_esc = 0;
2936 } 3179 }
3180
2937 string[n++] = '\0'; 3181 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3182
2939 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3183 ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 3184
2942 return s; 3185 return rxvt_wcstombs (string);
2943} 3186}
2944 3187
2945/*----------------------------------------------------------------------*/ 3188/*----------------------------------------------------------------------*/
2946/* 3189/*
2947 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3190 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2948 */ 3191 */
2949void 3192void
2950rxvt_term::process_dcs_seq () 3193rxvt_term::process_dcs_seq ()
2951{ 3194{
2952 unsigned char eh, *s; 3195 char *s;
3196 unicode_t eh;
3197
2953 /* 3198 /*
2954 * Not handled yet 3199 * Not handled yet
2955 */ 3200 */
2956 s = get_to_st (&eh); 3201 s = get_to_st (eh);
2957 if (s) 3202 if (s)
2958 free(s); 3203 free (s);
3204
2959 return; 3205 return;
2960} 3206}
2961 3207
2962/*----------------------------------------------------------------------*/ 3208/*----------------------------------------------------------------------*/
2963/* 3209/*
2964 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3210 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2965 */ 3211 */
2966void 3212void
2967rxvt_term::process_osc_seq () 3213rxvt_term::process_osc_seq ()
2968{ 3214{
2969 unsigned char ch, eh, *s; 3215 unicode_t ch, eh;
2970 int arg; 3216 int arg;
2971 3217
2972 ch = cmd_getc (); 3218 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3219 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 3220 arg = arg * 10 + (ch - '0');
2975 3221
2976 if (ch == ';') 3222 if (ch == ';')
2977 { 3223 {
2978 s = get_to_st (&eh); 3224 char *s = get_to_st (eh);
3225
2979 if (s) 3226 if (s)
2980 { 3227 {
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); 3228 process_xterm_seq (arg, s, eh);
2993 free(s); 3229 free (s);
2994 } 3230 }
3231 }
3232}
3233
3234void
3235rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3236{
3237 if (str[0] == '?' && !str[1])
2995 } 3238 {
3239 rgba c;
3240 pix_colors_focused[color].get (c);
3241
3242#if XFT
3243 if (c.a != rgba::MAX_CC)
3244 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3245 else
3246#endif
3247 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3248 }
3249 else
3250 set_window_color (color, str);
2996} 3251}
3252
2997/* 3253/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3254 * 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 */ 3255 */
3018void 3256void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3257rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3020{ 3258{
3021 int changed = 0; 3259 int color;
3022 int color;
3023 char *buf, *name; 3260 char *buf, *name;
3261 bool query = str[0] == '?' && !str[1];
3262 int saveop = op;
3024 3263
3264 dLocal (Display *, dpy);
3265
3025 assert(str != NULL); 3266 assert (str != NULL);
3267
3268 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3269 return;
3270
3026 switch (op) 3271 switch (op)
3027 { 3272 {
3028 case XTerm_name: 3273 case XTerm_name:
3029 set_title (str); 3274 set_title (str);
3030 /* FALLTHROUGH */ 3275 /* FALLTHROUGH */
3031 case XTerm_iconName: 3276 case XTerm_iconName:
3032 set_iconName (str); 3277 set_icon_name (str);
3033 break; 3278 break;
3034 case XTerm_title: 3279 case XTerm_title:
3035 set_title (str); 3280 set_title (str);
3036 break; 3281 break;
3282 case XTerm_property:
3283 if (str[0] == '?')
3284 {
3285 Atom prop = display->atom (str + 1);
3286 Atom actual_type;
3287 int actual_format;
3288 unsigned long nitems;
3289 unsigned long bytes_after;
3290 unsigned char *value = 0;
3291 const char *str = "";
3292
3293 if (prop
3294 && XGetWindowProperty (dpy, parent[0],
3295 prop, 0, 1<<16, 0, AnyPropertyType,
3296 &actual_type, &actual_format,
3297 &nitems, &bytes_after, &value) == Success
3298 && actual_type != None
3299 && actual_format == 8)
3300 str = (const char *)(value);
3301
3302 tt_printf ("\033]%d;%s%c", op, str, resp);
3303
3304 XFree (value);
3305 }
3306 else
3307 {
3308 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3309
3310 if (eq)
3311 {
3312 *eq = 0;
3313 set_utf8_property (display->atom (str), eq + 1);
3314 }
3315 else
3316 XDeleteProperty (dpy, parent[0],
3317 display->atom (str));
3318 }
3319 break;
3320
3037 case XTerm_Color: 3321 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3322 for (buf = (char *)str; buf && *buf;)
3039 { 3323 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3324 if ((name = strchr (buf, ';')) == NULL)
3041 break; 3325 break;
3326
3042 *name++ = '\0'; 3327 *name++ = '\0';
3043 color = atoi(buf); 3328 color = atoi (buf) + minCOLOR;
3044 if (color < 0 || color >= TOTAL_COLORS) 3329
3330 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3045 break; 3331 break;
3332
3046 if ((buf = STRCHR(name, ';')) != NULL) 3333 if ((buf = strchr (name, ';')) != NULL)
3047 *buf++ = '\0'; 3334 *buf++ = '\0';
3048 set_window_color (color + minCOLOR, name); 3335
3336 process_color_seq (op, color, name, resp);
3049 } 3337 }
3338 break;
3339 case XTerm_Color00:
3340 process_color_seq (op, Color_fg, str, resp);
3341 break;
3342 case XTerm_Color01:
3343 process_color_seq (op, Color_bg, str, resp);
3050 break; 3344 break;
3051#ifndef NO_CURSORCOLOR 3345#ifndef NO_CURSORCOLOR
3052 case XTerm_Color_cursor: 3346 case XTerm_Color_cursor:
3053 set_window_color (Color_cursor, str); 3347 process_color_seq (op, Color_cursor, str, resp);
3054 break; 3348 break;
3055#endif 3349#endif
3056 case XTerm_Color_pointer: 3350 case XTerm_Color_pointer_fg:
3057 set_window_color (Color_pointer, str); 3351 process_color_seq (op, Color_pointer_fg, str, resp);
3352 break;
3353 case XTerm_Color_pointer_bg:
3354 process_color_seq (op, Color_pointer_bg, str, resp);
3058 break; 3355 break;
3059#ifndef NO_BOLD_UNDERLINE_REVERSE 3356#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: 3357 case XTerm_Color_RV:
3067 set_window_color (Color_RV, str); 3358 process_color_seq (op, Color_RV, str, resp);
3068 break; 3359 break;
3360 case Rxvt_Color_BD:
3361 case URxvt_Color_BD:
3362 process_color_seq (op, Color_BD, str, resp);
3363 break;
3364 case Rxvt_Color_UL:
3365 case URxvt_Color_UL:
3366 process_color_seq (op, Color_UL, str, resp);
3367 break;
3368 case URxvt_Color_IT:
3369 process_color_seq (op, Color_IT, str, resp);
3370 break;
3069#endif 3371#endif
3070 3372#if ENABLE_TRANSPARENCY
3071 case XTerm_Menu: 3373 case URxvt_Color_tint:
3374 process_color_seq (op, Color_tint, str, resp);
3072 /* 3375 {
3073 * rxvt_menubar_dispatch() violates the constness of the string, 3376 bool changed = false;
3074 * so DON'T do it here 3377 if (ISSET_PIXCOLOR (Color_tint))
3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3379 else
3380 changed = bgPixmap.unset_tint ();
3381 if (changed)
3382 update_background ();
3075 */ 3383 }
3384
3076 break; 3385 break;
3386#endif
3387
3388#if BG_IMAGE_FROM_FILE
3077 case XTerm_Pixmap: 3389 case Rxvt_Pixmap:
3078 if (*str != ';') 3390 if (!strcmp (str, "?"))
3079 { 3391 {
3080#if XPM_BACKGROUND 3392 char str[256];
3081 scale_pixmap (""); /* reset to default scaling */ 3393
3082 set_bgPixmap (str); /* change pixmap */ 3394 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3083#endif 3395 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3084 scr_touch (true); 3396 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3397 process_xterm_seq (XTerm_title, str, CHAR_ST);
3085 } 3398 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3399 else
3087 { 3400 {
3401 int changed = 0;
3402
3403 if (*str != ';')
3404 {
3405 /* reset to default scaling :*/
3406 bgPixmap.unset_geometry ();
3407 if (bgPixmap.set_file (str)) /* change pixmap */
3408 changed++;
3409 str = strchr (str, ';');
3410 if (str == NULL)
3411 bgPixmap.set_defaultGeometry ();
3412 }
3413 while (str)
3414 {
3088 str++; 3415 str++;
3089#if XPM_BACKGROUND 3416 if (bgPixmap.set_geometry (str))
3090 changed += scale_pixmap (str); 3417 changed++;
3091#endif 3418 str = strchr (str, ';');
3092 3419 }
3420 if (changed)
3421 update_background ();
3093 } 3422 }
3094 if (changed)
3095 {
3096#ifdef XPM_BACKGROUND
3097 resize_pixmap ();
3098#endif
3099 scr_touch (true);
3100 }
3101 break; 3423 break;
3424#endif
3102 3425
3103 case XTerm_restoreFG: 3426 case Rxvt_restoreFG:
3104 set_window_color (Color_fg, str); 3427 set_window_color (Color_fg, str);
3105 break; 3428 break;
3106 case XTerm_restoreBG: 3429 case Rxvt_restoreBG:
3107 set_window_color (Color_bg, str); 3430 set_window_color (Color_bg, str);
3108 break; 3431 break;
3432
3109 case XTerm_logfile: 3433 case XTerm_logfile:
3434 // TODO, when secure mode?
3110 break; 3435 break;
3111 case XTerm_font: 3436
3112 change_font (0, str);
3113 break;
3114#if 0 3437#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3438 case Rxvt_dumpscreen: /* no error notices */
3116 { 3439 {
3117 int fd; 3440 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3441 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3442 {
3120 scr_dump (fd); 3443 scr_dump (fd);
3121 close(fd); 3444 close (fd);
3122 } 3445 }
3123 } 3446 }
3124 break; 3447 break;
3125#endif 3448#endif
3449 case XTerm_font:
3450 op = URxvt_font;
3451 case URxvt_font:
3452#if ENABLE_STYLES
3453 case URxvt_boldFont:
3454 case URxvt_italicFont:
3455 case URxvt_boldItalicFont:
3456#endif
3457 if (query)
3458 tt_printf ("\33]%d;%-.250s%c", saveop,
3459 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3460 ? fontset[op - URxvt_font]->fontdesc : "",
3461 resp);
3462 else
3463 {
3464 const char *&res = rs[Rs_font + (op - URxvt_font)];
3126 3465
3466 res = strdup (str);
3467 allocated.push_back ((void *)res);
3468 set_fonts ();
3469 }
3470 break;
3471
3472 case URxvt_version:
3473 if (query)
3474 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3475 op,
3476 rs[Rs_name], VERSION[0], VERSION[2],
3477 resp);
3478 break;
3479
3480#if !ENABLE_MINIMAL
3481 case URxvt_locale:
3482 if (query)
3483 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3484 else
3485 {
3486 set_locale (str);
3487 pty->set_utf8_mode (enc_utf8);
3488 init_xlocale ();
3489 }
3490 break;
3491
3492 case URxvt_view_up:
3493 case URxvt_view_down:
3494 {
3495 int lines = atoi (str);
3496
3497 if (lines)
3498 scr_page (op == URxvt_view_up ? UP : DN, lines);
3499 else
3500 scr_erase_savelines ();
3501 }
3502
3503 break;
3504#endif
3505
3506#if ENABLE_PERL
3507 case URxvt_perl:
3508 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3509 ; // no responses yet
3510 break;
3511#endif
3127 } 3512 }
3128} 3513}
3129/*----------------------------------------------------------------------*/ 3514/*----------------------------------------------------------------------*/
3130 3515
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3516/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 3524 * so no need for fancy checking
3140 */ 3525 */
3141int 3526int
3142rxvt_term::privcases (int mode, unsigned long bit) 3527rxvt_term::privcases (int mode, unsigned long bit)
3143{ 3528{
3144 int state; 3529 int state;
3145 3530
3146 if (mode == 's') 3531 if (mode == 's')
3147 { 3532 {
3148 SavedModes |= (PrivateModes & bit); 3533 SavedModes |= (priv_modes & bit);
3149 return -1; 3534 return -1;
3150 } 3535 }
3151 else 3536 else
3152 { 3537 {
3153 if (mode == 'r') 3538 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3539 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3540 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3541 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3157 PrivMode(state, bit); 3542 PrivMode (state, bit);
3158 } 3543 }
3544
3159 return state; 3545 return state;
3160} 3546}
3161 3547
3162/* we're not using priv _yet_ */ 3548/* we're not using priv _yet_ */
3163void 3549void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3550rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3165{ 3551{
3166 unsigned int i, j; 3552 unsigned int i, j;
3167 int state; 3553 int state;
3554
3168 static const struct 3555 static const struct
3169 { 3556 {
3170 const int argval; 3557 const int argval;
3171 const unsigned long bit; 3558 const unsigned long bit;
3172 }
3173 argtopriv[] = { 3559 } argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 3560 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 3561 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 3562 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 3563 { 4, PrivMode_smoothScroll },
3178 { 5, PrivMode_rVideo }, 3564 { 5, PrivMode_rVideo },
3179 { 6, PrivMode_relOrigin }, 3565 { 6, PrivMode_relOrigin },
3180 { 7, PrivMode_Autowrap }, 3566 { 7, PrivMode_Autowrap },
3567 // 8, bi-directional support mode
3181 { 9, PrivMode_MouseX10 }, 3568 { 9, PrivMode_MouseX10 },
3182#ifdef menuBar_esc 3569 // 18, 19 printing-related
3183 { menuBar_esc, PrivMode_menuBar }, 3570 { 25, PrivMode_VisibleCursor },
3184#endif
3185#ifdef scrollBar_esc 3571#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 3572 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 3573#endif
3188 { 25, PrivMode_VisibleCursor },
3189 { 35, PrivMode_ShiftKeys }, 3574 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 3575 { 40, PrivMode_132OK },
3576 // 41 xterm more fixes NYI
3577 // 45 margin bell NYI
3578 // 46 start logging
3191 { 47, PrivMode_Screen }, 3579 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 3580 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 3581#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 3582 { 67, PrivMode_BackSpace },
3195#endif 3583#endif
3196 { 1000, PrivMode_MouseX11 }, 3584 { 1000, PrivMode_MouseX11 },
3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3586 { 1002, PrivMode_MouseBtnEvent },
3587 { 1003, PrivMode_MouseAnyEvent },
3197 { 1010, PrivMode_TtyOutputInh }, 3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 1011, PrivMode_Keypress }, 3589 { 1011, PrivMode_Keypress }, // rxvt extension
3590 // 1035 enable modifiers for alt, numlock NYI
3591 // 1036 send ESC for meta keys NYI
3592 // 1037 send DEL for keypad delete NYI
3199 { 1047, PrivMode_Screen }, 3593 { 1047, PrivMode_Screen },
3594 // 1048 save and restore cursor
3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3595 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3596 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3201 }; 3597 };
3202 3598
3203 if (nargs == 0) 3599 if (nargs == 0)
3204 return; 3600 return;
3205 3601
… …
3212 for (i = 0; i < nargs; i++) 3608 for (i = 0; i < nargs; i++)
3213 { 3609 {
3214 state = -1; 3610 state = -1;
3215 3611
3216 /* basic handling */ 3612 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3613 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3614 if (argtopriv[j].argval == arg[i])
3219 { 3615 {
3220 state = privcases (mode, argtopriv[j].bit); 3616 state = privcases (mode, argtopriv[j].bit);
3221 break; 3617 break;
3222 } 3618 }
3223 3619
3224 /* extra handling for values with state unkept */ 3620 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 3621 switch (arg[i])
3227 { 3622 {
3623#if ENABLE_STYLES
3624 case 1021:
3625 set_option (Opt_intensityStyles, mode);
3626
3627 scr_touch (true);
3628 break;
3629#endif
3228 case 1048: /* alternative cursor save */ 3630 case 1048: /* alternative cursor save */
3631 case 1049:
3632 if (option (Opt_secondaryScreen))
3229 if (mode == 0) 3633 if (mode == 0)
3230 scr_cursor (RESTORE); 3634 scr_cursor (RESTORE);
3231 else if (mode == 1) 3635 else if (mode == 1)
3232 scr_cursor (SAVE); 3636 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; 3637 break;
3638 }
3639
3640 if (state >= 0)
3641 /* extra handling for values with valid 0 or 1 state */
3642 switch (arg[i])
3643 {
3644 /* case 1: - application cursor keys */
3645 case 2: /* VT52 mode */
3646 /* oddball mode. should be set regardless of set/reset
3647 * parameter. Return from VT52 mode with an ESC < from
3648 * within VT52 mode
3649 */
3650 PrivMode (1, PrivMode_vt52);
3651 break;
3249 case 3: /* 80/132 */ 3652 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3653 if (priv_modes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3654 set_widthheight (((state ? 132 : 80) * fwidth), height);
3252 (unsigned int)TermWin.height);
3253 break; 3655 break;
3254 case 4: /* smooth scrolling */ 3656 case 4: /* smooth scrolling */
3255 if (state)
3256 Options &= ~Opt_jumpScroll;
3257 else
3258 Options |= Opt_jumpScroll; 3657 set_option (Opt_jumpScroll, !state);
3259 break; 3658 break;
3260 case 5: /* reverse video */ 3659 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 3660 scr_rvideo_mode (state);
3262 break; 3661 break;
3263 case 6: /* relative/absolute origins */ 3662 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 3663 scr_relative_origin (state);
3265 break; 3664 break;
3266 case 7: /* autowrap */ 3665 case 7: /* autowrap */
3267 scr_autowrap (state); 3666 scr_autowrap (state);
3268 break; 3667 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3668 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3669 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3670 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3273 break; 3672 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 3673#ifdef scrollBar_esc
3282 case scrollBar_esc: 3674 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 3675 if (scrollbar_mapping (state))
3284 { 3676 {
3285 resize_all_windows (0, 0, 0); 3677 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 3678 scr_touch (true);
3287 } 3679 }
3288 break; 3680 break;
3289#endif 3681#endif
3290 case 25: /* visible/invisible cursor */ 3682 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 3683 scr_cursor_visible (state);
3292 break; 3684 break;
3293 /* case 35: - shift keys */ 3685 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 3686 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 3687 case 47: /* secondary screen */
3296 scr_change_screen (state); 3688 scr_change_screen (state);
3297 break; 3689 break;
3298 /* case 66: - application key pad */ 3690 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3691 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3692 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3303 break; 3695 break;
3304#if 0 3696#if 0
3305 case 1001: 3697 case 1001:
3306 break; /* X11 mouse highlighting */ 3698 break; /* X11 mouse highlighting */
3307#endif 3699#endif
3700 case 1002:
3701 case 1003:
3702 if (state) {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 } else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state)
3310 Options &= ~Opt_scrollTtyOutput;
3311 else
3312 Options |= Opt_scrollTtyOutput; 3711 set_option (Opt_scrollTtyOutput, !state);
3313 break; 3712 break;
3314 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
3315 if (state)
3316 Options |= Opt_scrollTtyKeypress; 3714 set_option (Opt_scrollTtyKeypress, state);
3317 else
3318 Options &= ~Opt_scrollTtyKeypress;
3319 break; 3715 break;
3320 case 1047: /* secondary screen w/ clearing */ 3716 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3717 if (option (Opt_secondaryScreen))
3322 if (current_screen != PRIMARY) 3718 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 3719 scr_erase_screen (2);
3324 scr_change_screen (state); 3720 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 3721 break;
3722 case 1049: /* secondary screen w/ clearing first */
3723 scr_change_screen (state);
3724 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY)
3726 scr_erase_screen (2);
3727 break;
3728 default:
3729 break;
3328 } 3730 }
3329 } 3731 }
3330} 3732}
3331/*}}} */ 3733/*}}} */
3332 3734
3333/*{{{ process sgr sequences */ 3735/*{{{ process sgr sequences */
3334void 3736void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3737rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 3738{
3337 unsigned int i; 3739 unsigned int i;
3338 short rendset; 3740 short rendset;
3339 int rendstyle; 3741 int rendstyle;
3340 3742
3341 if (nargs == 0) 3743 if (nargs == 0)
3342 { 3744 {
3343 scr_rendition (0, ~RS_None); 3745 scr_rendition (0, ~RS_None);
3344 return; 3746 return;
3345 } 3747 }
3748
3346 for (i = 0; i < nargs; i++) 3749 for (i = 0; i < nargs; i++)
3347 { 3750 {
3348 rendset = -1; 3751 rendset = -1;
3349 switch (arg[i]) 3752 switch (arg[i])
3350 { 3753 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 3755 rendset = 0, rendstyle = ~RS_None;
3353 break; 3756 break;
3354 case 1: 3757 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 3758 rendset = 1, rendstyle = RS_Bold;
3356 break; 3759 break;
3760 //case 2: // low intensity
3761 case 3:
3762 rendset = 1, rendstyle = RS_Italic;
3763 break;
3357 case 4: 3764 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 3765 rendset = 1, rendstyle = RS_Uline;
3359 break; 3766 break;
3360 case 5: 3767 case 5: // slowly blinking
3768 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 3769 rendset = 1, rendstyle = RS_Blink;
3362 break; 3770 break;
3771 //case 6: // scoansi light background
3363 case 7: 3772 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 3773 rendset = 1, rendstyle = RS_RVid;
3365 break; 3774 break;
3366 case 22: 3775 case 8:
3776 // invisible. NYI
3777 break;
3778 //case 9: // crossed out
3779 //case 10: // scoansi acs off, primary font
3780 //case 11: // scoansi acs on, first alt font
3781 //case 12: // scoansi acs on, |0x80, second alt font
3782 //...
3783 //case 19: // ninth alt font
3784 //case 20: // gothic
3785 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3367 rendset = 0, rendstyle = RS_Bold; 3786 rendset = 0, rendstyle = RS_Bold;
3787 break;
3788 case 22: // normal intensity
3789 rendset = 0, rendstyle = RS_Bold;
3790 break;
3791 case 23: // disable italic
3792 rendset = 0, rendstyle = RS_Italic;
3368 break; 3793 break;
3369 case 24: 3794 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 3795 rendset = 0, rendstyle = RS_Uline;
3371 break; 3796 break;
3372 case 25: 3797 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 3798 rendset = 0, rendstyle = RS_Blink;
3374 break; 3799 break;
3800 case 26: // variable spacing (iso 8613)
3801 rendset = 0, rendstyle = RS_Blink;
3802 break;
3375 case 27: 3803 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 3804 rendset = 0, rendstyle = RS_RVid;
3377 break; 3805 break;
3806 //case 28: // visible. NYI
3807 //case 29: // not crossed-out
3378 } 3808 }
3809
3379 if (rendset != -1) 3810 if (rendset != -1)
3380 { 3811 {
3381 scr_rendition (rendset, rendstyle); 3812 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3813 continue; /* for (;i;) */
3383 } 3814 }
3384 3815
3385 switch (arg[i]) 3816 switch (arg[i])
3386 { 3817 {
3387 case 30: 3818 case 30:
… …
3390 case 33: 3821 case 33:
3391 case 34: 3822 case 34:
3392 case 35: 3823 case 35:
3393 case 36: 3824 case 36:
3394 case 37: 3825 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3826 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 3827 break;
3398#ifdef TTY_256COLOR 3828 case 38: // set fg color, ISO 8613-6
3399 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3829 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3830 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3831 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 3832 i += 2;
3405 } 3833 }
3406 break; 3834 break;
3407#endif
3408 case 39: /* default fg */ 3835 case 39: /* default fg */
3409 scr_color (Color_fg, Color_fg); 3836 scr_color (Color_fg, Color_fg);
3410 break; 3837 break;
3411 3838
3412 case 40: 3839 case 40:
… …
3415 case 43: 3842 case 43:
3416 case 44: 3843 case 44:
3417 case 45: 3844 case 45:
3418 case 46: 3845 case 46:
3419 case 47: 3846 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 3848 break;
3423#ifdef TTY_256COLOR 3849 case 48: // set bg color, ISO 8613-6
3424 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3850 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3851 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 3853 i += 2;
3430 } 3854 }
3431 break; 3855 break;
3432#endif
3433 case 49: /* default bg */ 3856 case 49: /* default bg */
3434 scr_color (Color_bg, Color_bg); 3857 scr_color (Color_bg, Color_bg);
3435 break; 3858 break;
3436 3859
3437#ifndef NO_BRIGHTCOLOR 3860 //case 50: // not variable spacing
3861
3862#if !ENABLE_MINIMAL
3438 case 90: 3863 case 90:
3439 case 91: /* set bright fg color */ 3864 case 91: /* set bright fg color */
3440 case 92: 3865 case 92:
3441 case 93: 3866 case 93:
3442 case 94: 3867 case 94:
3443 case 95: 3868 case 95:
3444 case 96: 3869 case 96:
3445 case 97: 3870 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3871 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3447 Color_fg);
3448 break; 3872 break;
3449 case 100: 3873 case 100:
3450 case 101: /* set bright bg color */ 3874 case 101: /* set bright bg color */
3451 case 102: 3875 case 102:
3452 case 103: 3876 case 103:
3453 case 104: 3877 case 104:
3454 case 105: 3878 case 105:
3455 case 106: 3879 case 106:
3456 case 107: 3880 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3881 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3458 Color_bg);
3459 break; 3882 break;
3460#endif 3883#endif
3461
3462 } 3884 }
3463 } 3885 }
3464} 3886}
3465/*}}} */ 3887/*}}} */
3466 3888
3467/*{{{ process Rob Nation's own graphics mode sequences */ 3889/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 3890void
3469rxvt_term::process_graphics () 3891rxvt_term::process_graphics ()
3470{ 3892{
3471 unsigned char ch, cmd = cmd_getc (); 3893 unicode_t ch, cmd = cmd_getc ();
3472 3894
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3895 if (cmd == 'Q')
3475 { /* query graphics */ 3896 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
3477 return; 3898 return;
3478 } 3899 }
3479 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
3480 do 3901 do
3481 ch = cmd_getc (); 3902 ch = cmd_getc ();
3482 while (ch != ':'); 3903 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} 3904}
3529/*}}} */ 3905/*}}} */
3530 3906
3531/* ------------------------------------------------------------------------- */ 3907/* ------------------------------------------------------------------------- */
3532 3908
3533/* 3909/*
3534 * Send printf() formatted output to the command. 3910 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3911 * Only use for small amounts of data.
3536 */ 3912 */
3537void 3913void
3538rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
3539{ 3915{
3540 va_list arg_ptr; 3916 va_list arg_ptr;
3541 unsigned char buf[256]; 3917 char buf[256];
3542 3918
3543 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
3544 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3545 va_end (arg_ptr); 3921 va_end (arg_ptr);
3546 tt_write (buf, STRLEN (buf)); 3922 tt_write (buf, strlen (buf));
3547} 3923}
3548 3924
3549/* ---------------------------------------------------------------------- */ 3925/* ---------------------------------------------------------------------- */
3550/* Write data to the pty as typed by the user, pasted with the mouse, 3926/* 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. 3927 * or generated by us in response to a query ESC sequence.
3552 */ 3928 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930
3553void 3931void
3554rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
3555{ 3933{
3556 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
3557 3936
3558 if (len) 3937 if (pty->pty < 0)
3938 return;
3939
3940 if (v_buflen == 0)
3941 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943
3944 if ((unsigned int)written == len)
3945 return;
3946
3947 data += written;
3948 len -= written;
3559 { 3949 }
3950
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3952
3953 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len;
3955
3956 pty_ev.set (ev::READ | ev::WRITE);
3957}
3958
3959void rxvt_term::pty_write ()
3960{
3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3962
3963 if (written > 0)
3964 {
3965 v_buflen -= written;
3966
3560 if (v_buflen == 0) 3967 if (v_buflen == 0)
3561 { 3968 {
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); 3969 free (v_buffer);
3589 v_buffer = 0; 3970 v_buffer = 0;
3590 v_buflen = 0;
3591 3971
3592 pty_ev.set (EVENT_READ); 3972 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; 3973 return;
3605 } 3974 }
3975
3976 memmove (v_buffer, v_buffer + written, v_buflen);
3606 } 3977 }
3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3979 pty_ev.set (ev::READ);
3607} 3980}
3608 3981
3609/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
3610 3983

Diff Legend

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