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.170 by root, Sun Nov 21 20:19:24 2004 UTC

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

Diff Legend

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