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

Diff Legend

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