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.359 by ayin, Mon Oct 15 14:56:06 2007 UTC

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

Diff Legend

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