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

Diff Legend

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