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

Diff Legend

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