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

Diff Legend

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