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

Diff Legend

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