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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.379 by root, Fri Dec 14 02:29:48 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-2007 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.is_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 else
1085 w.stop ();
1086}
1087#endif
1088
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1095 want_refresh = 1;
1096 else
1097 w.stop ();
1098}
1099#endif
1100
1101#ifdef SELECTION_SCROLLING
1102void
1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1104{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
705 } 1106 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1;
1109 }
1110 else
1111 w.stop ();
706} 1112}
1113#endif
1114
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{
1119 if (scr_page (mouse_slip_wheel_speed < 0 ? DN : UP, abs (mouse_slip_wheel_speed)))
1120 want_refresh = 1;
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1127}
1128#endif
1129
1130#if LINUX_YIELD_HACK
1131static struct event_handler
1132{
1133 ev::prepare yield_ev;
1134
1135 void yield_cb (ev::prepare &w, int revents)
1136 {
1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141
1142 struct timespec ts = { 0, 0 };
1143 nanosleep (&ts, 0);
1144
1145 w.stop ();
1146 }
1147
1148 event_handler ()
1149 : yield_ev (this, &event_handler::yield_cb)
1150 {
1151 }
1152} event_handler;
707#endif 1153#endif
708 1154
709bool 1155bool
710rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
711{ 1157{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1159
1160 if (CBUFSIZ == n)
1161 {
1162 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1163 n = 0;
1164 }
713 1165
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1166 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr + n;
717 1169
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
719 1171
720 if (n > 0) 1172 if (r > 0)
721 { 1173 {
722 cmdbuf_endp += n; 1174 cmdbuf_endp += r;
723 return true; 1175 return true;
724 } 1176 }
725 else if (n < 0 && errno != EAGAIN) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1178 {
1179#if LINUX_YIELD_HACK
1180 if (display->is_local)
1181 event_handler.yield_ev.start ();
1182#endif
1183 }
1184 else
1185 {
1186 pty_ev.stop ();
1187
1188 if (!option (Opt_hold))
726 destroy (); 1189 destroy ();
727 1190 }
1191
728 return false; 1192 return false;
729} 1193}
730 1194
731void 1195void
732rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
733{ 1197{
734 SET_R (this); 1198 make_current ();
735 SET_LOCALE (locale);
736 1199
737 if (revents & EVENT_WRITE) 1200 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 1201 // 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 ()) 1202 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 ()) 1203 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
764 unicode_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 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_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
868unicode_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; 1204 break;
886 }
887 1205
888 if (len == (size_t)-1) 1206 if (revents & ev::WRITE)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 1207 pty_write ();
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897} 1208}
898 1209
899/* rxvt_cmd_getc () - Return next input character */ 1210void
900/* 1211rxvt_term::pointer_unblank ()
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904unicode_t
905rxvt_term::cmd_getc ()
906{ 1212{
907 for (;;) 1213 XDefineCursor (dpy, vt, TermWin_cursor);
908 { 1214 recolour_cursor ();
909 unicode_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912 1215
913 // incomplete sequences should occur rarely, still, a better solution 1216#ifdef POINTER_BLANK
914 // would be preferred. either setjmp/longjmp or better design. 1217 hidden_pointer = 0;
915 fcntl (cmd_fd, F_SETFL, 0); 1218
916 pty_fill (); 1219 if (option (Opt_pointerBlank))
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 1220 pointer_ev.start (pointerBlankDelay);
918 } 1221#endif
919} 1222}
920 1223
921#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
922void 1225void
923rxvt_term::pointer_unblank () 1226rxvt_term::pointer_blank ()
924{ 1227{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1228 if (!option (Opt_pointerBlank))
926 recolour_cursor (); 1229 return;
927 1230
1231 XDefineCursor (dpy, vt, display->blank_cursor);
1232 XFlush (dpy);
1233
928 hidden_pointer = 0; 1234 hidden_pointer = 1;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932} 1235}
933 1236
934void 1237void
935rxvt_term::pointer_blank () 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
936{ 1239{
937 if (! (Options & Opt_pointerBlank)) 1240 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 1241
952 pointer_blank (); 1242 pointer_blank ();
953} 1243}
954#endif 1244#endif
955 1245
956void 1246void
957rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
958{ 1248{
959 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
960 int x, y; 1250 int x, y;
1251 int code = 32;
961 1252
962 x = ev.x; 1253 x = Pixel2Col (ev.x);
963 y = ev.y; 1254 y = Pixel2Row (ev.y);
964 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
965 1263
966 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1265 button_number = 3;
969 }
970 else 1266 else
971 { 1267 {
972 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1270 if (button_number >= 3)
975 button_number += (64 - 3); 1271 button_number += (64 - 3);
976 } 1272 }
977 1273
978 if (PrivateModes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
979 { 1275 {
980 /* 1276 /*
981 * do not report ButtonRelease 1277 * do not report ButtonRelease
982 * no state info allowed 1278 * no state info allowed
983 */ 1279 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1294 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1295 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1296#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1297 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1298#endif
1003
1004 } 1299 }
1005 1300
1006#ifdef DEBUG_MOUSEREPORT 1301#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1302 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1303 if (key_state & 16)
1009 fputc ('C', stderr); 1304 fputc ('C', stderr);
1010 if (key_state & 4) 1305 if (key_state & 4)
1011 fputc ('S', stderr); 1306 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1310 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1312 button_number,
1018 x + 1, 1313 x + 1,
1019 y + 1); 1314 y + 1);
1020#else 1315#endif
1316
1021 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1023 (32 + x + 1), 1319 (32 + x + 1),
1024 (32 + y + 1)); 1320 (32 + y + 1));
1025#endif
1026} 1321}
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 1322
1038/*{{{ process an X event */ 1323/*{{{ process an X event */
1039void 1324void
1040rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1041{ 1326{
1042 SET_R (this); 1327 make_current ();
1043 SET_LOCALE (locale);
1044 1328
1045#if defined(CURSOR_BLINK) 1329 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 1330
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1331 if (ev.xany.window == vt
1055 } 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1056#endif 1333 && 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; 1334 return;
1075#endif
1076 1335
1336 // for XQueryPointer
1077 Window unused_root, unused_child; 1337 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1338 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1339 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 1340
1130 switch (ev.type) 1341 switch (ev.type)
1131 { 1342 {
1132 case KeyPress: 1343 case KeyPress:
1133 lookup_key (ev.xkey); 1344 key_press (ev.xkey);
1134 break; 1345 break;
1135 1346
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease: 1347 case KeyRelease:
1138 { 1348 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; 1349 break;
1150 }
1151#endif
1152 1350
1153 case ButtonPress: 1351 case ButtonPress:
1154 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1155 break; 1353 break;
1156 1354
… …
1158 button_release (ev.xbutton); 1356 button_release (ev.xbutton);
1159 break; 1357 break;
1160 1358
1161 case ClientMessage: 1359 case ClientMessage:
1162 if (ev.xclient.format == 32 1360 if (ev.xclient.format == 32
1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1361 && !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 { 1362 {
1172 /* Get Dnd data */ 1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1173 Atom ActualType; 1364 {
1174 int ActualFormat; 1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1175 unsigned char *data; 1366 {
1176 unsigned long Size, RemainingBytes; 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1177 1368 {
1178 XGetWindowProperty (display->display, display->root, 1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1179 xa[XA_DNDSELECTION], 1370 destroy ();
1180 0L, 1000000L, 1371 }
1181 False, AnyPropertyType, 1372#if ENABLE_EWMH
1182 &ActualType, &ActualFormat, 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1183 &Size, &RemainingBytes, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1184 &data); 1376 &ev);
1185 XChangeProperty (display->display, display->root, 1377#endif
1186 XA_CUT_BUFFER0, XA_STRING, 1378 }
1187 8, PropModeReplace, 1379 }
1188 data, STRLEN (data)); 1380#if ENABLE_XEMBED
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1382 {
1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1388#endif
1191 } 1389 }
1192#endif /* OFFIX_DND */
1193 break;
1194
1195 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping));
1197 break; 1390 break;
1198 1391
1199 /* 1392 /*
1200 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1220 break; 1413 break;
1221 } 1414 }
1222 break; 1415 break;
1223 1416
1224 case FocusIn: 1417 case FocusIn:
1225 if (!TermWin.focus) 1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1421 focus_in ();
1422 break;
1423
1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1435 if (ev.xconfigure.window == parent[0])
1226 { 1436 {
1227 TermWin.focus = 1; 1437 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 } 1438 ;
1239 break;
1240 1439
1241 case FocusOut: 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1242 if (TermWin.focus)
1243 { 1441 {
1244 TermWin.focus = 0; 1442 seen_resize = 1;
1245 want_refresh = 1; 1443 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 } 1444 }
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 1445 else
1279 { 1446 {
1280 D_SIZE ((stderr, "Size: Not resizing")); 1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1281 } 1451 }
1282#endif 1452 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 } 1453 }
1293 break; 1454 break;
1294 1455
1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break;
1463
1295 case SelectionClear: 1464 case SelectionClear:
1296 display->set_selection_owner (0); 1465 selection_clear ();
1297 break; 1466 break;
1298 1467
1299 case SelectionNotify: 1468 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1469 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1471 break;
1304 1472
1305 case SelectionRequest: 1473 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1307 break; 1475 break;
1308 1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start ();
1481#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break;
1484
1309 case UnmapNotify: 1485 case UnmapNotify:
1310 TermWin.mapped = 0; 1486 mapped = 0;
1311#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1313#endif 1489#endif
1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1314 break; 1491 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 1492
1329 case GraphicsExpose: 1493 case GraphicsExpose:
1330 case Expose: 1494 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1495 if (ev.xany.window == vt)
1332 { 1496 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1497 do
1498 {
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1501 }
1337 // don't understand this, so commented it out 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1510 }
1341 // ev.xexpose.width, TermWin.height, False);
1342#endif
1343 want_refresh = 1; 1511 want_refresh = 1;
1344 } 1512 }
1345 else 1513 else
1346 { 1514 {
1347 XEvent unused_event; 1515 XEvent unused_event;
1348 1516
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1350 Expose, 1518 ;
1351 &unused_event)) ; 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 ;
1353 GraphicsExpose, 1521
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1356 { 1523 {
1357 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1358 scrollbar_show (0); 1525 scrollbar_show (0);
1359 } 1526 }
1360#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose ();
1363#endif
1364 } 1527 }
1365 break; 1528 break;
1366 1529
1367 case MotionNotify: 1530 case MotionNotify:
1368#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1369 if (hidden_pointer) 1532 if (hidden_pointer)
1370 pointer_unblank (); 1533 pointer_unblank ();
1371#endif 1534#endif
1372#if MENUBAR 1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1373 if (isMenuBarWindow (ev.xany.window)) 1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1539 break;
1540
1541 if (ev.xany.window == vt)
1374 { 1542 {
1375 menubar_control (ev.xbutton); 1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1376 break; 1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1377 } 1545 ; // 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))) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1547 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1387 ; 1549 ;
1388 1550
1389 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (dpy, vt,
1390 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1555 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1559 {
1398#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1401#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1575 {
1405 int dist; 1576 int dist;
1406
1407 pending_scroll_selection=1;
1408 1577
1409 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1411 */ 1580 */
1412 if (scroll_selection_delay<=0) 1581 if (!sel_scroll_ev.is_active ())
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1414 1583
1415 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1417 */ 1586 */
1418 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1590
1423 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1425 { 1593 {
1426 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1428 } 1596 }
1429 else 1597 else
1430 { 1598 {
1431 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1600 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1601 }
1602
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1437 MIN_IT (scroll_selection_lines, 1606 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1439 } 1608 }
1440 else 1609 else
1441 { 1610 {
1442 /* we are within the text window, so we 1611 /* we are within the text window, so we
1443 * shouldn't be scrolling 1612 * shouldn't be scrolling
1444 */ 1613 */
1445 pending_scroll_selection = 0; 1614 sel_scroll_ev.stop();
1446 } 1615 }
1447#endif 1616#endif
1448#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1449
1450 } 1618 }
1451#endif 1619#endif
1452
1453 } 1620 }
1454 } 1621 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1623 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1458 MotionNotify, &ev)) ; 1625 MotionNotify, &ev))
1626 ;
1627
1459 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (dpy, scrollBar.win,
1460 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1631 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1632 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1634 scrollbar_size ());
1466 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1635 want_refresh = 1;
1468 scrollbar_show (1); 1636 scrollbar_show (1);
1469 } 1637 }
1470 break; 1638 break;
1471 } 1639 }
1472}
1473 1640
1641#if defined(CURSOR_BLINK)
1642 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1643 {
1644 if (hidden_cursor)
1645 {
1646 hidden_cursor = 0;
1647 want_refresh = 1;
1648 }
1649
1650 cursor_blink_ev.again ();
1651 }
1652#endif
1653
1654#if defined(POINTER_BLANK)
1655 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1656 {
1657 if (ev.type == MotionNotify
1658 || ev.type == ButtonPress
1659 || ev.type == ButtonRelease)
1660 if (hidden_pointer)
1661 pointer_unblank ();
1662
1663 if (ev.type == KeyPress && hidden_pointer == 0)
1664 pointer_blank ();
1665 }
1666#endif
1667}
1668
1669void
1670rxvt_term::focus_in ()
1671{
1672 if (!focus)
1673 {
1674 focus = 1;
1675 want_refresh = 1;
1676
1677 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1678
1679#if USE_XIM
1680 if (Input_Context != NULL)
1681 {
1682 IMSetPosition ();
1683 XSetICFocus (Input_Context);
1684 }
1685#endif
1686#if CURSOR_BLINK
1687 if (option (Opt_cursorBlink))
1688 cursor_blink_ev.again ();
1689#endif
1690#if OFF_FOCUS_FADING
1691 if (rs[Rs_fade])
1692 {
1693 pix_colors = pix_colors_focused;
1694 scr_recolour ();
1695 }
1696#endif
1697#if ENABLE_FRILLS
1698 if (option (Opt_urgentOnBell))
1699 {
1700 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1701 {
1702 h->flags &= ~XUrgencyHint;
1703 XSetWMHints (dpy, parent[0], h);
1704 }
1705 }
1706#endif
1707 }
1708}
1709
1710void
1711rxvt_term::focus_out ()
1712{
1713 if (focus)
1714 {
1715 focus = 0;
1716 want_refresh = 1;
1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1723 iso14755buf = 0;
1724# if ISO_14755
1725 scr_overlay_off ();
1726# endif
1727 }
1728#endif
1729#if USE_XIM
1730 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context);
1732#endif
1733#if CURSOR_BLINK
1734 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop ();
1736
1737 hidden_cursor = 0;
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_unfocused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::update_fade_color (unsigned int idx)
1751{
1752#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade])
1754 {
1755 rgba c;
1756 pix_colors [Color_fade].get (c);
1757 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1758 }
1759#endif
1760}
1761
1762#if ENABLE_TRANSPARENCY || ENABLE_PERL
1474void 1763void
1475rxvt_term::rootwin_cb (XEvent &ev) 1764rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1765{
1477 SET_R (this); 1766 make_current ();
1478 SET_LOCALE (locale);
1479 1767
1768 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1769 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1770 return;
1771
1772# if ENABLE_TRANSPARENCY
1480 switch (ev.type) 1773 switch (ev.type)
1481 { 1774 {
1482 case PropertyNotify: 1775 case PropertyNotify:
1776 /*
1777 * if user used some Esetroot compatible prog to set the root bg,
1778 * use the property to determine the pixmap. We use it later on.
1779 */
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1780 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1484 { 1782 {
1485 if (ev.xproperty.state == PropertyNewValue) 1783 bgPixmap.set_root_pixmap ();
1486 selection_property (ev.xproperty.window, ev.xproperty.atom); 1784 update_background ();
1487 break;
1488 } 1785 }
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; 1786 break;
1787 }
1509#endif 1788# endif
1510 }
1511} 1789}
1790#endif
1512 1791
1513void 1792void
1514rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1515{ 1794{
1516 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1517 1796
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1519 if (!bypass_keystate) 1799 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801
1521 /* 1802 /*
1522 * VT window processing of button press 1803 * VT window processing of button press
1523 */ 1804 */
1524 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1525 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1810#if ISO_14755
1811 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 {
1814 iso14755_54 (ev.x, ev.y);
1815 return;
1816 }
1817#endif
1818
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1527 if (reportmode) 1821 if (reportmode)
1528 { 1822 {
1529 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1534 { 1828 {
1535 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1536 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1537 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1538 { 1833 {
1539 /* only report double clicks */ 1834 /* only report double clicks */
1540 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1541 mouse_report (ev); 1836 mouse_report (ev);
… …
1553 mouse_report (ev); 1848 mouse_report (ev);
1554 } 1849 }
1555#else 1850#else
1556 MEvent.button = ev.button; 1851 MEvent.button = ev.button;
1557 mouse_report (ev); 1852 mouse_report (ev);
1558#endif /* MOUSE_REPORT_DOUBLECLICK */ 1853#endif /* MOUSE_REPORT_DOUBLECLICK */
1559 1854
1560 } 1855 }
1561 else 1856 else
1562 { 1857 {
1563 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1860
1565 switch (ev.button) 1861 switch (ev.button)
1566 { 1862 {
1567 case Button1: 1863 case Button1:
1864 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */
1866#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask);
1868#else
1869 selection.rect = false;
1870#endif
1871
1568 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1570 { 1874 {
1571 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1573 else 1877 else
1574 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1893 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1592 else 1896 else
1593 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1898
1594 MEvent.button = Button3; 1899 MEvent.button = Button3;
1595 break; 1900 break;
1596 } 1901 }
1597 } 1902 }
1903
1598 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1599 return; 1905 return;
1600 } 1906 }
1601 1907
1602 /* 1908 /*
… …
1646 tt_printf ("\033[5~"); 1952 tt_printf ("\033[5~");
1647 break; 1953 break;
1648 } 1954 }
1649 } 1955 }
1650 else 1956 else
1651#endif /* NO_SCROLLBAR_REPORT */ 1957#endif /* NO_SCROLLBAR_REPORT */
1652 1958
1653 { 1959 {
1654 char upordown = 0; 1960 char upordown = 0;
1655 1961
1656 if (scrollBar.style == R_SB_NEXT) 1962 if (scrollBar.style == R_SB_NEXT)
1657 { 1963 {
1658 if (scrollbarnext_upButton (ev.y)) 1964 if (scrollbarnext_upButton (ev.y))
1659 upordown = -1; /* up */ 1965 upordown = -1; /* up */
… …
1665 if (scrollbarrxvt_upButton (ev.y)) 1971 if (scrollbarrxvt_upButton (ev.y))
1666 upordown = -1; /* up */ 1972 upordown = -1; /* up */
1667 else if (scrollbarrxvt_dnButton (ev.y)) 1973 else if (scrollbarrxvt_dnButton (ev.y))
1668 upordown = 1; /* down */ 1974 upordown = 1; /* down */
1669 } 1975 }
1976
1670 if (upordown) 1977 if (upordown)
1671 { 1978 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1980 if (!cont_scroll_ev.is_active ())
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 sel_scroll_ev.stop();
1771#endif 2072#endif
2073
1772 if (ev.window == TermWin.vt) 2074 if (ev.window == vt)
1773 { 2075 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2077 return;
2078
2079#if ISO_14755
2080 // 5.4
2081 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2082 return;
2083#endif
2084
1774 if (reportmode) 2085 if (reportmode)
1775 { 2086 {
1776 /* mouse report from vt window */ 2087 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2088 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2089 if (ev.button >= 4)
… …
1789 mouse_report (ev); 2100 mouse_report (ev);
1790 } 2101 }
1791#else /* MOUSE_REPORT_DOUBLECLICK */ 2102#else /* MOUSE_REPORT_DOUBLECLICK */
1792 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
1793 mouse_report (ev); 2104 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2106 return;
1796 } 2107 }
2108
1797 /* 2109 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2111 * when overriding mouse reporting
1800 */ 2112 */
1801 if (PrivateModes & PrivMode_mouse_report 2113 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2114 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2115 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2116 selection_extend (ev.x, ev.y, 0);
1805 2117
1806 switch (ev.button) 2118 switch (ev.button)
1807 { 2119 {
1808 case Button1: 2120 case Button1:
1809 case Button3: 2121 case Button3:
1810 selection_make (ev.time); 2122 selection_make (ev.time);
1811 break; 2123 break;
2124
1812 case Button2: 2125 case Button2:
1813 selection_request (ev.time, ev.x, ev.y); 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1814 break; 2128 break;
2129
1815#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
1816 case Button4: 2131 case Button4:
1817 case Button5: 2132 case Button5:
1818 { 2133 {
1819 int i; 2134 int i;
1820 page_dirn v; 2135 page_dirn v;
1821 2136
1822 v = (ev.button == Button4) ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2138
1823 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
1824 i = 1; 2140 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2141 else if (option (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2142 i = nrow - 1;
1827 else 2143 else
1828 i = 5; 2144 i = 5;
2145
1829# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
1831 { 2148 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2149 mouse_slip_wheel_speed += v ? -1 : 1;
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2152
2153 if (!slip_wheel_ev.is_active ())
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_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 unicode_t nlcr[] = { L'\n', L'\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 <= '?')
2756 {
2449 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
2450 priv = ch; 2758 priv = ch;
2451 ch = cmd_getc (); 2759 ch = cmd_getc ();
2452 } 2760 }
2761
2453 /* read any numerical arguments */ 2762 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 2763 for (n = -1; ch < CSI_ICH; )
2455 { 2764 {
2456 if (isdigit (ch)) 2765 if (isdigit (ch))
2457 { 2766 {
… …
2464 { 2773 {
2465 if (nargs < ESC_ARGS) 2774 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 2775 arg[nargs++] = n;
2467 n = -1; 2776 n = -1;
2468 } 2777 }
2469 else if (ch == '\b') 2778 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); 2779 process_nonprinting (ch);
2481 } 2780
2482 ch = cmd_getc (); 2781 ch = cmd_getc ();
2483 } 2782 }
2484 2783
2485 if (ch > CSI_7F) 2784 if (ch > CSI_7F)
2486 return; 2785 return;
… …
2492 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
2493 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
2494 if (arg[p] == -1) 2793 if (arg[p] == -1)
2495 arg[p] = ndef; 2794 arg[p] = ndef;
2496 2795
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 /* 2796 /*
2505 * private mode handling 2797 * private mode handling
2506 */ 2798 */
2507 if (priv) 2799 if (priv)
2508 { 2800 {
2509 switch (priv) 2801 switch (priv)
2510 { 2802 {
2511 case '>': 2803 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
2514 break; 2815 break;
2515 case '?': 2816 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 2819 break;
… …
2623 2924
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2925 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 2926 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 2927 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2928 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2929 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 2930 break;
2630 2931
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2932 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 2933 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 2934 break;
2635 2935
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2936 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 2937 process_sgr_mode (nargs, arg);
2638 break; 2938 break;
… …
2644 tt_printf ("\033[0n"); 2944 tt_printf ("\033[0n");
2645 break; 2945 break;
2646 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
2647 scr_report_position (); 2947 scr_report_position ();
2648 break; 2948 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
2950 if (option (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 2952 break;
2653#endif
2654 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 2955 break;
2657 } 2956 }
2658 break; 2957 break;
2659 2958
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2959 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 2992 break;
2694 2993
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 2994 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 2995 if (arg[0] == 4)
2697 scr_insert_mode (0); 2996 scr_insert_mode (0);
2997 else if (arg[0] == 20)
2998 priv_modes &= ~PrivMode_LFNL;
2698 break; 2999 break;
2699 3000
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3001 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3002 if (arg[0] == 4)
2702 scr_insert_mode (1); 3003 scr_insert_mode (1);
3004 else if (arg[0] == 20)
3005 priv_modes |= PrivMode_LFNL;
2703 break; 3006 break;
2704 3007
2705 /* 3008 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3009 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3010 */
… …
2719 break; 3022 break;
2720 case CSI_75: 3023 case CSI_75:
2721 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
2722 break; 3025 break;
2723 3026
2724#ifndef NO_FRILLS 3027#if !ENABLE_MINIMAL
2725 case CSI_74: 3028 case CSI_74:
2726 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
2727 break; 3030 break;
2728#endif 3031#endif
2729 3032
2730 case CSI_78: /* DECREQTPARM */ 3033 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3034 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3035 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3036 break;
2734 3037
2735 default: 3038 default:
2736 break; 3039 break;
2737 } 3040 }
2738} 3041}
2739/*}}} */ 3042/*}}} */
2740 3043
2741#ifndef NO_FRILLS 3044#if !ENABLE_MINIMAL
2742/* ARGSUSED */ 3045/* ARGSUSED */
2743void 3046void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3048{
2746 int x, y; 3049 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
2751 Window wdummy; 3051 Window wdummy;
3052
3053 dLocal (Display *, dpy);
2752 3054
2753 if (nargs == 0) 3055 if (nargs == 0)
2754 return; 3056 return;
3057
2755 switch (args[0]) 3058 switch (args[0])
2756 { 3059 {
2757 /* 3060 /*
2758 * commands 3061 * commands
2759 */ 3062 */
2760 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3064 XMapWindow (dpy, parent[0]);
2762 break; 3065 break;
2763 case 2: /* iconify window */ 3066 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3067 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3068 break;
2767 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3071 break;
2770 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3074 break;
2773 case 5: /* raise window */ 3075 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
2775 break; 3077 break;
2776 case 6: /* lower window */ 3078 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3079 XLowerWindow (dpy, parent[0]);
2778 break; 3080 break;
2779 case 7: /* refresh window */ 3081 case 7: /* refresh window */
2780 scr_touch (true); 3082 scr_touch (true);
2781 break; 3083 break;
2782 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3085 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3086 (unsigned int) (args[1] * fheight));
2785 break; 3087 break;
3088
3089 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3090 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3092 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3093 (unsigned int) (args[1] * fheight));
2790 break; 3094 break;
3095
2791 /* 3096 /*
2792 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
2793 */ 3098 */
2794 case 11: /* report window state */ 3099 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3102 break;
2798 case 13: /* report window position */ 3103 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3109 break;
2805 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3113 break;
3114 case 18: /* report text area size (chars) */
3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3116 break;
2809 case 18: /* report window size (chars) */ 3117 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3119 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3121 {
3122 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3125 XFree (s);
3126 }
2816 break; 3127 break;
2817 case 21: /* report window title */ 3128 case 21: /* report window title */
3129 {
3130 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3133 XFree (s);
3134 }
2820 break; 3135 break;
2821#endif
2822
2823 } 3136 }
2824} 3137}
2825#endif 3138#endif
2826 3139
2827/*----------------------------------------------------------------------*/ 3140/*----------------------------------------------------------------------*/
2828/* 3141/*
2829 * get input up until STRING TERMINATOR (or BEL) 3142 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3143 * ends_how is terminator used. returned input must be free()'d
2831 */ 3144 */
2832unsigned char * 3145char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3146rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3147{
2835 int seen_esc = 0; /* seen escape? */ 3148 unicode_t ch;
3149 bool seen_esc = false;
2836 unsigned int n = 0; 3150 unsigned int n = 0;
2837 unsigned char *s; 3151 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3152
2840 for (; (ch = cmd_getc ());) 3153 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3154 {
2842 if (ch == C0_BEL 3155 if (seen_esc)
2843 || ch == CHAR_ST 3156 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3157 if (ch == 0x5c) /* 7bit ST */
2845 break; 3158 break;
3159 else
3160 return NULL;
3161 }
2846 if (ch == C0_ESC) 3162 else if (ch == C0_ESC)
2847 { 3163 {
2848 seen_esc = 1; 3164 seen_esc = true;
2849 continue; 3165 continue;
2850 } 3166 }
3167 else if (ch == C0_BEL || ch == CHAR_ST)
3168 break;
2851 else if (ch == '\t') 3169 else if (ch == C0_SYN)
2852 ch = ' '; /* translate '\t' to space */ 3170 ch = cmd_get8 ();
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3171 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
2855 if (n < sizeof (string) - 1) 3173
3174 seen_esc = false;
3175
3176 if (n >= STRING_MAX - 1)
3177 // stop at some sane length
3178 return NULL;
3179
2856 string[n++] = ch; 3180 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3181 }
3182
2859 string[n++] = '\0'; 3183 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3184
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3186
2864 return s; 3187 return rxvt_wcstombs (string);
2865} 3188}
2866 3189
2867/*----------------------------------------------------------------------*/ 3190/*----------------------------------------------------------------------*/
2868/* 3191/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3192 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3193 */
2871void 3194void
2872rxvt_term::process_dcs_seq () 3195rxvt_term::process_dcs_seq ()
2873{ 3196{
2874 unsigned char eh, *s; 3197 char *s;
3198 unicode_t eh;
3199
2875 /* 3200 /*
2876 * Not handled yet 3201 * Not handled yet
2877 */ 3202 */
2878 s = get_to_st (&eh); 3203 s = get_to_st (eh);
2879 if (s) 3204 if (s)
2880 free (s); 3205 free (s);
3206
2881 return; 3207 return;
2882} 3208}
2883 3209
2884/*----------------------------------------------------------------------*/ 3210/*----------------------------------------------------------------------*/
2885/* 3211/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3212 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3213 */
2888void 3214void
2889rxvt_term::process_osc_seq () 3215rxvt_term::process_osc_seq ()
2890{ 3216{
2891 unsigned char ch, eh, *s; 3217 unicode_t ch, eh;
2892 int arg; 3218 int arg;
2893 3219
2894 ch = cmd_getc (); 3220 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3221 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3222 arg = arg * 10 + (ch - '0');
2897 3223
2898 if (ch == ';') 3224 if (ch == ';')
2899 { 3225 {
2900 s = get_to_st (&eh); 3226 char *s = get_to_st (eh);
3227
2901 if (s) 3228 if (s)
2902 { 3229 {
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); 3230 process_xterm_seq (arg, s, eh);
2915 free (s); 3231 free (s);
2916 } 3232 }
2917 } 3233 }
2918} 3234}
3235
3236void
3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3238{
3239 if (str[0] == '?' && !str[1])
3240 {
3241 rgba c;
3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3250 }
3251 else
3252 set_window_color (color, str);
3253}
3254
2919/* 3255/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3256 * 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 */ 3257 */
2942void 3258void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3259rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2944{ 3260{
2945 int changed = 0; 3261 int color;
2946 int color;
2947 char *buf, *name; 3262 char *buf, *name;
3263 bool query = str[0] == '?' && !str[1];
3264 int saveop = op;
3265
3266 dLocal (Display *, dpy);
2948 3267
2949 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
2950 switch (op) 3273 switch (op)
2951 { 3274 {
2952 case XTerm_name: 3275 case XTerm_name:
2953 set_title (str); 3276 set_title (str);
2954 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
2955 case XTerm_iconName: 3278 case XTerm_iconName:
2956 set_iconName (str); 3279 set_icon_name (str);
2957 break; 3280 break;
2958 case XTerm_title: 3281 case XTerm_title:
2959 set_title (str); 3282 set_title (str);
2960 break; 3283 break;
3284 case XTerm_property:
3285 if (str[0] == '?')
3286 {
3287 Atom prop = display->atom (str + 1);
3288 Atom actual_type;
3289 int actual_format;
3290 unsigned long nitems;
3291 unsigned long bytes_after;
3292 unsigned char *value = 0;
3293 const char *str = "";
3294
3295 if (prop
3296 && XGetWindowProperty (dpy, parent[0],
3297 prop, 0, 1<<16, 0, AnyPropertyType,
3298 &actual_type, &actual_format,
3299 &nitems, &bytes_after, &value) == Success
3300 && actual_type != None
3301 && actual_format == 8)
3302 str = (const char *)(value);
3303
3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3305
3306 XFree (value);
3307 }
3308 else
3309 {
3310 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3311
3312 if (eq)
3313 {
3314 *eq = 0;
3315 set_utf8_property (display->atom (str), eq + 1);
3316 }
3317 else
3318 XDeleteProperty (dpy, parent[0],
3319 display->atom (str));
3320 }
3321 break;
3322
2961 case XTerm_Color: 3323 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3324 for (buf = (char *)str; buf && *buf;)
2963 { 3325 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3326 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3327 break;
3328
2966 *name++ = '\0'; 3329 *name++ = '\0';
2967 color = atoi (buf); 3330 color = atoi (buf) + minCOLOR;
2968 if (color < 0 || color >= TOTAL_COLORS) 3331
3332 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2969 break; 3333 break;
3334
2970 if ((buf = STRCHR (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3336 *buf++ = '\0';
2972 set_window_color (color + minCOLOR, name); 3337
3338 process_color_seq (op, color, name, resp);
2973 } 3339 }
3340 break;
3341 case XTerm_Color00:
3342 process_color_seq (op, Color_fg, str, resp);
3343 break;
3344 case XTerm_Color01:
3345 process_color_seq (op, Color_bg, str, resp);
2974 break; 3346 break;
2975#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3349 process_color_seq (op, Color_cursor, str, resp);
2978 break; 3350 break;
2979#endif 3351#endif
2980 case XTerm_Color_pointer: 3352 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3354 break;
3355 case XTerm_Color_pointer_bg:
3356 process_color_seq (op, Color_pointer_bg, str, resp);
2982 break; 3357 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#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: 3359 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3360 process_color_seq (op, Color_RV, str, resp);
2992 break; 3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp);
3365 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp);
3369 break;
3370 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp);
3372 break;
2993#endif 3373#endif
2994 3374#if ENABLE_TRANSPARENCY
2995 case XTerm_Menu: 3375 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp);
2996 /* 3377 {
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3378 bool changed = false;
2998 * so DON'T do it here 3379 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
2999 */ 3385 }
3386
3000 break; 3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3001 case XTerm_Pixmap: 3391 case Rxvt_Pixmap:
3002 if (*str != ';') 3392 if (!strcmp (str, "?"))
3003 { 3393 {
3004#if XPM_BACKGROUND 3394 char str[256];
3005 scale_pixmap (""); /* reset to default scaling */ 3395
3006 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3007#endif 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3008 scr_touch (true); 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3009 } 3400 }
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 3401 else
3043 { 3402 {
3403 int changed = 0;
3404
3405 if (*str != ';')
3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3044 set_locale (str); 3415 while (str)
3045# ifdef USE_XIM 3416 {
3046 im_cb (); 3417 str++;
3047# endif 3418 if (bgPixmap.set_geometry (str))
3419 changed++;
3420 str = strchr (str, ';');
3421 }
3422 if (changed)
3423 update_background ();
3048 } 3424 }
3049 break; 3425 break;
3426#endif
3427
3428 case Rxvt_restoreFG:
3429 set_window_color (Color_fg, str);
3430 break;
3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434
3050 case XTerm_findfont: 3435 case XTerm_logfile:
3051 { 3436 // 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; 3437 break;
3056#endif 3438
3057#if 0 3439#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3440 case Rxvt_dumpscreen: /* no error notices */
3059 { 3441 {
3060 int fd; 3442 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3443 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3444 {
3063 scr_dump (fd); 3445 scr_dump (fd);
3064 close (fd); 3446 close (fd);
3065 } 3447 }
3066 } 3448 }
3067 break; 3449 break;
3068#endif 3450#endif
3451 case XTerm_font:
3452 op = URxvt_font;
3453 case URxvt_font:
3454#if ENABLE_STYLES
3455 case URxvt_boldFont:
3456 case URxvt_italicFont:
3457 case URxvt_boldItalicFont:
3458#endif
3459 if (query)
3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3462 ? fontset[op - URxvt_font]->fontdesc : "",
3463 resp);
3464 else
3465 {
3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
3069 3467
3468 res = strdup (str);
3469 allocated.push_back ((void *)res);
3470 set_fonts ();
3471 }
3472 break;
3473
3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3483 case URxvt_locale:
3484 if (query)
3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3486 else
3487 {
3488 set_locale (str);
3489 pty->set_utf8_mode (enc_utf8);
3490 init_xlocale ();
3491 }
3492 break;
3493
3494 case URxvt_view_up:
3495 case URxvt_view_down:
3496 {
3497 int lines = atoi (str);
3498
3499 if (lines)
3500 scr_page (op == URxvt_view_up ? UP : DN, lines);
3501 else
3502 scr_erase_savelines ();
3503 }
3504
3505 break;
3506#endif
3507
3508#if ENABLE_PERL
3509 case URxvt_perl:
3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3511 ; // no responses yet
3512 break;
3513#endif
3070 } 3514 }
3071} 3515}
3072/*----------------------------------------------------------------------*/ 3516/*----------------------------------------------------------------------*/
3073 3517
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3518/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3526 * so no need for fancy checking
3083 */ 3527 */
3084int 3528int
3085rxvt_term::privcases (int mode, unsigned long bit) 3529rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3530{
3087 int state; 3531 int state;
3088 3532
3089 if (mode == 's') 3533 if (mode == 's')
3090 { 3534 {
3091 SavedModes |= (PrivateModes & bit); 3535 SavedModes |= (priv_modes & bit);
3092 return -1; 3536 return -1;
3093 } 3537 }
3094 else 3538 else
3095 { 3539 {
3096 if (mode == 'r') 3540 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3541 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3542 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3543 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3544 PrivMode (state, bit);
3101 } 3545 }
3546
3102 return state; 3547 return state;
3103} 3548}
3104 3549
3105/* we're not using priv _yet_ */ 3550/* we're not using priv _yet_ */
3106void 3551void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3108{ 3553{
3109 unsigned int i, j; 3554 unsigned int i, j;
3110 int state; 3555 int state;
3556
3111 static const struct 3557 static const struct
3112 { 3558 {
3113 const int argval; 3559 const int argval;
3114 const unsigned long bit; 3560 const unsigned long bit;
3115 }
3116 argtopriv[] = { 3561 } argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3567 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3568 { 7, PrivMode_Autowrap },
3569 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3570 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3571 // 18, 19 printing-related
3126 { menuBar_esc, PrivMode_menuBar }, 3572 { 25, PrivMode_VisibleCursor },
3127#endif
3128#ifdef scrollBar_esc 3573#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3574 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3575#endif
3131 // 18, 19 printing-related
3132 { 25, PrivMode_VisibleCursor },
3133 // 30 show scrollbar rxvt. extension
3134 { 35, PrivMode_ShiftKeys }, // rxvt extension 3576 { 35, PrivMode_ShiftKeys }, // rxvt extension
3135 { 40, PrivMode_132OK }, 3577 { 40, PrivMode_132OK },
3136 // 41 xterm more fixes NYI 3578 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI 3579 // 45 margin bell NYI
3138 // 46 start logging 3580 // 46 start logging
… …
3140 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3141#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3142 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3143#endif 3585#endif
3144 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3145 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3146 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3147 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3148 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3149 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3150 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen }, 3594 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor 3595 // 1048 save and restore cursor
3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 }; 3598 };
3158 3599
3159 if (nargs == 0) 3600 if (nargs == 0)
3160 return; 3601 return;
… …
3178 } 3619 }
3179 3620
3180 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
3181 switch (arg[i]) 3622 switch (arg[i])
3182 { 3623 {
3624#if ENABLE_STYLES
3625 case 1021:
3626 set_option (Opt_intensityStyles, mode);
3627
3628 scr_touch (true);
3629 break;
3630#endif
3183 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
3184 case 1049: 3632 case 1049:
3633 if (option (Opt_secondaryScreen))
3185 if (mode == 0) 3634 if (mode == 0)
3186 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
3187 else if (mode == 1) 3636 else if (mode == 1)
3188 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
3189 /* FALLTHROUGH */ 3638 break;
3190 } 3639 }
3191 3640
3192 if (state >= 0) 3641 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */ 3642 /* extra handling for values with valid 0 or 1 state */
3194 switch (arg[i]) 3643 switch (arg[i])
… …
3200 * within VT52 mode 3649 * within VT52 mode
3201 */ 3650 */
3202 PrivMode (1, PrivMode_vt52); 3651 PrivMode (1, PrivMode_vt52);
3203 break; 3652 break;
3204 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
3205 if (PrivateModes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
3207 break; 3656 break;
3208 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
3209 if (state) 3658 set_option (Opt_jumpScroll, !state);
3210 Options &= ~Opt_jumpScroll;
3211 else
3212 Options |= Opt_jumpScroll;
3213 break; 3659 break;
3214 case 5: /* reverse video */ 3660 case 5: /* reverse video */
3215 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
3216 break; 3662 break;
3217 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
3218 scr_relative_origin (state); 3664 scr_relative_origin (state);
3219 break; 3665 break;
3220 case 7: /* autowrap */ 3666 case 7: /* autowrap */
3221 scr_autowrap (state); 3667 scr_autowrap (state);
3222 break; 3668 break;
3223 /* 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 */
3224 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11); 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3227 break; 3673 break;
3228#ifdef menuBar_esc
3229 case menuBar_esc:
3230#ifdef MENUBAR
3231 map_menuBar (state);
3232#endif
3233 break;
3234#endif
3235#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3236 case scrollBar_esc: 3675 case scrollBar_esc:
3237 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
3238 { 3677 {
3239 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
3242 break; 3681 break;
3243#endif 3682#endif
3244 case 25: /* visible/invisible cursor */ 3683 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state); 3684 scr_cursor_visible (state);
3246 break; 3685 break;
3247 /* case 35: - shift keys */ 3686 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */ 3687 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */ 3688 case 47: /* secondary screen */
3250 scr_change_screen (state); 3689 scr_change_screen (state);
3251 break; 3690 break;
3252 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
3253 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10); 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3257 break; 3696 break;
3258#if 0
3259 case 1001: 3697 case 1002:
3260 break; /* X11 mouse highlighting */ 3698 case 1003:
3261#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
3262 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
3263 if (state)
3264 Options &= ~Opt_scrollTtyOutput;
3265 else
3266 Options |= Opt_scrollTtyOutput; 3710 set_option (Opt_scrollTtyOutput, !state);
3267 break; 3711 break;
3268 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
3269 if (state)
3270 Options |= Opt_scrollTtyKeypress; 3713 set_option (Opt_scrollTtyKeypress, state);
3271 else
3272 Options &= ~Opt_scrollTtyKeypress;
3273 break; 3714 break;
3274 case 1047: /* secondary screen w/ clearing */ 3715 case 1047: /* secondary screen w/ clearing last */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3716 if (option (Opt_secondaryScreen))
3276 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
3277 scr_erase_screen (2); 3718 scr_erase_screen (2);
3278 scr_change_screen (state); 3719 scr_change_screen (state);
3279 /* FALLTHROUGH */ 3720 break;
3721 case 1049: /* secondary screen w/ clearing first */
3722 scr_change_screen (state);
3723 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY)
3725 scr_erase_screen (2);
3726 break;
3280 default: 3727 default:
3281 break; 3728 break;
3282 } 3729 }
3283 } 3730 }
3284} 3731}
… …
3286 3733
3287/*{{{ process sgr sequences */ 3734/*{{{ process sgr sequences */
3288void 3735void
3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3736rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3290{ 3737{
3291 unsigned int i; 3738 unsigned int i;
3292 short rendset; 3739 short rendset;
3293 int rendstyle; 3740 int rendstyle;
3294 3741
3295 if (nargs == 0) 3742 if (nargs == 0)
3296 { 3743 {
3297 scr_rendition (0, ~RS_None); 3744 scr_rendition (0, ~RS_None);
3298 return; 3745 return;
3299 } 3746 }
3747
3300 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
3301 { 3749 {
3302 rendset = -1; 3750 rendset = -1;
3303 switch (arg[i]) 3751 switch (arg[i])
3304 { 3752 {
… …
3306 rendset = 0, rendstyle = ~RS_None; 3754 rendset = 0, rendstyle = ~RS_None;
3307 break; 3755 break;
3308 case 1: 3756 case 1:
3309 rendset = 1, rendstyle = RS_Bold; 3757 rendset = 1, rendstyle = RS_Bold;
3310 break; 3758 break;
3759 //case 2: // low intensity
3760 case 3:
3761 rendset = 1, rendstyle = RS_Italic;
3762 break;
3311 case 4: 3763 case 4:
3312 rendset = 1, rendstyle = RS_Uline; 3764 rendset = 1, rendstyle = RS_Uline;
3313 break; 3765 break;
3314 case 5: 3766 case 5: // slowly blinking
3767 case 6: // rapidly blinking
3315 rendset = 1, rendstyle = RS_Blink; 3768 rendset = 1, rendstyle = RS_Blink;
3316 break; 3769 break;
3770 //case 6: // scoansi light background
3317 case 7: 3771 case 7:
3318 rendset = 1, rendstyle = RS_RVid; 3772 rendset = 1, rendstyle = RS_RVid;
3319 break; 3773 break;
3320 case 8: 3774 case 8:
3321 // invisible. NYI 3775 // invisible. NYI
3322 break; 3776 break;
3323 case 22: 3777 //case 9: // crossed out
3778 //case 10: // scoansi acs off, primary font
3779 //case 11: // scoansi acs on, first alt font
3780 //case 12: // scoansi acs on, |0x80, second alt font
3781 //...
3782 //case 19: // ninth alt font
3783 //case 20: // gothic
3784 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3324 rendset = 0, rendstyle = RS_Bold; 3785 rendset = 0, rendstyle = RS_Bold;
3786 break;
3787 case 22: // normal intensity
3788 rendset = 0, rendstyle = RS_Bold;
3789 break;
3790 case 23: // disable italic
3791 rendset = 0, rendstyle = RS_Italic;
3325 break; 3792 break;
3326 case 24: 3793 case 24:
3327 rendset = 0, rendstyle = RS_Uline; 3794 rendset = 0, rendstyle = RS_Uline;
3328 break; 3795 break;
3329 case 25: 3796 case 25:
3330 rendset = 0, rendstyle = RS_Blink; 3797 rendset = 0, rendstyle = RS_Blink;
3331 break; 3798 break;
3799 case 26: // variable spacing (iso 8613)
3800 rendset = 0, rendstyle = RS_Blink;
3801 break;
3332 case 27: 3802 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 3803 rendset = 0, rendstyle = RS_RVid;
3334 break; 3804 break;
3335 case 28:
3336 // visible. NYI 3805 //case 28: // visible. NYI
3337 break; 3806 //case 29: // not crossed-out
3338 } 3807 }
3339 3808
3340 if (rendset != -1) 3809 if (rendset != -1)
3341 { 3810 {
3342 scr_rendition (rendset, rendstyle); 3811 scr_rendition (rendset, rendstyle);
… …
3353 case 35: 3822 case 35:
3354 case 36: 3823 case 36:
3355 case 37: 3824 case 37:
3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3825 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3357 break; 3826 break;
3358#ifdef TTY_256COLOR 3827 case 38: // set fg color, ISO 8613-6
3359 case 38:
3360 if (nargs > i + 2 && arg[i + 1] == 5) 3828 if (nargs > i + 2 && arg[i + 1] == 5)
3361 { 3829 {
3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3830 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3363 i += 2; 3831 i += 2;
3364 } 3832 }
3365 break; 3833 break;
3366#endif
3367 case 39: /* default fg */ 3834 case 39: /* default fg */
3368 scr_color (Color_fg, Color_fg); 3835 scr_color (Color_fg, Color_fg);
3369 break; 3836 break;
3370 3837
3371 case 40: 3838 case 40:
… …
3376 case 45: 3843 case 45:
3377 case 46: 3844 case 46:
3378 case 47: 3845 case 47:
3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3846 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3380 break; 3847 break;
3381#ifdef TTY_256COLOR 3848 case 48: // set bg color, ISO 8613-6
3382 case 48:
3383 if (nargs > i + 2 && arg[i + 1] == 5) 3849 if (nargs > i + 2 && arg[i + 1] == 5)
3384 { 3850 {
3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3851 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3386 i += 2; 3852 i += 2;
3387 } 3853 }
3388 break; 3854 break;
3389#endif
3390 case 49: /* default bg */ 3855 case 49: /* default bg */
3391 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
3392 break; 3857 break;
3393 3858
3394#ifndef NO_BRIGHTCOLOR 3859 //case 50: // not variable spacing
3860
3861#if !ENABLE_MINIMAL
3395 case 90: 3862 case 90:
3396 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
3397 case 92: 3864 case 92:
3398 case 93: 3865 case 93:
3399 case 94: 3866 case 94:
3400 case 95: 3867 case 95:
3401 case 96: 3868 case 96:
3402 case 97: 3869 case 97:
3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3870 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3404 Color_fg);
3405 break; 3871 break;
3406 case 100: 3872 case 100:
3407 case 101: /* set bright bg color */ 3873 case 101: /* set bright bg color */
3408 case 102: 3874 case 102:
3409 case 103: 3875 case 103:
3410 case 104: 3876 case 104:
3411 case 105: 3877 case 105:
3412 case 106: 3878 case 106:
3413 case 107: 3879 case 107:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3880 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3415 Color_bg);
3416 break; 3881 break;
3417#endif 3882#endif
3418
3419 } 3883 }
3420 } 3884 }
3421} 3885}
3422/*}}} */ 3886/*}}} */
3423 3887
3424/*{{{ process Rob Nation's own graphics mode sequences */ 3888/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 3889void
3426rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
3427{ 3891{
3428 unsigned char ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
3429 3893
3430 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
3431 { /* query graphics */ 3896 /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
3433 return; 3898 return;
3434 } 3899 }
3435 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
3436 do 3901 do
3437 ch = cmd_getc (); 3902 ch = cmd_getc ();
… …
3447 */ 3912 */
3448void 3913void
3449rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
3450{ 3915{
3451 va_list arg_ptr; 3916 va_list arg_ptr;
3452 unsigned char buf[256]; 3917 char buf[256];
3453 3918
3454 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
3455 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3456 va_end (arg_ptr); 3921 va_end (arg_ptr);
3457 tt_write (buf, STRLEN (buf)); 3922 tt_write (buf, strlen (buf));
3458} 3923}
3459 3924
3460/* ---------------------------------------------------------------------- */ 3925/* ---------------------------------------------------------------------- */
3461/* Write data to the pty as typed by the user, pasted with the mouse, 3926/* Write data to the pty as typed by the user, pasted with the mouse,
3462 * or generated by us in response to a query ESC sequence. 3927 * or generated by us in response to a query ESC sequence.
3463 */ 3928 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930
3464void 3931void
3465rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
3466{ 3933{
3467 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
3468 3936
3469 if (len) 3937 if (pty->pty < 0)
3938 return;
3939
3940 if (v_buflen == 0)
3941 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943
3944 if ((unsigned int)written == len)
3945 return;
3946
3947 data += written;
3948 len -= written;
3470 { 3949 }
3950
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3952
3953 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len;
3955
3956 pty_ev.set (ev::READ | ev::WRITE);
3957}
3958
3959void rxvt_term::pty_write ()
3960{
3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3962
3963 if (written > 0)
3964 {
3965 v_buflen -= written;
3966
3471 if (v_buflen == 0) 3967 if (v_buflen == 0)
3472 { 3968 {
3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3475 if ((unsigned int)written == len)
3476 return;
3477
3478 data += written;
3479 len -= written;
3480 }
3481
3482
3483 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3484
3485 memcpy (v_buffer + v_buflen, data, len);
3486 v_buflen += len;
3487 }
3488
3489 for (;;)
3490 {
3491 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3492
3493 if (written > 0)
3494 {
3495 v_buflen -= written;
3496
3497 if (v_buflen == 0)
3498 {
3499 free (v_buffer); 3969 free (v_buffer);
3500 v_buffer = 0; 3970 v_buffer = 0;
3501 v_buflen = 0;
3502 3971
3503 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
3504 return;
3505 }
3506
3507 memmove (v_buffer, v_buffer + written, v_buflen);
3508 }
3509 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3510 // original code just ignores this...
3511 destroy ();
3512 else
3513 {
3514 pty_ev.set (EVENT_READ | EVENT_WRITE);
3515 return; 3973 return;
3516 } 3974 }
3975
3976 memmove (v_buffer, v_buffer + written, v_buflen);
3517 } 3977 }
3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3979 pty_ev.set (ev::READ);
3518} 3980}
3519 3981
3520/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
3521 3983

Diff Legend

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