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

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

Diff Legend

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