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.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

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

Diff Legend

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