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

Diff Legend

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