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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC

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

Diff Legend

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