ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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