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.345 by sasha, Mon Aug 13 22:41:34 2007 UTC

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

Diff Legend

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