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

Diff Legend

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