ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.194 by root, Mon Feb 14 10:44:50 2005 UTC

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

Diff Legend

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