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

Diff Legend

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