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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.395 by root, Sun Jan 20 13:45:21 2008 UTC

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

Diff Legend

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