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.365 by ayin, Thu Nov 15 10:13:37 2007 UTC

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

Diff Legend

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