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

Diff Legend

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