ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC

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

Diff Legend

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