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

Diff Legend

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