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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

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

Diff Legend

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