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.183 by root, Tue Dec 21 06:43:00 2004 UTC

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

Diff Legend

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