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.60 by pcg, Fri Feb 27 02:52:51 2004 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC

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

Diff Legend

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