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.378 by root, Fri Dec 14 02:27:54 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 + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
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
683void 1046void
684rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
685{ 1048{
686 SET_R (this); 1049 make_current ();
687 SET_LOCALE (locale);
688 1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1059{
1060 make_current ();
1061
1062 refresh_count = 0;
689 flush (); 1063 flush ();
690} 1064}
691 1065
692#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
693void 1067void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
695{ 1069{
696 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1071 want_refresh = 1;
698
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 }
1084 else
1085 w.stop ();
1086}
1087#endif
1088
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1095 want_refresh = 1;
1096 else
1097 w.stop ();
1098}
1099#endif
1100
1101#ifdef SELECTION_SCROLLING
1102void
1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1104{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
712 } 1106 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1;
1109 }
1110 else
1111 w.stop ();
713} 1112}
1113#endif
1114
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{
1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1120 : scr_page (UP, mouse_slip_wheel_speed))
1121 want_refresh = 1;
1122
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1124 {
1125 mouse_slip_wheel_speed = 0;
1126 w.stop ();
1127 }
1128}
1129#endif
1130
1131#if LINUX_YIELD_HACK
1132static struct event_handler
1133{
1134 ev::prepare yield_ev;
1135
1136 void yield_cb (ev::prepare &w, int revents)
1137 {
1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
1147 }
1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
714#endif 1154#endif
715 1155
716bool 1156bool
717rxvt_term::pty_fill () 1157rxvt_term::pty_fill ()
718{ 1158{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1160
1161 if (CBUFSIZ == n)
1162 {
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1164 n = 0;
1165 }
720 1166
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
724 1170
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1172
727 if (n > 0) 1173 if (r > 0)
728 { 1174 {
729 cmdbuf_endp += n; 1175 cmdbuf_endp += r;
730 return true; 1176 return true;
731 } 1177 }
732 else if (n < 0 && errno != EAGAIN) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1179 {
1180#if LINUX_YIELD_HACK
1181 if (display->is_local)
1182 event_handler.yield_ev.start ();
1183#endif
1184 }
1185 else
1186 {
1187 pty_ev.stop ();
1188
1189 if (!option (Opt_hold))
733 destroy (); 1190 destroy ();
734 1191 }
1192
735 return false; 1193 return false;
736} 1194}
737 1195
738void 1196void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
740{ 1198{
741 SET_R (this); 1199 make_current ();
742 SET_LOCALE (locale);
743 1200
744 if (revents & EVENT_WRITE) 1201 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 1202 // 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 ()) 1203 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 ()) 1204 if (cmd_parse ())
761 break; 1205 break;
762 } 1206
763 } 1207 if (revents & ev::WRITE)
1208 pty_write ();
1209}
1210
1211void
1212rxvt_term::pointer_unblank ()
1213{
1214 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor ();
1216
1217#ifdef POINTER_BLANK
1218 hidden_pointer = 0;
1219
1220 if (option (Opt_pointerBlank))
1221 pointer_ev.start (pointerBlankDelay);
1222#endif
764} 1223}
765 1224
766#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
767void 1226void
768rxvt_term::pointer_unblank () 1227rxvt_term::pointer_blank ()
769{ 1228{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1229 if (!option (Opt_pointerBlank))
771 recolour_cursor (); 1230 return;
772 1231
1232 XDefineCursor (dpy, vt, display->blank_cursor);
1233 XFlush (dpy);
1234
773 hidden_pointer = 0; 1235 hidden_pointer = 1;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777} 1236}
778 1237
779void 1238void
780rxvt_term::pointer_blank () 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
781{ 1240{
782 if (! (Options & Opt_pointerBlank)) 1241 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 1242
797 pointer_blank (); 1243 pointer_blank ();
798} 1244}
799#endif 1245#endif
800 1246
801void 1247void
802rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
803{ 1249{
804 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
805 int x, y; 1251 int x, y;
1252 int code = 32;
806 1253
807 x = ev.x; 1254 x = Pixel2Col (ev.x);
808 y = ev.y; 1255 y = Pixel2Row (ev.y);
809 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
810 1264
811 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1266 button_number = 3;
814 }
815 else 1267 else
816 { 1268 {
817 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1271 if (button_number >= 3)
820 button_number += (64 - 3); 1272 button_number += (64 - 3);
821 } 1273 }
822 1274
823 if (PrivateModes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
824 { 1276 {
825 /* 1277 /*
826 * do not report ButtonRelease 1278 * do not report ButtonRelease
827 * no state info allowed 1279 * no state info allowed
828 */ 1280 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1295 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1296 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1297#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1298 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1299#endif
848
849 } 1300 }
850 1301
851#ifdef DEBUG_MOUSEREPORT 1302#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1303 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1304 if (key_state & 16)
854 fputc ('C', stderr); 1305 fputc ('C', stderr);
855 if (key_state & 4) 1306 if (key_state & 4)
856 fputc ('S', stderr); 1307 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1311 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1313 button_number,
863 x + 1, 1314 x + 1,
864 y + 1); 1315 y + 1);
865#else 1316#endif
1317
866 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1319 (code + button_number + key_state),
868 (32 + x + 1), 1320 (32 + x + 1),
869 (32 + y + 1)); 1321 (32 + y + 1));
870#endif
871} 1322}
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 1323
883/*{{{ process an X event */ 1324/*{{{ process an X event */
884void 1325void
885rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
886{ 1327{
887 SET_R (this); 1328 make_current ();
888 SET_LOCALE (locale);
889 1329
890#if defined(CURSOR_BLINK) 1330 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 1331
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1332 if (ev.xany.window == vt
900 } 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1334 && 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; 1335 return;
920#endif
921 1336
1337 // for XQueryPointer
922 Window unused_root, unused_child; 1338 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1339 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1340 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 1341
975 switch (ev.type) 1342 switch (ev.type)
976 { 1343 {
977 case KeyPress: 1344 case KeyPress:
978 lookup_key (ev.xkey); 1345 key_press (ev.xkey);
979 break; 1346 break;
980 1347
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1348 case KeyRelease:
983 { 1349 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; 1350 break;
995 }
996#endif
997 1351
998 case ButtonPress: 1352 case ButtonPress:
999 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1000 break; 1354 break;
1001 1355
… …
1003 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1004 break; 1358 break;
1005 1359
1006 case ClientMessage: 1360 case ClientMessage:
1007 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1362 && !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 { 1363 {
1017 /* Get Dnd data */ 1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1365 {
1019 int ActualFormat; 1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1367 {
1021 unsigned long Size, RemainingBytes; 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1369 {
1023 XGetWindowProperty (display->display, display->root, 1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1371 destroy ();
1025 0L, 1000000L, 1372 }
1026 False, AnyPropertyType, 1373#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1377 &ev);
1030 XChangeProperty (display->display, display->root, 1378#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1379 }
1032 8, PropModeReplace, 1380 }
1033 data, STRLEN (data)); 1381#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1383 {
1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1389#endif
1036 } 1390 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1391 break;
1043 1392
1044 /* 1393 /*
1045 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1065 break; 1414 break;
1066 } 1415 }
1067 break; 1416 break;
1068 1417
1069 case FocusIn: 1418 case FocusIn:
1070 if (!TermWin.focus) 1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1422 focus_in ();
1423 break;
1424
1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1429 focus_out ();
1430 break;
1431
1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0])
1071 { 1437 {
1072 TermWin.focus = 1; 1438 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 } 1439 ;
1084 break;
1085 1440
1086 case FocusOut: 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1087 if (TermWin.focus)
1088 { 1442 {
1089 TermWin.focus = 0; 1443 seen_resize = 1;
1090 want_refresh = 1; 1444 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 } 1445 }
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 1446 else
1124 { 1447 {
1125 D_SIZE ((stderr, "Size: Not resizing")); 1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1451#endif
1126 } 1452 }
1127#endif 1453 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 } 1454 }
1455 break;
1456
1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1138 break; 1463 break;
1139 1464
1140 case SelectionClear: 1465 case SelectionClear:
1141 selection_clear (); 1466 selection_clear ();
1142 break; 1467 break;
1143 1468
1144 case SelectionNotify: 1469 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1472 break;
1149 1473
1150 case SelectionRequest: 1474 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1152 break; 1476 break;
1153 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start ();
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1154 case UnmapNotify: 1486 case UnmapNotify:
1155 TermWin.mapped = 0; 1487 mapped = 0;
1156#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1158#endif 1490#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1159 break; 1492 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 1493
1174 case GraphicsExpose: 1494 case GraphicsExpose:
1175 case Expose: 1495 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1496 if (ev.xany.window == vt)
1177 { 1497 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1498 do
1499 {
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1502 }
1182 // don't understand this, so commented it out 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1511 }
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1512 want_refresh = 1;
1189 } 1513 }
1190 else 1514 else
1191 { 1515 {
1192 XEvent unused_event; 1516 XEvent unused_event;
1193 1517
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1519 ;
1196 &unused_event)) ; 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 ;
1198 GraphicsExpose, 1522
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1201 { 1524 {
1202 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1203 scrollbar_show (0); 1526 scrollbar_show (0);
1204 } 1527 }
1205#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose ();
1208#endif
1209 } 1528 }
1210 break; 1529 break;
1211 1530
1212 case MotionNotify: 1531 case MotionNotify:
1213#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1533 if (hidden_pointer)
1215 pointer_unblank (); 1534 pointer_unblank ();
1216#endif 1535#endif
1217#if MENUBAR 1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1218 if (isMenuBarWindow (ev.xany.window)) 1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1540 break;
1541
1542 if (ev.xany.window == vt)
1219 { 1543 {
1220 menubar_control (ev.xbutton); 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1546 ; // 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))) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1548 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1550 ;
1233 1551
1234 XQueryPointer (display->display, TermWin.vt, 1552 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1555 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1556 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1558 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1559 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1560 {
1243#endif 1561#endif
1562#if ISO_14755
1563 // 5.4
1564 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1565 {
1566 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1567 break;
1568 }
1569#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1570 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1571 ev.xbutton.state & Button3Mask ? 2 : 0);
1572
1246#ifdef SELECTION_SCROLLING 1573#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1574 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1575 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1576 {
1250 int dist; 1577 int dist;
1251
1252 pending_scroll_selection=1;
1253 1578
1254 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1256 */ 1581 */
1257 if (scroll_selection_delay<=0) 1582 if (!sel_scroll_ev.is_active ())
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1259 1584
1260 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1262 */ 1587 */
1263 selection_save_x=ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1589 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1590 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1591
1268 /* calc number of lines to scroll */ 1592 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1593 if (ev.xbutton.y < int_bwidth)
1270 { 1594 {
1271 scroll_selection_dir = UP; 1595 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1596 dist = int_bwidth - ev.xbutton.y;
1273 } 1597 }
1274 else 1598 else
1275 { 1599 {
1276 scroll_selection_dir = DN; 1600 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1601 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1602 }
1603
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1604 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1605 / SELECTION_SCROLL_LINE_SPEEDUP
1606 + 1;
1282 MIN_IT (scroll_selection_lines, 1607 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1608 SELECTION_SCROLL_MAX_LINES);
1284 } 1609 }
1285 else 1610 else
1286 { 1611 {
1287 /* we are within the text window, so we 1612 /* we are within the text window, so we
1288 * shouldn't be scrolling 1613 * shouldn't be scrolling
1289 */ 1614 */
1290 pending_scroll_selection = 0; 1615 sel_scroll_ev.stop();
1291 } 1616 }
1292#endif 1617#endif
1293#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1294
1295 } 1619 }
1296#endif 1620#endif
1297
1298 } 1621 }
1299 } 1622 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1624 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1304 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1633 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1635 scrollbar_size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1636 want_refresh = 1;
1313 scrollbar_show (1); 1637 scrollbar_show (1);
1314 } 1638 }
1315 break; 1639 break;
1316 } 1640 }
1317}
1318 1641
1642#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again ();
1652 }
1653#endif
1654
1655#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 {
1658 if (ev.type == MotionNotify
1659 || ev.type == ButtonPress
1660 || ev.type == ButtonRelease)
1661 if (hidden_pointer)
1662 pointer_unblank ();
1663
1664 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank ();
1666 }
1667#endif
1668}
1669
1670void
1671rxvt_term::focus_in ()
1672{
1673 if (!focus)
1674 {
1675 focus = 1;
1676 want_refresh = 1;
1677
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM
1681 if (Input_Context != NULL)
1682 {
1683 IMSetPosition ();
1684 XSetICFocus (Input_Context);
1685 }
1686#endif
1687#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.again ();
1690#endif
1691#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade])
1693 {
1694 pix_colors = pix_colors_focused;
1695 scr_recolour ();
1696 }
1697#endif
1698#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell))
1700 {
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1708 }
1709}
1710
1711void
1712rxvt_term::focus_out ()
1713{
1714 if (focus)
1715 {
1716 focus = 0;
1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1720
1721#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf)
1723 {
1724 iso14755buf = 0;
1725# if ISO_14755
1726 scr_overlay_off ();
1727# endif
1728 }
1729#endif
1730#if USE_XIM
1731 if (Input_Context != NULL)
1732 XUnsetICFocus (Input_Context);
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.stop ();
1737
1738 hidden_cursor = 0;
1739#endif
1740#if OFF_FOCUS_FADING
1741 if (rs[Rs_fade])
1742 {
1743 pix_colors = pix_colors_unfocused;
1744 scr_recolour ();
1745 }
1746#endif
1747 }
1748}
1749
1750void
1751rxvt_term::update_fade_color (unsigned int idx)
1752{
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 rgba c;
1757 pix_colors [Color_fade].get (c);
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 }
1760#endif
1761}
1762
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL
1319void 1764void
1320rxvt_term::rootwin_cb (XEvent &ev) 1765rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1766{
1322 SET_R (this); 1767 make_current ();
1323 SET_LOCALE (locale);
1324 1768
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return;
1772
1773# if ENABLE_TRANSPARENCY
1325 switch (ev.type) 1774 switch (ev.type)
1326 { 1775 {
1327 case PropertyNotify: 1776 case PropertyNotify:
1777 /*
1778 * if user used some Esetroot compatible prog to set the root bg,
1779 * use the property to determine the pixmap. We use it later on.
1780 */
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1329 { 1783 {
1330 if (ev.xproperty.state == PropertyNewValue) 1784 bgPixmap.set_root_pixmap ();
1331 selection_property (ev.xproperty.window, ev.xproperty.atom); 1785 update_background ();
1332 break;
1333 } 1786 }
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; 1787 break;
1788 }
1354#endif 1789# endif
1355 }
1356} 1790}
1791#endif
1357 1792
1358void 1793void
1359rxvt_term::button_press (XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1360{ 1795{
1361 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1362 1797
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1799
1364 if (!bypass_keystate) 1800 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1366 /* 1803 /*
1367 * VT window processing of button press 1804 * VT window processing of button press
1368 */ 1805 */
1369 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1370 { 1807 {
1808 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1811#if ISO_14755
1812 // 5.4
1813 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1814 {
1815 iso14755_54 (ev.x, ev.y);
1816 return;
1817 }
1818#endif
1819
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1820 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1821
1372 if (reportmode) 1822 if (reportmode)
1373 { 1823 {
1374 /* mouse report from vt window */ 1824 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1825 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1826 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1827#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1828 if (ev.button == MEvent.button && clickintime)
1379 { 1829 {
1380 /* same button, within alloted time */ 1830 /* same button, within alloted time */
1381 MEvent.clicks++; 1831 MEvent.clicks++;
1832
1382 if (MEvent.clicks > 1) 1833 if (MEvent.clicks > 1)
1383 { 1834 {
1384 /* only report double clicks */ 1835 /* only report double clicks */
1385 MEvent.clicks = 2; 1836 MEvent.clicks = 2;
1386 mouse_report (ev); 1837 mouse_report (ev);
… …
1398 mouse_report (ev); 1849 mouse_report (ev);
1399 } 1850 }
1400#else 1851#else
1401 MEvent.button = ev.button; 1852 MEvent.button = ev.button;
1402 mouse_report (ev); 1853 mouse_report (ev);
1403#endif /* MOUSE_REPORT_DOUBLECLICK */ 1854#endif /* MOUSE_REPORT_DOUBLECLICK */
1404 1855
1405 } 1856 }
1406 else 1857 else
1407 { 1858 {
1408 if (ev.button != MEvent.button) 1859 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1860 MEvent.clicks = 0;
1861
1410 switch (ev.button) 1862 switch (ev.button)
1411 { 1863 {
1412 case Button1: 1864 case Button1:
1865 /* allow meta + click to select rectangular areas */
1866 /* should be done in screen.C */
1867#if ENABLE_FRILLS
1868 selection.rect = !!(ev.state & ModMetaMask);
1869#else
1870 selection.rect = false;
1871#endif
1872
1413 /* allow shift+left click to extend selection */ 1873 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1874 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1875 {
1416 if (MEvent.button == Button1 && clickintime) 1876 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1418 else 1878 else
1419 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1894 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1895 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1896 selection_rotate (ev.x, ev.y);
1437 else 1897 else
1438 selection_extend (ev.x, ev.y, 1); 1898 selection_extend (ev.x, ev.y, 1);
1899
1439 MEvent.button = Button3; 1900 MEvent.button = Button3;
1440 break; 1901 break;
1441 } 1902 }
1442 } 1903 }
1904
1443 MEvent.time = ev.time; 1905 MEvent.time = ev.time;
1444 return; 1906 return;
1445 } 1907 }
1446 1908
1447 /* 1909 /*
… …
1491 tt_printf ("\033[5~"); 1953 tt_printf ("\033[5~");
1492 break; 1954 break;
1493 } 1955 }
1494 } 1956 }
1495 else 1957 else
1496#endif /* NO_SCROLLBAR_REPORT */ 1958#endif /* NO_SCROLLBAR_REPORT */
1497 1959
1498 { 1960 {
1499 char upordown = 0; 1961 char upordown = 0;
1500 1962
1501 if (scrollBar.style == R_SB_NEXT) 1963 if (scrollBar.style == R_SB_NEXT)
1502 { 1964 {
1503 if (scrollbarnext_upButton (ev.y)) 1965 if (scrollbarnext_upButton (ev.y))
1504 upordown = -1; /* up */ 1966 upordown = -1; /* up */
… …
1510 if (scrollbarrxvt_upButton (ev.y)) 1972 if (scrollbarrxvt_upButton (ev.y))
1511 upordown = -1; /* up */ 1973 upordown = -1; /* up */
1512 else if (scrollbarrxvt_dnButton (ev.y)) 1974 else if (scrollbarrxvt_dnButton (ev.y))
1513 upordown = 1; /* down */ 1975 upordown = 1; /* down */
1514 } 1976 }
1977
1515 if (upordown) 1978 if (upordown)
1516 { 1979 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1981 if (!cont_scroll_ev.is_active ())
1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1519#endif 1983#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1984 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1985 {
1522 if (upordown < 0) 1986 if (upordown < 0)
1523 scrollBar.setUp (); 1987 scrollBar.setUp ();
… …
1539 break; 2003 break;
1540 case R_SB_ALIGN_BOTTOM: 2004 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2005 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2006 break;
1543 } 2007 }
2008
1544 if (scrollBar.style == R_SB_XTERM 2009 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2010 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2011 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2012 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2013
1549 scrollBar.setMotion (); 2014 scrollBar.setMotion ();
1550 break; 2015 break;
1551 2016
1552 case Button1: 2017 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2018 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2022 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2023 if (scrollBar.style != R_SB_XTERM)
1559 { 2024 {
1560 if (scrollbar_above_slider (ev.y)) 2025 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2027 scr_page (UP, nrow - 1);
1563# else 2028# else
1564 scr_page (UP, TermWin.nrow / 4); 2029 scr_page (UP, nrow / 4);
1565# endif 2030# endif
1566 else if (scrollbar_below_slider (ev.y)) 2031 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2032# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2033 scr_page (DN, nrow - 1);
1569# else 2034# else
1570 scr_page (DN, TermWin.nrow / 4); 2035 scr_page (DN, nrow / 4);
1571# endif 2036# endif
1572 else 2037 else
1573 scrollBar.setMotion (); 2038 scrollBar.setMotion ();
1574 } 2039 }
1575 else 2040 else
1576 { 2041 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2042 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2043 (nrow
1579 * scrollbar_position (ev.y) 2044 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2045 / scrollbar_size ()));
1581 } 2046 }
2047
1582 break; 2048 break;
1583 } 2049 }
1584 } 2050 }
2051
1585 return; 2052 return;
1586 } 2053 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2054}
1595 2055
1596void 2056void
1597rxvt_term::button_release (XButtonEvent &ev) 2057rxvt_term::button_release (XButtonEvent &ev)
1598{ 2058{
1599 int reportmode = 0; 2059 int reportmode = 0;
1600 2060
1601 csrO = 0; /* reset csr Offset */ 2061 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2062 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2063 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2064
1605 if (scrollbar_isUpDn ()) 2065 if (scrollbar_isUpDn ())
1606 { 2066 {
1607 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
1608 scrollbar_show (0); 2068 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2069 }
2070
1614#ifdef SELECTION_SCROLLING 2071#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2072 sel_scroll_ev.stop();
1616#endif 2073#endif
2074
1617 if (ev.window == TermWin.vt) 2075 if (ev.window == vt)
1618 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2080#if ISO_14755
2081 // 5.4
2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2083 return;
2084#endif
2085
1619 if (reportmode) 2086 if (reportmode)
1620 { 2087 {
1621 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1634 mouse_report (ev); 2101 mouse_report (ev);
1635 } 2102 }
1636#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
1637 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1638 mouse_report (ev); 2105 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2107 return;
1641 } 2108 }
2109
1642 /* 2110 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2112 * when overriding mouse reporting
1645 */ 2113 */
1646 if (PrivateModes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2115 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
1650 2118
1651 switch (ev.button) 2119 switch (ev.button)
1652 { 2120 {
1653 case Button1: 2121 case Button1:
1654 case Button3: 2122 case Button3:
1655 selection_make (ev.time); 2123 selection_make (ev.time);
1656 break; 2124 break;
2125
1657 case Button2: 2126 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2129 break;
2130
1660#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
1661 case Button4: 2132 case Button4:
1662 case Button5: 2133 case Button5:
1663 { 2134 {
1664 int i; 2135 int i;
1665 page_dirn v; 2136 page_dirn v;
1666 2137
1667 v = (ev.button == Button4) ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2139
1668 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
1669 i = 1; 2141 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2143 i = nrow - 1;
1672 else 2144 else
1673 i = 5; 2145 i = 5;
2146
1674# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
1676 { 2149 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2150 mouse_slip_wheel_speed += v ? -1 : 1;
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153
2154 if (!slip_wheel_ev.is_active ())
2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2156 }
2157 else
2158 {
2159# endif
2160 scr_page (v, i);
2161 scrollbar_show (1);
2162# ifdef MOUSE_SLIP_WHEELING
1679 } 2163 }
1680# endif 2164# 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 } 2165 }
1695 break; 2166 break;
1696#endif 2167#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 { 2168 }
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 { 2169 }
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} 2170}
1918#endif
1919 2171
1920/*}}} */ 2172/*}}} */
1921 2173
1922bool 2174bool
1923rxvt_term::cmd_parse () 2175rxvt_term::cmd_parse ()
1924{ 2176{
1925 bool flag = false; 2177 bool flag = false;
1926 unicode_t ch = NOCHAR; 2178 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2179 char *seq_begin; // remember start of esc-sequence here
1928 2180
1929 for (;;) 2181 for (;;)
1930 { 2182 {
1931 if (ch == NOCHAR) 2183 if (ch == NOCHAR)
1932 { 2184 {
1933 seq_begin = cmdbuf_ptr; 2185 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2186 ch = next_char ();
1935 }
1936 2187
1937 if (ch == NOCHAR) // TODO: improve 2188 if (ch == NOCHAR)
1938 break; 2189 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2190 }
2191
2192 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2193 {
2194 if (!seen_input)
2195 {
2196 seen_input = 1;
2197 // many badly-written programs (e.g. jed) contain a race condition:
2198 // they first read the screensize and then install a SIGWINCH handler.
2199 // some window managers resize the window early, and these programs
2200 // then sometimes get the size wrong.
2201 // unfortunately other programs are even more buggy and dislike
2202 // being sent SIGWINCH, so only do it when we were in fact being
2203 // resized.
2204 if (seen_resize && cmd_pid)
2205 kill (-cmd_pid, SIGWINCH);
2206 }
2207
1942 /* Read a text string from the input buffer */ 2208 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2209 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2210 bool refreshnow = false;
1945 int nlines = 0; 2211 int nlines = 0;
1946 unicode_t *str = buf; 2212 wchar_t *str = buf;
1947 2213 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2214
1950 for (;;) 2215 for (;;)
1951 { 2216 {
2217 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2218 break;
2219
2220 *str++ = ch;
2221
2222 if (ch == C0_LF || str >= eol)
2223 {
2224 if (ch == C0_LF)
2225 nlines++;
2226
2227 refresh_count++;
2228
2229 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2230 {
2231 refresh_count = 0;
2232
2233 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2234 {
2235 refreshnow = true;
2236 ch = NOCHAR;
2237 break;
2238 }
2239 }
2240
2241 // scr_add_lines only works for nlines <= nrow - 1.
2242 if (nlines >= nrow - 1)
2243 {
2244 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2245 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2246 scr_add_lines (buf, str - buf, nlines);
2247
2248 nlines = 0;
2249 str = buf;
2250 eol = str + min (ncol, UBUFSIZ);
2251 }
2252
2253 if (str >= eol)
2254 {
2255 if (eol >= buf + UBUFSIZ)
2256 {
2257 ch = NOCHAR;
2258 break;
2259 }
2260 else
2261 eol = min (eol + ncol, buf + UBUFSIZ);
2262 }
2263
2264 }
2265
1952 seq_begin = cmdbuf_ptr; 2266 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2267 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 } 2268 }
1989 2269
2270 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2271 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2272 scr_add_lines (buf, str - buf, nlines);
1991 2273
1992 /* 2274 /*
1993 * If there have been a lot of new lines, then update the screen 2275 * 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. 2276 * 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 2277 * 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 */ 2278 */
2001 if (refreshnow) 2279 if (refreshnow)
2002 { 2280 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2281 flag = true;
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type); 2282 scr_refresh ();
2283 want_refresh = 1;
2007 } 2284 }
2008 2285
2009 } 2286 }
2010 else 2287 else
2011 { 2288 {
… …
2026 2303
2027 return flag; 2304 return flag;
2028} 2305}
2029 2306
2030// read the next character 2307// read the next character
2031unicode_t 2308wchar_t
2032rxvt_term::next_char () 2309rxvt_term::next_char () NOTHROW
2033{ 2310{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2311 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2312 {
2036 // assume 7-bit to be ascii ALWAYS 2313 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2314 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2315 return *cmdbuf_ptr++;
2039 2316
2040 wchar_t wc; 2317 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2318 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2319
2043 if (len == (size_t)-2) 2320 if (len == (size_t)-2)
2044 { 2321 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2322 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2323 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2324 break;
2048 } 2325 }
2049 2326
2050 if (len == (size_t)-1) 2327 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2328 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2329
2053 // assume wchar == unicode 2330 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2331 cmdbuf_ptr += len;
2055 return wc; 2332 return wc & UNICODE_MASK;
2056 } 2333 }
2057 2334
2058 return NOCHAR; 2335 return NOCHAR;
2059} 2336}
2337
2338// read the next octet
2339uint32_t
2340rxvt_term::next_octet () NOTHROW
2341{
2342 return cmdbuf_ptr < cmdbuf_endp
2343 ? (unsigned char)*cmdbuf_ptr++
2344 : NOCHAR;
2345}
2346
2347static class out_of_input out_of_input;
2060 2348
2061/* rxvt_cmd_getc () - Return next input character */ 2349/* rxvt_cmd_getc () - Return next input character */
2062/* 2350/*
2063 * Return the next input character after first passing any keyboard input 2351 * Return the next input character after first passing any keyboard input
2064 * to the command. 2352 * to the command.
2065 */ 2353 */
2066unicode_t 2354wchar_t
2067rxvt_term::cmd_getc () 2355rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2356{
2069 unicode_t c = next_char (); 2357 wchar_t c = next_char ();
2358
2359 if (c == NOCHAR)
2360 throw out_of_input;
2361
2362 return c;
2363}
2364
2365uint32_t
2366rxvt_term::cmd_get8 () THROW ((class out_of_input))
2367{
2368 uint32_t c = next_octet ();
2070 2369
2071 if (c == NOCHAR) 2370 if (c == NOCHAR)
2072 throw out_of_input; 2371 throw out_of_input;
2073 2372
2074 return c; 2373 return c;
… …
2138 { 2437 {
2139 if ((buf[len++] = cmd_getc ()) == 'i') 2438 if ((buf[len++] = cmd_getc ()) == 'i')
2140 break; /* done = 1 */ 2439 break; /* done = 1 */
2141 } 2440 }
2142 } 2441 }
2143 2442
2144 for (i = 0; i < len; i++) 2443 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF) 2444 if (putc (buf[i], fd) == EOF)
2146 { 2445 {
2147 done = 1; 2446 done = 1;
2148 break; 2447 break;
… …
2150 } 2449 }
2151 } 2450 }
2152 2451
2153 pclose_printer (fd); 2452 pclose_printer (fd);
2154} 2453}
2155#endif /* PRINTPIPE */ 2454#endif /* PRINTPIPE */
2156/*}}} */ 2455/*}}} */
2157 2456
2158/* *INDENT-OFF* */ 2457/* *INDENT-OFF* */
2159enum { 2458enum {
2160 C1_40 = 0x40, 2459 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2460 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, 2461 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, 2462 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 2463 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2464};
2166/* *INDENT-ON* */ 2465/* *INDENT-ON* */
2167 2466
2168/*{{{ process non-printing single characters */ 2467/*{{{ process non-printing single characters */
2169void 2468void
… …
2174 case C0_ESC: 2473 case C0_ESC:
2175 process_escape_seq (); 2474 process_escape_seq ();
2176 break; 2475 break;
2177 case C0_ENQ: /* terminal Status */ 2476 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2477 if (rs[Rs_answerbackstring])
2179 tt_write ( 2478 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 2479 else
2183 tt_write ((unsigned char *)VT100_ANS, 2480 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2481 break;
2186 case C0_BEL: /* bell */ 2482 case C0_BEL: /* bell */
2187 scr_bell (); 2483 scr_bell ();
2188 break; 2484 break;
2189 case C0_BS: /* backspace */ 2485 case C0_BS: /* backspace */
… …
2205 break; 2501 break;
2206 case C0_SI: /* shift in - acs */ 2502 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2503 scr_charset_choose (0);
2208 break; 2504 break;
2209 2505
2506#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2507 // 8-bit controls
2211 case 0x90: /* DCS */ 2508 case 0x90: /* DCS */
2212 process_dcs_seq (); 2509 process_dcs_seq ();
2213 break; 2510 break;
2214 case 0x9b: /* CSI */ 2511 case 0x9b: /* CSI */
2215 process_csi_seq (); 2512 process_csi_seq ();
2216 break; 2513 break;
2217 case 0x9d: /* CSI */ 2514 case 0x9d: /* OSC */
2218 process_osc_seq (); 2515 process_osc_seq ();
2219 break; 2516 break;
2517#endif
2220 } 2518 }
2221} 2519}
2222/*}}} */ 2520/*}}} */
2223 2521
2224 2522
… …
2286void 2584void
2287rxvt_term::process_escape_seq () 2585rxvt_term::process_escape_seq ()
2288{ 2586{
2289 unicode_t ch = cmd_getc (); 2587 unicode_t ch = cmd_getc ();
2290 2588
2291 if (PrivateModes & PrivMode_vt52) 2589 if (priv_modes & PrivMode_vt52)
2292 { 2590 {
2293 process_escape_vt52 (ch); 2591 process_escape_vt52 (ch);
2294 return; 2592 return;
2295 } 2593 }
2296 2594
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2609 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2610 break;
2313 case '+': 2611 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2612 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2613 break;
2316#ifndef NO_FRILLS 2614#if !ENABLE_MINIMAL
2317 case '6': 2615 case '6':
2318 scr_backindex (); 2616 scr_backindex ();
2319 break; 2617 break;
2320#endif 2618#endif
2321 case '7': 2619 case '7':
2322 scr_cursor (SAVE); 2620 scr_cursor (SAVE);
2323 break; 2621 break;
2324 case '8': 2622 case '8':
2325 scr_cursor (RESTORE); 2623 scr_cursor (RESTORE);
2326 break; 2624 break;
2327#ifndef NO_FRILLS 2625#if !ENABLE_MINIMAL
2328 case '9': 2626 case '9':
2329 scr_forwardindex (); 2627 scr_forwardindex ();
2330 break; 2628 break;
2331#endif 2629#endif
2332 case '=': 2630 case '=':
… …
2342 break; 2640 break;
2343 2641
2344 /* 8.3.87: NEXT LINE */ 2642 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2643 case C1_NEL: /* ESC E */
2346 { 2644 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2645 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2646 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 2647 }
2350 break; 2648 break;
2351 2649
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2650 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2651 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 2661 case C1_RI: /* ESC M */
2364 scr_index (DN); 2662 scr_index (DN);
2365 break; 2663 break;
2366 2664
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2665 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2666 /*case C1_SS2: scr_single_shift (2); break; */
2369 2667
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2668 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2669 /*case C1_SS3: scr_single_shift (3); break; */
2372 2670
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2671 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2672 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2673 process_dcs_seq ();
2376 break; 2674 break;
2377 2675
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2676 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2677 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2678 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2679 break; /* steal obsolete ESC [ c */
2383 2680
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2681 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 2682 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2683 process_csi_seq ();
… …
2391 process_osc_seq (); 2688 process_osc_seq ();
2392 break; 2689 break;
2393 2690
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2691 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2692 case 'c':
2693 mbstate.reset ();
2396 scr_poweron (); 2694 scr_poweron ();
2397 scrollbar_show (1); 2695 scrollbar_show (1);
2398 break; 2696 break;
2399 2697
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2698 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 2710
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2711/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2712/* *INDENT-OFF* */
2415enum { 2713enum {
2416 CSI_ICH = 0x40, 2714 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2715 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 , 2716 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, 2717 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, 2718 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, 2719 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, 2720 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, */ 2735 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, [, \, ], ^, _, */ 2736 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, */ 2737 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, */ 2738 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, */ 2739 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, {, |, }, ~, */ 2740 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2741 };
2444/* *INDENT-ON* */ 2742/* *INDENT-ON* */
2445 2743
2446void 2744void
2447rxvt_term::process_csi_seq () 2745rxvt_term::process_csi_seq ()
2448{ 2746{
2449 unicode_t ch, priv, i; 2747 unicode_t ch, priv, i;
2450 unsigned int nargs, p; 2748 unsigned int nargs, p;
2451 int n, ndef; 2749 int n, ndef;
2452 int arg[ESC_ARGS]; 2750 int arg[ESC_ARGS] = { };
2453 2751
2454 for (nargs = ESC_ARGS; nargs > 0;) 2752 nargs = 0;
2455 arg[--nargs] = 0;
2456 2753
2457 priv = 0; 2754 priv = 0;
2458 ch = cmd_getc (); 2755 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?') 2756 if (ch >= '<' && ch <= '?')
2757 {
2460 { /* '<' '=' '>' '?' */ 2758 /* '<' '=' '>' '?' */
2461 priv = ch; 2759 priv = ch;
2462 ch = cmd_getc (); 2760 ch = cmd_getc ();
2463 } 2761 }
2464 2762
2465 /* read any numerical arguments */ 2763 /* read any numerical arguments */
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2792 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2793 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2794 if (arg[p] == -1)
2497 arg[p] = ndef; 2795 arg[p] = ndef;
2498 2796
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 /* 2797 /*
2507 * private mode handling 2798 * private mode handling
2508 */ 2799 */
2509 if (priv) 2800 if (priv)
2510 { 2801 {
2511 switch (priv) 2802 switch (priv)
2512 { 2803 {
2513 case '>': 2804 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2805 if (ch == CSI_DA) /* secondary device attributes */
2806 {
2807 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2808 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2809 //
2810 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2811 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2812 // versions.
2813 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2814 tt_printf ("\033[>%d;95;0c", 'U');
2815 }
2516 break; 2816 break;
2517 case '?': 2817 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2818 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2819 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2820 break;
… …
2625 2925
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2926 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2929 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2930 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 2931 break;
2632 2932
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2933 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 2934 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 2935 break;
2637 2936
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2937 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 2938 process_sgr_mode (nargs, arg);
2640 break; 2939 break;
… …
2646 tt_printf ("\033[0n"); 2945 tt_printf ("\033[0n");
2647 break; 2946 break;
2648 case 6: /* CPR requested */ 2947 case 6: /* CPR requested */
2649 scr_report_position (); 2948 scr_report_position ();
2650 break; 2949 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 2950 case 7: /* unofficial extension */
2951 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2952 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 2953 break;
2655#endif
2656 case 8: /* unofficial extension */ 2954 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2955 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 2956 break;
2659 } 2957 }
2660 break; 2958 break;
2661 2959
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2960 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 2993 break;
2696 2994
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 2995 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 2996 if (arg[0] == 4)
2699 scr_insert_mode (0); 2997 scr_insert_mode (0);
2998 else if (arg[0] == 20)
2999 priv_modes &= ~PrivMode_LFNL;
2700 break; 3000 break;
2701 3001
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3002 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3003 if (arg[0] == 4)
2704 scr_insert_mode (1); 3004 scr_insert_mode (1);
3005 else if (arg[0] == 20)
3006 priv_modes |= PrivMode_LFNL;
2705 break; 3007 break;
2706 3008
2707 /* 3009 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3010 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3011 */
… …
2721 break; 3023 break;
2722 case CSI_75: 3024 case CSI_75:
2723 scr_cursor (RESTORE); 3025 scr_cursor (RESTORE);
2724 break; 3026 break;
2725 3027
2726#ifndef NO_FRILLS 3028#if !ENABLE_MINIMAL
2727 case CSI_74: 3029 case CSI_74:
2728 process_window_ops (arg, nargs); 3030 process_window_ops (arg, nargs);
2729 break; 3031 break;
2730#endif 3032#endif
2731 3033
… …
2738 break; 3040 break;
2739 } 3041 }
2740} 3042}
2741/*}}} */ 3043/*}}} */
2742 3044
2743#ifndef NO_FRILLS 3045#if !ENABLE_MINIMAL
2744/* ARGSUSED */ 3046/* ARGSUSED */
2745void 3047void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3048rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3049{
2748 int x, y; 3050 int x, y;
2749 XWindowAttributes wattr; 3051 XWindowAttributes wattr;
2750 Window wdummy; 3052 Window wdummy;
3053
3054 dLocal (Display *, dpy);
2751 3055
2752 if (nargs == 0) 3056 if (nargs == 0)
2753 return; 3057 return;
2754 3058
2755 switch (args[0]) 3059 switch (args[0])
2756 { 3060 {
2757 /* 3061 /*
2758 * commands 3062 * commands
2759 */ 3063 */
2760 case 1: /* deiconify window */ 3064 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3065 XMapWindow (dpy, parent[0]);
2762 break; 3066 break;
2763 case 2: /* iconify window */ 3067 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3068 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3069 break;
2767 case 3: /* set position (pixels) */ 3070 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3071 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3072 break;
2770 case 4: /* set size (pixels) */ 3073 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3074 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3075 break;
2773 case 5: /* raise window */ 3076 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3077 XRaiseWindow (dpy, parent[0]);
2775 break; 3078 break;
2776 case 6: /* lower window */ 3079 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3080 XLowerWindow (dpy, parent[0]);
2778 break; 3081 break;
2779 case 7: /* refresh window */ 3082 case 7: /* refresh window */
2780 scr_touch (true); 3083 scr_touch (true);
2781 break; 3084 break;
2782 case 8: /* set size (chars) */ 3085 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3086 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3087 (unsigned int) (args[1] * fheight));
2785 break; 3088 break;
2786 3089
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3090 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3091 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3092 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3093 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3094 (unsigned int) (args[1] * fheight));
2792 break; 3095 break;
2793
2794 3096
2795 /* 3097 /*
2796 * reports - some output format copied from XTerm 3098 * reports - some output format copied from XTerm
2797 */ 3099 */
2798 case 11: /* report window state */ 3100 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3101 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3102 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3103 break;
2802 case 13: /* report window position */ 3104 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3106 XTranslateCoordinates (dpy, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3107 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3108 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3109 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3110 break;
2809 case 14: /* report window size (pixels) */ 3111 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3112 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3113 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3114 break;
2813 case 18: /* report text area size (chars) */ 3115 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3116 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3117 break;
2816 case 19: /* report window size (chars) */ 3118 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3119 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3120 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3121 case 20: /* report icon label */
3122 {
3123 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3124 XGetIconName (dpy, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3125 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3126 XFree (s);
3127 }
2823 break; 3128 break;
2824 case 21: /* report window title */ 3129 case 21: /* report window title */
3130 {
3131 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3132 XFetchName (dpy, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3133 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3134 XFree (s);
3135 }
2827 break; 3136 break;
2828#endif
2829 } 3137 }
2830} 3138}
2831#endif 3139#endif
2832 3140
2833/*----------------------------------------------------------------------*/ 3141/*----------------------------------------------------------------------*/
2834/* 3142/*
2835 * get input up until STRING TERMINATOR (or BEL) 3143 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3144 * ends_how is terminator used. returned input must be free()'d
2837 */ 3145 */
2838unsigned char * 3146char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3147rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3148{
2841 int seen_esc = 0; /* seen escape? */ 3149 unicode_t ch;
3150 bool seen_esc = false;
2842 unsigned int n = 0; 3151 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3152 wchar_t string[STRING_MAX];
2846 3153
2847 while ((ch = cmd_getc ())) 3154 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3155 {
2849 if (ch == C0_BEL 3156 if (seen_esc)
2850 || ch == CHAR_ST 3157 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3158 if (ch == 0x5c) /* 7bit ST */
2852 break; 3159 break;
2853 3160 else
3161 return NULL;
3162 }
2854 if (ch == C0_ESC) 3163 else if (ch == C0_ESC)
2855 { 3164 {
2856 seen_esc = 1; 3165 seen_esc = true;
2857 continue; 3166 continue;
2858 } 3167 }
3168 else if (ch == C0_BEL || ch == CHAR_ST)
3169 break;
2859 else if (ch == '\t') 3170 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3171 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3172 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3173 return NULL; /* other control character - exit */
2863 3174
2864 if (n < sizeof (string) - 1) 3175 seen_esc = false;
3176
3177 if (n >= STRING_MAX - 1)
3178 // stop at some sane length
3179 return NULL;
3180
2865 string[n++] = ch; 3181 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3182 }
2869 3183
2870 string[n++] = '\0'; 3184 string[n++] = '\0';
2871 3185
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3186 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3187
2877 return s; 3188 return rxvt_wcstombs (string);
2878} 3189}
2879 3190
2880/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
2881/* 3192/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3193 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3194 */
2884void 3195void
2885rxvt_term::process_dcs_seq () 3196rxvt_term::process_dcs_seq ()
2886{ 3197{
2887 unsigned char *s; 3198 char *s;
2888 unicode_t eh; 3199 unicode_t eh;
2889 3200
2890 /* 3201 /*
2891 * Not handled yet 3202 * Not handled yet
2892 */ 3203 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3222 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3223 arg = arg * 10 + (ch - '0');
2913 3224
2914 if (ch == ';') 3225 if (ch == ';')
2915 { 3226 {
2916 unsigned char *s = get_to_st (eh); 3227 char *s = get_to_st (eh);
2917 3228
2918 if (s) 3229 if (s)
2919 { 3230 {
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); 3231 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3232 free (s);
2934 } 3233 }
2935 } 3234 }
2936} 3235}
3236
3237void
3238rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3239{
3240 if (str[0] == '?' && !str[1])
3241 {
3242 rgba c;
3243 pix_colors_focused[color].get (c);
3244
3245#if XFT
3246 if (c.a != rgba::MAX_CC)
3247 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3248 else
3249#endif
3250 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3251 }
3252 else
3253 set_window_color (color, str);
3254}
3255
2937/* 3256/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3257 * 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 */ 3258 */
2960void 3259void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3260rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3261{
2963 int changed = 0;
2964 int color; 3262 int color;
2965 char *buf, *name; 3263 char *buf, *name;
3264 bool query = str[0] == '?' && !str[1];
3265 int saveop = op;
3266
3267 dLocal (Display *, dpy);
2966 3268
2967 assert (str != NULL); 3269 assert (str != NULL);
3270
3271 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3272 return;
3273
2968 switch (op) 3274 switch (op)
2969 { 3275 {
2970 case XTerm_name: 3276 case XTerm_name:
2971 set_title (str); 3277 set_title (str);
2972 /* FALLTHROUGH */ 3278 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3280 set_icon_name (str);
2975 break; 3281 break;
2976 case XTerm_title: 3282 case XTerm_title:
2977 set_title (str); 3283 set_title (str);
2978 break; 3284 break;
3285 case XTerm_property:
3286 if (str[0] == '?')
3287 {
3288 Atom prop = display->atom (str + 1);
3289 Atom actual_type;
3290 int actual_format;
3291 unsigned long nitems;
3292 unsigned long bytes_after;
3293 unsigned char *value = 0;
3294 const char *str = "";
3295
3296 if (prop
3297 && XGetWindowProperty (dpy, parent[0],
3298 prop, 0, 1<<16, 0, AnyPropertyType,
3299 &actual_type, &actual_format,
3300 &nitems, &bytes_after, &value) == Success
3301 && actual_type != None
3302 && actual_format == 8)
3303 str = (const char *)(value);
3304
3305 tt_printf ("\033]%d;%s%c", op, str, resp);
3306
3307 XFree (value);
3308 }
3309 else
3310 {
3311 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3312
3313 if (eq)
3314 {
3315 *eq = 0;
3316 set_utf8_property (display->atom (str), eq + 1);
3317 }
3318 else
3319 XDeleteProperty (dpy, parent[0],
3320 display->atom (str));
3321 }
3322 break;
3323
2979 case XTerm_Color: 3324 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3325 for (buf = (char *)str; buf && *buf;)
2981 { 3326 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3327 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3328 break;
2984 3329
2985 *name++ = '\0'; 3330 *name++ = '\0';
2986 color = atoi (buf); 3331 color = atoi (buf) + minCOLOR;
2987 3332
2988 if (color < 0 || color >= TOTAL_COLORS) 3333 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3334 break;
2990 3335
2991 if ((buf = STRCHR (name, ';')) != NULL) 3336 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3337 *buf++ = '\0';
2993 3338
2994 set_window_color (color + minCOLOR, name); 3339 process_color_seq (op, color, name, resp);
2995 } 3340 }
3341 break;
3342 case XTerm_Color00:
3343 process_color_seq (op, Color_fg, str, resp);
3344 break;
3345 case XTerm_Color01:
3346 process_color_seq (op, Color_bg, str, resp);
2996 break; 3347 break;
2997#ifndef NO_CURSORCOLOR 3348#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3349 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3350 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3351 break;
3001#endif 3352#endif
3002 case XTerm_Color_pointer: 3353 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3354 process_color_seq (op, Color_pointer_fg, str, resp);
3355 break;
3356 case XTerm_Color_pointer_bg:
3357 process_color_seq (op, Color_pointer_bg, str, resp);
3004 break; 3358 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3359#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: 3360 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3361 process_color_seq (op, Color_RV, str, resp);
3014 break; 3362 break;
3363 case Rxvt_Color_BD:
3364 case URxvt_Color_BD:
3365 process_color_seq (op, Color_BD, str, resp);
3366 break;
3367 case Rxvt_Color_UL:
3368 case URxvt_Color_UL:
3369 process_color_seq (op, Color_UL, str, resp);
3370 break;
3371 case URxvt_Color_IT:
3372 process_color_seq (op, Color_IT, str, resp);
3373 break;
3015#endif 3374#endif
3016 3375#if ENABLE_TRANSPARENCY
3017 case XTerm_Menu: 3376 case URxvt_Color_tint:
3377 process_color_seq (op, Color_tint, str, resp);
3018 /* 3378 {
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3379 bool changed = false;
3020 * so DON'T do it here 3380 if (ISSET_PIXCOLOR (Color_tint))
3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3382 else
3383 changed = bgPixmap.unset_tint ();
3384 if (changed)
3385 update_background ();
3021 */ 3386 }
3387
3022 break; 3388 break;
3389#endif
3390
3391#if BG_IMAGE_FROM_FILE
3023 case XTerm_Pixmap: 3392 case Rxvt_Pixmap:
3024 if (*str != ';') 3393 if (!strcmp (str, "?"))
3025 { 3394 {
3026#if XPM_BACKGROUND 3395 char str[256];
3027 scale_pixmap (""); /* reset to default scaling */ 3396
3028 set_bgPixmap (str); /* change pixmap */ 3397 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3029#endif 3398 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3030 scr_touch (true); 3399 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3400 process_xterm_seq (XTerm_title, str, CHAR_ST);
3031 } 3401 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3402 else
3033 { 3403 {
3404 int changed = 0;
3405
3406 if (*str != ';')
3407 {
3408 /* reset to default scaling :*/
3409 bgPixmap.unset_geometry ();
3410 if (bgPixmap.set_file (str)) /* change pixmap */
3411 changed++;
3412 str = strchr (str, ';');
3413 if (str == NULL)
3414 bgPixmap.set_defaultGeometry ();
3415 }
3416 while (str)
3417 {
3034 str++; 3418 str++;
3035#if XPM_BACKGROUND 3419 if (bgPixmap.set_geometry (str))
3036 changed += scale_pixmap (str); 3420 changed++;
3037#endif 3421 str = strchr (str, ';');
3038 3422 }
3423 if (changed)
3424 update_background ();
3039 } 3425 }
3040 if (changed)
3041 {
3042#ifdef XPM_BACKGROUND
3043 resize_pixmap ();
3044#endif
3045 scr_touch (true);
3046 }
3047 break; 3426 break;
3427#endif
3048 3428
3049 case XTerm_restoreFG: 3429 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3430 set_window_color (Color_fg, str);
3051 break; 3431 break;
3052 case XTerm_restoreBG: 3432 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3433 set_window_color (Color_bg, str);
3054 break; 3434 break;
3435
3055 case XTerm_logfile: 3436 case XTerm_logfile:
3056 // TODO, when secure mode? 3437 // TODO, when secure mode?
3057 break; 3438 break;
3058 case XTerm_font: 3439
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 3440#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3441 case Rxvt_dumpscreen: /* no error notices */
3082 { 3442 {
3083 int fd; 3443 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3444 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3445 {
3086 scr_dump (fd); 3446 scr_dump (fd);
3087 close (fd); 3447 close (fd);
3088 } 3448 }
3089 } 3449 }
3450 break;
3451#endif
3452 case XTerm_font:
3453 op = URxvt_font;
3454 case URxvt_font:
3455#if ENABLE_STYLES
3456 case URxvt_boldFont:
3457 case URxvt_italicFont:
3458 case URxvt_boldItalicFont:
3459#endif
3460 if (query)
3461 tt_printf ("\33]%d;%-.250s%c", saveop,
3462 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3463 ? fontset[op - URxvt_font]->fontdesc : "",
3464 resp);
3465 else
3466 {
3467 const char *&res = rs[Rs_font + (op - URxvt_font)];
3468
3469 res = strdup (str);
3470 allocated.push_back ((void *)res);
3471 set_fonts ();
3472 }
3473 break;
3474
3475 case URxvt_version:
3476 if (query)
3477 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3478 op,
3479 rs[Rs_name], VERSION[0], VERSION[2],
3480 resp);
3481 break;
3482
3483#if !ENABLE_MINIMAL
3484 case URxvt_locale:
3485 if (query)
3486 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3487 else
3488 {
3489 set_locale (str);
3490 pty->set_utf8_mode (enc_utf8);
3491 init_xlocale ();
3492 }
3493 break;
3494
3495 case URxvt_view_up:
3496 case URxvt_view_down:
3497 {
3498 int lines = atoi (str);
3499
3500 if (lines)
3501 scr_page (op == URxvt_view_up ? UP : DN, lines);
3502 else
3503 scr_erase_savelines ();
3504 }
3505
3506 break;
3507#endif
3508
3509#if ENABLE_PERL
3510 case URxvt_perl:
3511 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3512 ; // no responses yet
3090 break; 3513 break;
3091#endif 3514#endif
3092 } 3515 }
3093} 3516}
3094/*----------------------------------------------------------------------*/ 3517/*----------------------------------------------------------------------*/
… …
3108{ 3531{
3109 int state; 3532 int state;
3110 3533
3111 if (mode == 's') 3534 if (mode == 's')
3112 { 3535 {
3113 SavedModes |= (PrivateModes & bit); 3536 SavedModes |= (priv_modes & bit);
3114 return -1; 3537 return -1;
3115 } 3538 }
3116 else 3539 else
3117 { 3540 {
3118 if (mode == 'r') 3541 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3542 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3543 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3544 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3545 PrivMode (state, bit);
3123 } 3546 }
3124 3547
3125 return state; 3548 return state;
3126} 3549}
3127 3550
3128/* we're not using priv _yet_ */ 3551/* we're not using priv _yet_ */
3129void 3552void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3553rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 3554{
3132 unsigned int i, j; 3555 unsigned int i, j;
3133 int state; 3556 int state;
3134 3557
3135 static const struct 3558 static const struct
3136 { 3559 {
3137 const int argval; 3560 const int argval;
3138 const unsigned long bit; 3561 const unsigned long bit;
3139 }
3140
3141 argtopriv[] = { 3562 } argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 3563 { 1, PrivMode_aplCUR },
3143 { 2, PrivMode_vt52 }, 3564 { 2, PrivMode_vt52 },
3144 { 3, PrivMode_132 }, 3565 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3566 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3567 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3568 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3569 { 7, PrivMode_Autowrap },
3570 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3571 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3572 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 3573 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 3574#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3575 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3576#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3577 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3578 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3579 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3580 // 45 margin bell NYI
3163 // 46 start logging 3581 // 46 start logging
… …
3165 { 66, PrivMode_aplKP }, 3583 { 66, PrivMode_aplKP },
3166#ifndef NO_BACKSPACE_KEY 3584#ifndef NO_BACKSPACE_KEY
3167 { 67, PrivMode_BackSpace }, 3585 { 67, PrivMode_BackSpace },
3168#endif 3586#endif
3169 { 1000, PrivMode_MouseX11 }, 3587 { 1000, PrivMode_MouseX11 },
3170 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3588 { 1002, PrivMode_MouseBtnEvent },
3171 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3589 { 1003, PrivMode_MouseAnyEvent },
3172 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3173 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3590 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3174 { 1011, PrivMode_Keypress }, // rxvt extension 3591 { 1011, PrivMode_Keypress }, // rxvt extension
3175 // 1035 enable modifiers for alt, numlock NYI 3592 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3593 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3594 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3595 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3596 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3597 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3598 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3599 };
3183 3600
3184 if (nargs == 0) 3601 if (nargs == 0)
3185 return; 3602 return;
… …
3203 } 3620 }
3204 3621
3205 /* extra handling for values with state unkept */ 3622 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3623 switch (arg[i])
3207 { 3624 {
3625#if ENABLE_STYLES
3626 case 1021:
3627 set_option (Opt_intensityStyles, mode);
3628
3629 scr_touch (true);
3630 break;
3631#endif
3208 case 1048: /* alternative cursor save */ 3632 case 1048: /* alternative cursor save */
3209 case 1049: 3633 case 1049:
3634 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3635 if (mode == 0)
3211 scr_cursor (RESTORE); 3636 scr_cursor (RESTORE);
3212 else if (mode == 1) 3637 else if (mode == 1)
3213 scr_cursor (SAVE); 3638 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3639 break;
3215 } 3640 }
3216 3641
3217 if (state >= 0) 3642 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3643 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3644 switch (arg[i])
… …
3225 * within VT52 mode 3650 * within VT52 mode
3226 */ 3651 */
3227 PrivMode (1, PrivMode_vt52); 3652 PrivMode (1, PrivMode_vt52);
3228 break; 3653 break;
3229 case 3: /* 80/132 */ 3654 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3655 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3656 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 3657 break;
3233 case 4: /* smooth scrolling */ 3658 case 4: /* smooth scrolling */
3234 if (state) 3659 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3660 break;
3239 case 5: /* reverse video */ 3661 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3662 scr_rvideo_mode (state);
3241 break; 3663 break;
3242 case 6: /* relative/absolute origins */ 3664 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3665 scr_relative_origin (state);
3244 break; 3666 break;
3245 case 7: /* autowrap */ 3667 case 7: /* autowrap */
3246 scr_autowrap (state); 3668 scr_autowrap (state);
3247 break; 3669 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3670 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3671 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3672 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3673 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3252 break; 3674 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 3675#ifdef scrollBar_esc
3261 case scrollBar_esc: 3676 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3677 if (scrollbar_mapping (state))
3263 { 3678 {
3264 resize_all_windows (0, 0, 0); 3679 resize_all_windows (0, 0, 0);
… …
3267 break; 3682 break;
3268#endif 3683#endif
3269 case 25: /* visible/invisible cursor */ 3684 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3685 scr_cursor_visible (state);
3271 break; 3686 break;
3272 /* case 35: - shift keys */ 3687 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3688 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3689 case 47: /* secondary screen */
3275 scr_change_screen (state); 3690 scr_change_screen (state);
3276 break; 3691 break;
3277 /* case 66: - application key pad */ 3692 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3693 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3694 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3695 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3696 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3282 break; 3697 break;
3283#if 0
3284 case 1001: 3698 case 1002:
3285 break; /* X11 mouse highlighting */ 3699 case 1003:
3286#endif 3700 if (state)
3701 {
3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3703 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3704 vt_emask_mouse = PointerMotionMask;
3705 }
3706 else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3711 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3712 break;
3293 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3714 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3715 break;
3299 case 1047: /* secondary screen w/ clearing */ 3716 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3717 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3718 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3719 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3720 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3721 break;
3722 case 1049: /* secondary screen w/ clearing first */
3723 scr_change_screen (state);
3724 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY)
3726 scr_erase_screen (2);
3727 break;
3306 default: 3728 default:
3307 break; 3729 break;
3308 } 3730 }
3309 } 3731 }
3310} 3732}
… …
3333 rendset = 0, rendstyle = ~RS_None; 3755 rendset = 0, rendstyle = ~RS_None;
3334 break; 3756 break;
3335 case 1: 3757 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3758 rendset = 1, rendstyle = RS_Bold;
3337 break; 3759 break;
3760 //case 2: // low intensity
3761 case 3:
3762 rendset = 1, rendstyle = RS_Italic;
3763 break;
3338 case 4: 3764 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3765 rendset = 1, rendstyle = RS_Uline;
3340 break; 3766 break;
3341 case 5: 3767 case 5: // slowly blinking
3768 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3769 rendset = 1, rendstyle = RS_Blink;
3343 break; 3770 break;
3771 //case 6: // scoansi light background
3344 case 7: 3772 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3773 rendset = 1, rendstyle = RS_RVid;
3346 break; 3774 break;
3347 case 8: 3775 case 8:
3348 // invisible. NYI 3776 // invisible. NYI
3349 break; 3777 break;
3350 case 22: 3778 //case 9: // crossed out
3779 //case 10: // scoansi acs off, primary font
3780 //case 11: // scoansi acs on, first alt font
3781 //case 12: // scoansi acs on, |0x80, second alt font
3782 //...
3783 //case 19: // ninth alt font
3784 //case 20: // gothic
3785 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3786 rendset = 0, rendstyle = RS_Bold;
3787 break;
3788 case 22: // normal intensity
3789 rendset = 0, rendstyle = RS_Bold;
3790 break;
3791 case 23: // disable italic
3792 rendset = 0, rendstyle = RS_Italic;
3352 break; 3793 break;
3353 case 24: 3794 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3795 rendset = 0, rendstyle = RS_Uline;
3355 break; 3796 break;
3356 case 25: 3797 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3798 rendset = 0, rendstyle = RS_Blink;
3358 break; 3799 break;
3800 case 26: // variable spacing (iso 8613)
3801 rendset = 0, rendstyle = RS_Blink;
3802 break;
3359 case 27: 3803 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3804 rendset = 0, rendstyle = RS_RVid;
3361 break; 3805 break;
3362 case 28:
3363 // visible. NYI 3806 //case 28: // visible. NYI
3364 break; 3807 //case 29: // not crossed-out
3365 } 3808 }
3366 3809
3367 if (rendset != -1) 3810 if (rendset != -1)
3368 { 3811 {
3369 scr_rendition (rendset, rendstyle); 3812 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3823 case 35:
3381 case 36: 3824 case 36:
3382 case 37: 3825 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3826 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3827 break;
3385#ifdef TTY_256COLOR 3828 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3829 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3830 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3831 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3832 i += 2;
3391 } 3833 }
3392 break; 3834 break;
3393#endif
3394 case 39: /* default fg */ 3835 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3836 scr_color (Color_fg, Color_fg);
3396 break; 3837 break;
3397 3838
3398 case 40: 3839 case 40:
… …
3403 case 45: 3844 case 45:
3404 case 46: 3845 case 46:
3405 case 47: 3846 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3848 break;
3408#ifdef TTY_256COLOR 3849 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3850 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3851 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3853 i += 2;
3414 } 3854 }
3415 break; 3855 break;
3416#endif
3417 case 49: /* default bg */ 3856 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3857 scr_color (Color_bg, Color_bg);
3419 break; 3858 break;
3420 3859
3421#ifndef NO_BRIGHTCOLOR 3860 //case 50: // not variable spacing
3861
3862#if !ENABLE_MINIMAL
3422 case 90: 3863 case 90:
3423 case 91: /* set bright fg color */ 3864 case 91: /* set bright fg color */
3424 case 92: 3865 case 92:
3425 case 93: 3866 case 93:
3426 case 94: 3867 case 94:
3427 case 95: 3868 case 95:
3428 case 96: 3869 case 96:
3429 case 97: 3870 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3871 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 3872 break;
3433 case 100: 3873 case 100:
3434 case 101: /* set bright bg color */ 3874 case 101: /* set bright bg color */
3435 case 102: 3875 case 102:
3436 case 103: 3876 case 103:
3437 case 104: 3877 case 104:
3438 case 105: 3878 case 105:
3439 case 106: 3879 case 106:
3440 case 107: 3880 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3881 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 3882 break;
3444#endif 3883#endif
3445
3446 } 3884 }
3447 } 3885 }
3448} 3886}
3449/*}}} */ 3887/*}}} */
3450 3888
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3889/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3890void
3453rxvt_term::process_graphics () 3891rxvt_term::process_graphics ()
3454{ 3892{
3455 unicode_t ch, cmd = cmd_getc (); 3893 unicode_t ch, cmd = cmd_getc ();
3456 3894
3457 if (cmd == 'Q') 3895 if (cmd == 'Q')
3896 {
3458 { /* query graphics */ 3897 /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 3898 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 3899 return;
3461 } 3900 }
3462 /* swallow other graphics sequences until terminating ':' */ 3901 /* swallow other graphics sequences until terminating ':' */
3463 do 3902 do
3464 ch = cmd_getc (); 3903 ch = cmd_getc ();
… …
3474 */ 3913 */
3475void 3914void
3476rxvt_term::tt_printf (const char *fmt,...) 3915rxvt_term::tt_printf (const char *fmt,...)
3477{ 3916{
3478 va_list arg_ptr; 3917 va_list arg_ptr;
3479 unsigned char buf[256]; 3918 char buf[256];
3480 3919
3481 va_start (arg_ptr, fmt); 3920 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3921 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 3922 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 3923 tt_write (buf, strlen (buf));
3485} 3924}
3486 3925
3487/* ---------------------------------------------------------------------- */ 3926/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 3927/* 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. 3928 * or generated by us in response to a query ESC sequence.
3490 */ 3929 */
3930const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3931
3491void 3932void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3933rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 3934{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3935 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3936 return;
3495 3937
3496 if (len) 3938 if (pty->pty < 0)
3939 return;
3940
3941 if (v_buflen == 0)
3942 {
3943 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3944
3945 if ((unsigned int)written == len)
3946 return;
3947
3948 data += written;
3949 len -= written;
3497 { 3950 }
3951
3952 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3953
3954 memcpy (v_buffer + v_buflen, data, len);
3955 v_buflen += len;
3956
3957 pty_ev.set (ev::READ | ev::WRITE);
3958}
3959
3960void rxvt_term::pty_write ()
3961{
3962 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3963
3964 if (written > 0)
3965 {
3966 v_buflen -= written;
3967
3498 if (v_buflen == 0) 3968 if (v_buflen == 0)
3499 { 3969 {
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); 3970 free (v_buffer);
3527 v_buffer = 0; 3971 v_buffer = 0;
3528 v_buflen = 0;
3529 3972
3530 pty_ev.set (EVENT_READ); 3973 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; 3974 return;
3543 } 3975 }
3976
3977 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 3978 }
3979 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3980 pty_ev.set (ev::READ);
3545} 3981}
3546 3982
3547/*----------------------- end-of-file (C source) -----------------------*/ 3983/*----------------------- end-of-file (C source) -----------------------*/
3548 3984

Diff Legend

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