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

Diff Legend

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