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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 2007 UTC

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

Diff Legend

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