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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 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
… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 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 iso14755buf = ISO_14755_54;
140 break;
141 }
142
143 x--;
144 }
145
146}
147#endif
148
149#if ENABLE_OVERLAY
150void
151rxvt_term::iso14755_51 (wchar_t ch)
152{
153 wchar_t *chr, *alloc;
154 int len;
155
156#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch))
158 {
159 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr);
162 }
163 else
164#endif
165 {
166 alloc = 0;
167 chr = &ch;
168 len = 1;
169 }
170
171 scr_overlay_new (0, -1, 8 + 5, len);
172
173 for (int y = 0; y < len; y++)
174 {
175 char buf[9];
176
177 ch = *chr++;
178
179 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '=');
182#if !UNICODE3
183 if (ch >= 0x10000)
184 ch = 0xfffd;
185#endif
186 scr_overlay_set (11, y, ch);
187 scr_overlay_set (12, y, NOCHAR);
188 }
189
190#if ENABLE_COMBINING
191 if (alloc)
192 delete [] alloc;
193#endif
194}
195#endif
196
197void
198rxvt_term::commit_iso14755 ()
199{
200 wchar_t ch[2];
201
202 ch[0] = iso14755buf & ISO_14755_MASK;
203 ch[1] = 0;
204
205 if (iso14755buf & ISO_14755_51)
206 {
207 char mb[16];
208 int len;
209
210 // allow verbatim 0-bytes and control-bytes to be entered
211 if (ch[0] >= 0x20)
212 len = wcstombs (mb, ch, 16);
213 else
214 {
215 mb[0] = ch[0];
216 len = 1;
217 }
218
219 if (len > 0)
220 tt_write ((unsigned char *)mb, len);
221 else
222 scr_bell ();
223 }
224
225 iso14755buf = 0;
226}
227
228int
229rxvt_term::hex_keyval (XKeyEvent &ev)
230{
231 // check wether this event corresponds to a hex digit
232 // if the modifiers had not been pressed.
233 for (int index = 0; index < 8; index++)
234 {
235 KeySym k = XLookupKeysym (&ev, index);
236
237 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
238 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
239 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
240 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
241 }
242
243 return -1;
244}
245#endif
246
62/*{{{ Convert the keypress event into a string */ 247/*{{{ Convert the keypress event into a string */
63void 248void
64rxvt_term::lookup_key (XKeyEvent &ev) 249rxvt_term::lookup_key (XKeyEvent &ev)
65{ 250{
66 int ctrl, meta, shft, len; 251 int ctrl, meta, shft, len;
… …
151 { 336 {
152 if (TermWin.saveLines) 337 if (TermWin.saveLines)
153 { 338 {
154#ifdef UNSHIFTED_SCROLLKEYS 339#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 340 if (!ctrl && !meta)
156 {
157#else 341#else
158 if (IS_SCROLL_MOD) 342 if (IS_SCROLL_MOD)
343#endif
159 { 344 {
160#endif
161 int lnsppg; 345 int lnsppg;
162 346
163#ifdef PAGING_CONTEXT_LINES 347#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 349#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 398 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 399 {
216 keysym += (XK_F11 - XK_F1); 400 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 401 shft = 0; /* turn off Shift */
218 } 402 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 403 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 404 {
221 switch (keysym) 405 switch (keysym)
222 { 406 {
223 /* normal XTerm key bindings */ 407 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 408 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 409 selection_request (ev.time, 0, 0);
226 return; 410 return;
411#if TODO // TODO
227 /* rxvt extras */ 412 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 413 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 414 change_font (FONT_UP);
230 return; 415 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 417 change_font (FONT_DN);
233 return; 418 return;
419#endif
234 } 420 }
235 } 421 }
236 } 422 }
423
424#if ENABLE_FRILLS || ISO_14755
425 // ISO 14755 support
426 if (shft && ctrl)
427 {
428 int hv;
429
430 if (iso14755buf & ISO_14755_51
431 && (keysym == XK_space || keysym == XK_KP_Space
432 || keysym == XK_Return || keysym == XK_KP_Enter))
433 {
434 commit_iso14755 ();
435 iso14755buf = ISO_14755_51;
436# if ISO_14755
437 iso14755_51 (0);
438# endif
439 return;
440 }
441 else if ((hv = hex_keyval (ev)) >= 0)
442 {
443 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
444 | hv | ISO_14755_51;
445# if ISO_14755
446 iso14755_51 (iso14755buf & ISO_14755_MASK);
447# endif
448 return;
449 }
450 else
451 {
452# if ENABLE_OVERLAY
453 scr_overlay_off ();
454# endif
455 iso14755buf = 0;
456 }
457 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED))
461 {
462 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif
467 }
468#endif
469
237#ifdef PRINTPIPE 470#ifdef PRINTPIPE
238 if (keysym == XK_Print) 471 if (keysym == XK_Print)
239 { 472 {
240 scr_printscreen (ctrl | shft); 473 scr_printscreen (ctrl | shft);
241 return; 474 return;
… …
273 newlen = 1; 506 newlen = 1;
274 switch (keysym) 507 switch (keysym)
275 { 508 {
276#ifndef NO_BACKSPACE_KEY 509#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 510 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 511 if (priv_modes & PrivMode_HaveBackSpace)
279 { 512 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 514 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 515 kbuf[1] = '\0';
283 } 516 }
284 else 517 else
285 STRCPY (kbuf, key_backspace); 518 strcpy (kbuf, key_backspace);
286 break; 519 break;
287#endif 520#endif
288#ifndef NO_DELETE_KEY 521#ifndef NO_DELETE_KEY
289 case XK_Delete: 522 case XK_Delete:
290 STRCPY (kbuf, key_delete); 523 strcpy (kbuf, key_delete);
291 break; 524 break;
292#endif 525#endif
293 case XK_Tab: 526 case XK_Tab:
294 if (shft) 527 if (shft)
295 STRCPY (kbuf, "\033[Z"); 528 strcpy (kbuf, "\033[Z");
296 else 529 else
297 { 530 {
298#ifdef CTRL_TAB_MAKES_META 531#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 532 if (ctrl)
300 meta = 1; 533 meta = 1;
… …
306 newlen = 0; 539 newlen = 0;
307 } 540 }
308 break; 541 break;
309 542
310#ifdef XK_KP_Left 543#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 544 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 545 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 546 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 547 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 549 {
317 STRCPY (kbuf, "\033OZ"); 550 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 552 break;
320 } 553 }
321 else 554 else
322 /* translate to std. cursor key */ 555 /* translate to std. cursor key */
… …
325#endif 558#endif
326 case XK_Up: /* "\033[A" */ 559 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 560 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 561 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 562 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 564 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 565 /* do Shift first */
333 if (shft) 566 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 568 else if (ctrl)
336 { 569 {
337 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 571 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 572 }
340 else if (PrivateModes & PrivMode_aplCUR) 573 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 574 kbuf[1] = 'O';
342 break; 575 break;
343 576
344#ifndef UNSHIFTED_SCROLLKEYS 577#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 578# ifdef XK_KP_Prior
346 case XK_KP_Prior: 579 case XK_KP_Prior:
347 /* allow shift to override */ 580 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 582 {
350 STRCPY (kbuf, "\033Oy"); 583 strcpy (kbuf, "\033Oy");
351 break; 584 break;
352 } 585 }
353 /* FALLTHROUGH */ 586 /* FALLTHROUGH */
354# endif 587# endif
355 case XK_Prior: 588 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 589 strcpy (kbuf, "\033[5~");
357 break; 590 break;
358# ifdef XK_KP_Next 591# ifdef XK_KP_Next
359 case XK_KP_Next: 592 case XK_KP_Next:
360 /* allow shift to override */ 593 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 595 {
363 STRCPY (kbuf, "\033Os"); 596 strcpy (kbuf, "\033Os");
364 break; 597 break;
365 } 598 }
366 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
367# endif 600# endif
368 case XK_Next: 601 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 602 strcpy (kbuf, "\033[6~");
370 break; 603 break;
371#endif 604#endif
372 case XK_KP_Enter: 605 case XK_KP_Enter:
373 /* allow shift to override */ 606 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 608 {
376 STRCPY (kbuf, "\033OM"); 609 strcpy (kbuf, "\033OM");
610 break;
611 }
612
613 /* FALLTHROUGH */
614
615 case XK_Return:
616 if (priv_modes & PrivMode_LFNL)
617 {
618 kbuf[0] = '\015';
619 kbuf[1] = '\012';
620 kbuf[2] = '\0';
377 } 621 }
378 else 622 else
379 { 623 {
380 kbuf[0] = '\r'; 624 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 625 kbuf[1] = '\0';
382 } 626 }
383 break; 627 break;
384 628
385#ifdef XK_KP_Begin 629#ifdef XK_KP_Begin
386 case XK_KP_Begin: 630 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 631 strcpy (kbuf, "\033Ou");
388 break; 632 break;
389 633
390 case XK_KP_Insert: 634 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 635 strcpy (kbuf, "\033Op");
392 break; 636 break;
393 637
394 case XK_KP_Delete: 638 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 639 strcpy (kbuf, "\033On");
396 break; 640 break;
397#endif 641#endif
398 case XK_KP_F1: /* "\033OP" */ 642 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 643 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 644 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 645 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 646 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 647 kbuf[2] += (keysym - XK_KP_F1);
404 break; 648 break;
405 649
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 650 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 651 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 662 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 663 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 664 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 665 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 666 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 668 {
425 STRCPY (kbuf, "\033Oj"); 669 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 670 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 671 }
428 else 672 else
429 { 673 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 675 kbuf[1] = '\0';
432 } 676 }
433 break; 677 break;
434 678
435 case XK_Find: 679 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 680 strcpy (kbuf, "\033[1~");
437 break; 681 break;
438 case XK_Insert: 682 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 683 strcpy (kbuf, "\033[2~");
440 break; 684 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 685#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 686 case DXK_Remove:
443 /* FALLTHROUGH */ 687 /* FALLTHROUGH */
444#endif 688#endif
445 case XK_Execute: 689 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 690 strcpy (kbuf, "\033[3~");
447 break; 691 break;
448 case XK_Select: 692 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 693 strcpy (kbuf, "\033[4~");
450 break; 694 break;
451#ifdef XK_KP_End 695#ifdef XK_KP_End
452 case XK_KP_End: 696 case XK_KP_End:
453 /* allow shift to override */ 697 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 699 {
456 STRCPY (kbuf, "\033Oq"); 700 strcpy (kbuf, "\033Oq");
457 break; 701 break;
458 } 702 }
459 /* FALLTHROUGH */ 703 /* FALLTHROUGH */
460#endif 704#endif
461 case XK_End: 705 case XK_End:
462 STRCPY (kbuf, KS_END); 706 strcpy (kbuf, KS_END);
463 break; 707 break;
464#ifdef XK_KP_Home 708#ifdef XK_KP_Home
465 case XK_KP_Home: 709 case XK_KP_Home:
466 /* allow shift to override */ 710 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 712 {
469 STRCPY (kbuf, "\033Ow"); 713 strcpy (kbuf, "\033Ow");
470 break; 714 break;
471 } 715 }
472 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
473#endif 717#endif
474 case XK_Home: 718 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 719 strcpy (kbuf, KS_HOME);
476 break; 720 break;
477 721
478#define FKEY(n, fkey) \ 722#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 724
… …
533 default: 777 default:
534 newlen = 0; 778 newlen = 0;
535 break; 779 break;
536 } 780 }
537 if (newlen) 781 if (newlen)
538 len = STRLEN (kbuf); 782 len = strlen (kbuf);
539 } 783 }
540 784
541 /* 785 /*
542 * Pass meta for all function keys, if 'meta' option set 786 * Pass meta for all function keys, if 'meta' option set
543 */ 787 */
… …
571 } 815 }
572 816
573 if (len <= 0) 817 if (len <= 0)
574 return; /* not mapped */ 818 return; /* not mapped */
575 819
576 if (Options & Opt_scrollTtyKeypress) 820 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 821 if (TermWin.view_start)
578 { 822 {
579 TermWin.view_start = 0; 823 TermWin.view_start = 0;
580 want_refresh = 1; 824 want_refresh = 1;
581 } 825 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 874 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 876
633 if (n > 0 && s < count) 877 if (n > 0 && s < count)
634 { 878 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 879 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 880 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 881 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 882 cmdbuf_endp -= n;
639 s += n; 883 s += n;
640 } 884 }
… …
661 if (want_full_refresh) 905 if (want_full_refresh)
662 { 906 {
663 want_full_refresh = 0; 907 want_full_refresh = 0;
664 scr_clear (); 908 scr_clear ();
665 scr_touch (false); 909 scr_touch (false);
666 want_refresh = 1;
667 } 910 }
668#endif 911#endif
669 912
670 if (want_refresh) 913 if (want_refresh)
671 { 914 {
672 scr_refresh (refresh_type); 915 scr_refresh (refresh_type);
673 scrollbar_show (1); 916 scrollbar_show (1);
674#ifdef USE_XIM 917#ifdef USE_XIM
675 IMSendSpot (); 918 IMSendSpot ();
676#endif 919#endif
677
678 } 920 }
679 921
680 display->flush (); 922 display->flush ();
923
924 flush_ev.stop ();
681} 925}
682 926
683void 927void
684rxvt_term::check_cb (check_watcher &w) 928rxvt_term::check_cb (check_watcher &w)
685{ 929{
686 SET_R (this); 930 SET_R (this);
687 SET_LOCALE (locale); 931 SET_LOCALE (locale);
688 932
933 display->flush ();
934
935 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01);
937}
938
939void
940rxvt_term::flush_cb (time_watcher &w)
941{
942 SET_R (this);
943 SET_LOCALE (locale);
944
945 refresh_limit = 1;
946 refresh_count = 0;
689 flush (); 947 flush ();
690} 948}
691 949
692#ifdef CURSOR_BLINK 950#ifdef CURSOR_BLINK
693void 951void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 969 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 970 }
713} 971}
714#endif 972#endif
715 973
974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
975void
976rxvt_term::cont_scroll_cb (time_watcher &w)
977{
978 if ((scrollbar_isUp() || scrollbar_isDn()) &&
979 scr_page (scrollbar_isUp() ? UP : DN, 1))
980 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
984 }
985}
986#endif
987
988#ifdef SELECTION_SCROLLING
989void
990rxvt_term::sel_scroll_cb (time_watcher &w)
991{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
998 }
999}
1000#endif
1001
1002#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1003void
1004rxvt_term::slip_wheel_cb (time_watcher &w)
1005{
1006 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed))
1009 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 }
1014}
1015#endif
1016
716bool 1017bool
717rxvt_term::pty_fill () 1018rxvt_term::pty_fill ()
718{ 1019{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021
1022 if (CBUFSIZ == n)
1023 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0;
1026 }
720 1027
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1028 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1029 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1030 cmdbuf_endp = cmdbuf_ptr + n;
724 1031
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1033
727 if (n > 0) 1034 if (n > 0)
728 { 1035 {
729 cmdbuf_endp += n; 1036 cmdbuf_endp += n;
730 return true; 1037 return true;
… …
742 SET_LOCALE (locale); 1049 SET_LOCALE (locale);
743 1050
744 if (revents & EVENT_WRITE) 1051 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1052 tt_write (0, 0);
746 else if (revents & EVENT_READ) 1053 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 1054 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ()) 1055 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759
760 if (cmd_parse ()) 1056 if (cmd_parse ())
761 break; 1057 break;
762 } 1058}
763 } 1059
1060void
1061rxvt_term::pointer_unblank ()
1062{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1064 recolour_cursor ();
1065
1066#ifdef POINTER_BLANK
1067 hidden_pointer = 0;
1068
1069 if (options & Opt_pointerBlank)
1070 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif
764} 1072}
765 1073
766#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
767void 1075void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1076rxvt_term::pointer_blank ()
781{ 1077{
782 if (! (Options & Opt_pointerBlank)) 1078 if (! (options & Opt_pointerBlank))
783 return; 1079 return;
784 1080
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1081 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1082 XFlush (display->display);
787 1083
… …
807 x = ev.x; 1103 x = ev.x;
808 y = ev.y; 1104 y = ev.y;
809 pixel_position (&x, &y); 1105 pixel_position (&x, &y);
810 1106
811 if (MEvent.button == AnyButton) 1107 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1108 button_number = 3;
814 }
815 else 1109 else
816 { 1110 {
817 button_number = MEvent.button - Button1; 1111 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1112 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1113 if (button_number >= 3)
820 button_number += (64 - 3); 1114 button_number += (64 - 3);
821 } 1115 }
822 1116
823 if (PrivateModes & PrivMode_MouseX10) 1117 if (priv_modes & PrivMode_MouseX10)
824 { 1118 {
825 /* 1119 /*
826 * do not report ButtonRelease 1120 * do not report ButtonRelease
827 * no state info allowed 1121 * no state info allowed
828 */ 1122 */
… …
886{ 1180{
887 SET_R (this); 1181 SET_R (this);
888 SET_LOCALE (locale); 1182 SET_LOCALE (locale);
889 1183
890#if defined(CURSOR_BLINK) 1184#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1186 {
893 if (hidden_cursor) 1187 if (hidden_cursor)
894 { 1188 {
895 hidden_cursor = 0; 1189 hidden_cursor = 0;
896 want_refresh = 1; 1190 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1194 }
901#endif 1195#endif
902 1196
903#if defined(POINTER_BLANK) 1197#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1199 {
906 if (ev.type == MotionNotify 1200 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1201 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1202 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1203 if (hidden_pointer)
… …
921 1215
922 Window unused_root, unused_child; 1216 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1217 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1218 unsigned int unused_mask;
925 1219
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974
975 switch (ev.type) 1220 switch (ev.type)
976 { 1221 {
977 case KeyPress: 1222 case KeyPress:
1223#if ISO_14755
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
978 lookup_key (ev.xkey); 1226 lookup_key (ev.xkey);
1227
1228 break;
1229
1230 case KeyRelease:
1231 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
979 break; 1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
980 1291
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1293 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1296 mouse_slip_wheel_speed = 0;
986 else 1297#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1298 break;
995 } 1299 }
996#endif
997 1300
998 case ButtonPress: 1301 case ButtonPress:
999 button_press (ev.xbutton); 1302 button_press (ev.xbutton);
1000 break; 1303 break;
1001 1304
… …
1013 && (ev.xclient.data.l[0] == DndFile 1316 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1317 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1318 || ev.xclient.data.l[0] == DndLink))
1016 { 1319 {
1017 /* Get Dnd data */ 1320 /* Get Dnd data */
1018 Atom ActualType; 1321 Atom ActualType;
1019 int ActualFormat; 1322 int ActualFormat;
1020 unsigned char *data; 1323 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1324 unsigned long Size, RemainingBytes;
1022 1325
1023 XGetWindowProperty (display->display, display->root, 1326 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1327 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1328 0L, 1000000L,
1026 False, AnyPropertyType, 1329 False, AnyPropertyType,
… …
1028 &Size, &RemainingBytes, 1331 &Size, &RemainingBytes,
1029 &data); 1332 &data);
1030 XChangeProperty (display->display, display->root, 1333 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1334 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1335 8, PropModeReplace,
1033 data, STRLEN (data)); 1336 data, strlen (data));
1337 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1340 }
1037#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1038 break; 1342 break;
1039 1343
1040 case MappingNotify: 1344 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1346 break;
1043 1347
1044 /* 1348 /*
1045 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1071 { 1375 {
1072 TermWin.focus = 1; 1376 TermWin.focus = 1;
1073 want_refresh = 1; 1377 want_refresh = 1;
1074#ifdef USE_XIM 1378#ifdef USE_XIM
1075 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1077#endif 1384#endif
1078#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1081#endif 1397#endif
1082 1398
1083 } 1399 }
1084 break; 1400 break;
1085 1401
… …
1091#ifdef USE_XIM 1407#ifdef USE_XIM
1092 if (Input_Context != NULL) 1408 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1409 XUnsetICFocus (Input_Context);
1094#endif 1410#endif
1095#ifdef CURSOR_BLINK 1411#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1412 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1413 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1099#endif 1424#endif
1100 1425
1101 } 1426 }
1102 break; 1427 break;
1103 1428
… …
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1439 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1441
1117 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1); 1443 resize_all_windows (width, height, 1);
1121 } 1444
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1130 { 1447 {
1131 check_our_parents (); 1448 check_our_parents ();
1132 if (am_transparent) 1449 if (am_transparent)
1133 want_full_refresh = 1; 1450 want_refresh = want_full_refresh = 1;
1134 } 1451 }
1135#endif 1452#endif
1136
1137 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1138 break; 1461 break;
1139 1462
1140 case SelectionClear: 1463 case SelectionClear:
1141 selection_clear (); 1464 selection_clear ();
1142 break; 1465 break;
… …
1173 1496
1174 case GraphicsExpose: 1497 case GraphicsExpose:
1175 case Expose: 1498 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1177 { 1500 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1505
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1511
1186 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1513 }
1190 else 1514 else
1191 { 1515 {
1192 XEvent unused_event; 1516 XEvent unused_event;
1193 1517
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1519 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1521 ;
1199 &unused_event)) ; 1522
1200 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1201 { 1524 {
1202 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1203 scrollbar_show (0); 1526 scrollbar_show (0);
1204 } 1527 }
1205#ifdef MENUBAR 1528#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1530 menubar_expose ();
1208#endif 1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1209 } 1537 }
1210 break; 1538 break;
1211 1539
1212 case MotionNotify: 1540 case MotionNotify:
1213#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1219 { 1547 {
1220 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1221 break; 1549 break;
1222 } 1550 }
1223#endif 1551#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break; 1553 break;
1226 1554
1227 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1228 { 1556 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1558 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1232 ; 1560 ;
1233 1561
1234 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (display->display, TermWin.vt,
1235 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1565 & (ev.xbutton.x), & (ev.xbutton.y),
1238 &unused_mask); 1566 &unused_mask);
1239#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1570 {
1243#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1246#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1585 {
1250 int dist; 1586 int dist;
1251 1587
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1256 */ 1590 */
1257 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1593
1260 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1262 */ 1596 */
1263 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1600
1268 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y<TermWin.int_bwidth)
1270 { 1603 {
1271 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1606 }
1274 else 1607 else
1275 { 1608 {
1276 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1611 }
1612
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1282 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1284 } 1618 }
1285 else 1619 else
1286 { 1620 {
1287 /* we are within the text window, so we 1621 /* we are within the text window, so we
1288 * shouldn't be scrolling 1622 * shouldn't be scrolling
1289 */ 1623 */
1290 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1291 } 1626 }
1292#endif 1627#endif
1293#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1294
1295 } 1629 }
1296#endif 1630#endif
1297
1298 } 1631 }
1299 } 1632 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1634 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1303 MotionNotify, &ev)) ; 1636 MotionNotify, &ev)) ;
1304 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (display->display, scrollBar.win,
1305 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1640 & (ev.xbutton.x), & (ev.xbutton.y),
1308 &unused_mask); 1641 &unused_mask);
… …
1314 } 1647 }
1315 break; 1648 break;
1316 } 1649 }
1317} 1650}
1318 1651
1652#if TRANSPARENT
1319void 1653void
1320rxvt_term::rootwin_cb (XEvent &ev) 1654rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1655{
1322 SET_R (this); 1656 SET_R (this);
1323 SET_LOCALE (locale); 1657 SET_LOCALE (locale);
1324 1658
1325 switch (ev.type) 1659 switch (ev.type)
1326 { 1660 {
1327 case PropertyNotify: 1661 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1662 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1663 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1664 * use the property to determine the pixmap. We use it later on.
1340 */ 1665 */
1341 if (xa[XA_XROOTPMAPID] == 0) 1666 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343 1668
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return; 1670 return;
1346 }
1347 1671
1348 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1349 case ReparentNotify: 1673 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1353 break; 1676 break;
1354#endif
1355 } 1677 }
1356} 1678}
1679#endif
1357 1680
1358void 1681void
1359rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1360{ 1683{
1361 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1362 1685
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1687 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1366 /* 1690 /*
1367 * VT window processing of button press 1691 * VT window processing of button press
1368 */ 1692 */
1369 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1370 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1372 if (reportmode) 1705 if (reportmode)
1373 { 1706 {
1374 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
… …
1409 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1410 switch (ev.button) 1743 switch (ev.button)
1411 { 1744 {
1412 case Button1: 1745 case Button1:
1413 /* allow shift+left click to extend selection */ 1746 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1748 {
1416 if (MEvent.button == Button1 && clickintime) 1749 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1750 selection_rotate (ev.x, ev.y);
1418 else 1751 else
1419 selection_extend (ev.x, ev.y, 1); 1752 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1767 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1768 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1769 selection_rotate (ev.x, ev.y);
1437 else 1770 else
1438 selection_extend (ev.x, ev.y, 1); 1771 selection_extend (ev.x, ev.y, 1);
1772
1439 MEvent.button = Button3; 1773 MEvent.button = Button3;
1440 break; 1774 break;
1441 } 1775 }
1442 } 1776 }
1777
1443 MEvent.time = ev.time; 1778 MEvent.time = ev.time;
1444 return; 1779 return;
1445 } 1780 }
1446 1781
1447 /* 1782 /*
… …
1513 upordown = 1; /* down */ 1848 upordown = 1; /* down */
1514 } 1849 }
1515 if (upordown) 1850 if (upordown)
1516 { 1851 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1852#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1853 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1854#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1855 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1856 {
1522 if (upordown < 0) 1857 if (upordown < 0)
1523 scrollBar.setUp (); 1858 scrollBar.setUp ();
… …
1539 break; 1874 break;
1540 case R_SB_ALIGN_BOTTOM: 1875 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1876 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1877 break;
1543 } 1878 }
1879
1544 if (scrollBar.style == R_SB_XTERM 1880 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1881 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1882 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1884
1549 scrollBar.setMotion (); 1885 scrollBar.setMotion ();
1550 break; 1886 break;
1551 1887
1552 case Button1: 1888 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1889 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1913 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1914 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1915 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1916 / scrollbar_size ()));
1581 } 1917 }
1918
1582 break; 1919 break;
1583 } 1920 }
1584 } 1921 }
1585 return; 1922 return;
1586 } 1923 }
… …
1598{ 1935{
1599 int reportmode = 0; 1936 int reportmode = 0;
1600 1937
1601 csrO = 0; /* reset csr Offset */ 1938 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 1939 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1940 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 1941
1605 if (scrollbar_isUpDn ()) 1942 if (scrollbar_isUpDn ())
1606 { 1943 {
1607 scrollBar.setIdle (); 1944 scrollBar.setIdle ();
1608 scrollbar_show (0); 1945 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 1947 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1948#endif
1612
1613 } 1949 }
1950
1614#ifdef SELECTION_SCROLLING 1951#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1952 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop();
1616#endif 1954#endif
1955
1617 if (ev.window == TermWin.vt) 1956 if (ev.window == TermWin.vt)
1618 { 1957 {
1958#if ISO_14755
1959 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return;
1962#endif
1619 if (reportmode) 1963 if (reportmode)
1620 { 1964 {
1621 /* mouse report from vt window */ 1965 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 1966 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 1967 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 1981 MEvent.button = AnyButton;
1638 mouse_report (ev); 1982 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 1983#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 1984 return;
1641 } 1985 }
1986
1642 /* 1987 /*
1643 * dumb hack to compensate for the failure of click-and-drag 1988 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 1989 * when overriding mouse reporting
1645 */ 1990 */
1646 if (PrivateModes & PrivMode_mouse_report 1991 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 1992 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 1993 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 1994 selection_extend (ev.x, ev.y, 0);
1650 1995
1651 switch (ev.button) 1996 switch (ev.button)
… …
1662 case Button5: 2007 case Button5:
1663 { 2008 {
1664 int i; 2009 int i;
1665 page_dirn v; 2010 page_dirn v;
1666 2011
1667 v = (ev.button == Button4) ? UP : DN; 2012 v = ev.button == Button4 ? UP : DN;
2013
1668 if (ev.state & ShiftMask) 2014 if (ev.state & ShiftMask)
1669 i = 1; 2015 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2016 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2017 i = TermWin.nrow - 1;
1672 else 2018 else
1673 i = 5; 2019 i = 5;
2020
1674# ifdef MOUSE_SLIP_WHEELING 2021# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2022 if (ev.state & ControlMask)
1676 { 2023 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2024 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2027
2028 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030
2031 slip_wheel_ev.start ();
1679 } 2032 }
2033 else
2034 {
1680# endif 2035# endif
1681# ifdef JUMP_MOUSE_WHEEL 2036# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 2037 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2038 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2039 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING
1691 } 2049 }
1692# endif 2050#endif
1693
1694 } 2051 }
1695 break; 2052 break;
1696#endif 2053#endif
1697
1698 } 2054 }
1699 } 2055 }
1700#ifdef MENUBAR 2056#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2057 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2058 menubar_control (ev);
1703#endif 2059#endif
1704} 2060}
1705 2061
1706
1707#ifdef TRANSPARENT 2062#ifdef TRANSPARENT
2063#if TINTING
2064/* taken from aterm-0.4.2 */
2065
2066typedef uint32_t RUINT32T;
2067
2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2069{
2070 int sh_r, sh_g, sh_b;
2071 RUINT32T mask_r, mask_g, mask_b;
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i;
2076
2077 Visual* visual = display->visual;
2078
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080
2081 /* for convenience */
2082 mask_r = visual->red_mask;
2083 mask_g = visual->green_mask;
2084 mask_b = visual->blue_mask;
2085
2086 /* boring lookup table pre-initialization */
2087 switch (srcImage->bits_per_pixel) {
2088 case 15:
2089 if ((mask_r != 0x7c00) ||
2090 (mask_g != 0x03e0) ||
2091 (mask_b != 0x001f))
2092 return;
2093 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2094 lookup_r = lookup;
2095 lookup_g = lookup+32;
2096 lookup_b = lookup+32+32;
2097 sh_r = 10;
2098 sh_g = 5;
2099 sh_b = 0;
2100 break;
2101 case 16:
2102 if ((mask_r != 0xf800) ||
2103 (mask_g != 0x07e0) ||
2104 (mask_b != 0x001f))
2105 return;
2106 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2107 lookup_r = lookup;
2108 lookup_g = lookup+32;
2109 lookup_b = lookup+32+64;
2110 sh_r = 11;
2111 sh_g = 5;
2112 sh_b = 0;
2113 break;
2114 case 24:
2115 if ((mask_r != 0xff0000) ||
2116 (mask_g != 0x00ff00) ||
2117 (mask_b != 0x0000ff))
2118 return;
2119 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2120 lookup_r = lookup;
2121 lookup_g = lookup+256;
2122 lookup_b = lookup+256+256;
2123 sh_r = 16;
2124 sh_g = 8;
2125 sh_b = 0;
2126 break;
2127 case 32:
2128 if ((mask_r != 0xff0000) ||
2129 (mask_g != 0x00ff00) ||
2130 (mask_b != 0x0000ff))
2131 return;
2132 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2133 lookup_r = lookup;
2134 lookup_g = lookup+256;
2135 lookup_b = lookup+256+256;
2136 sh_r = 16;
2137 sh_g = 8;
2138 sh_b = 0;
2139 break;
2140 default:
2141 return; /* we do not support this color depth */
2142 }
2143
2144 /* prepare limits for color transformation (each channel is handled separately) */
2145 if (shade < 0) {
2146 shade = -shade;
2147 if (shade < 0) shade = 0;
2148 if (shade > 100) shade = 100;
2149
2150 lower_lim_r = 65535-rm;
2151 lower_lim_g = 65535-gm;
2152 lower_lim_b = 65535-bm;
2153
2154 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2155 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2156 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2157
2158 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2159 } else {
2160 if (shade < 0) shade = 0;
2161 if (shade > 100) shade = 100;
2162
2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2164
2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2168 }
2169
2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2172 {
2173 unsigned int tmp;
2174
2175 tmp = lower_lim_r;
2176 lower_lim_r = lower_lim_b;
2177 lower_lim_b = tmp;
2178
2179 tmp = upper_lim_r;
2180 upper_lim_r = upper_lim_b;
2181 upper_lim_b = tmp;
2182 }
2183
2184 /* fill our lookup tables */
2185 for (i = 0; i <= mask_r>>sh_r; i++)
2186 {
2187 RUINT32T tmp;
2188 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2189 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2190 lookup_r[i] = (tmp/65535)<<sh_r;
2191 }
2192 for (i = 0; i <= mask_g>>sh_g; i++)
2193 {
2194 RUINT32T tmp;
2195 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2196 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2197 lookup_g[i] = (tmp/65535)<<sh_g;
2198 }
2199 for (i = 0; i <= mask_b>>sh_b; i++)
2200 {
2201 RUINT32T tmp;
2202 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2203 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2204 lookup_b[i] = (tmp/65535)<<sh_b;
2205 }
2206
2207 /* apply table to input image (replacing colors by newly calculated ones) */
2208 switch (srcImage->bits_per_pixel)
2209 {
2210 case 15:
2211 {
2212 unsigned short *p1, *pf, *p, *pl;
2213 p1 = (unsigned short *) srcImage->data;
2214 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2215 while (p1 < pf)
2216 {
2217 p = p1;
2218 pl = p1 + srcImage->width;
2219 for (; p < pl; p++)
2220 {
2221 *p = lookup_r[(*p & 0x7c00)>>10] |
2222 lookup_g[(*p & 0x03e0)>> 5] |
2223 lookup_b[(*p & 0x001f)];
2224 }
2225 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2226 }
2227 break;
2228 }
2229 case 16:
2230 {
2231 unsigned short *p1, *pf, *p, *pl;
2232 p1 = (unsigned short *) srcImage->data;
2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2234 while (p1 < pf)
2235 {
2236 p = p1;
2237 pl = p1 + srcImage->width;
2238 for (; p < pl; p++)
2239 {
2240 *p = lookup_r[(*p & 0xf800)>>11] |
2241 lookup_g[(*p & 0x07e0)>> 5] |
2242 lookup_b[(*p & 0x001f)];
2243 }
2244 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2245 }
2246 break;
2247 }
2248 case 24:
2249 {
2250 unsigned char *p1, *pf, *p, *pl;
2251 p1 = (unsigned char *) srcImage->data;
2252 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2253 while (p1 < pf)
2254 {
2255 p = p1;
2256 pl = p1 + srcImage->width * 3;
2257 for (; p < pl; p += 3)
2258 {
2259 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2260 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2261 p[2] = lookup_r[(p[2] & 0x0000ff)];
2262 }
2263 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2264 }
2265 break;
2266 }
2267 case 32:
2268 {
2269 RUINT32T *p1, *pf, *p, *pl;
2270 p1 = (RUINT32T *) srcImage->data;
2271 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2272
2273 while (p1 < pf)
2274 {
2275 p = p1;
2276 pl = p1 + srcImage->width;
2277 for (; p < pl; p++)
2278 {
2279 *p = lookup_r[(*p & 0xff0000)>>16] |
2280 lookup_g[(*p & 0x00ff00)>> 8] |
2281 lookup_b[(*p & 0x0000ff)] |
2282 (*p & ~0xffffff);
2283 }
2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2285 }
2286 break;
2287 }
2288 }
2289
2290 free (lookup);
2291}
2292#endif
2293
1708/* 2294/*
1709 * Check our parents are still who we think they are. 2295 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2296 * Do transparency updates if required
1711 */ 2297 */
1712int 2298int
1713rxvt_term::check_our_parents () 2299rxvt_term::check_our_parents ()
1714{ 2300{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2301 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2302 unsigned long nitems, bytes_after;
1717 Atom atype; 2303 Atom atype;
1718 unsigned char *prop = NULL; 2304 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2305 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2306 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2307 XWindowAttributes wattr, wrootattr;
1722 2308
1723 pchanged = 0; 2309 pchanged = 0;
1724 2310
1725 if (! (Options & Opt_transparent)) 2311 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2312 return pchanged; /* Don't try any more */
1727 2313
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2315 rootdepth = wrootattr.depth;
1730 2316
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2318
1732 if (rootdepth != wattr.depth) 2319 if (rootdepth != wattr.depth)
1733 { 2320 {
1734 if (am_transparent) 2321 if (am_transparent)
1735 { 2322 {
1736 pchanged = 1; 2323 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2325 am_transparent = am_pixmap_trans = 0;
1740 } 2326 }
2327
1741 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1742 } 2329 }
1743 2330
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2331 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2332 XSync (display->display, False);
… …
1747 /* 2334 /*
1748 * Make the frame window set by the window manager have 2335 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2336 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2337 * windows for each client, so we have to take care about that.
1751 */ 2338 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2339 i = (xa[XA_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2342 &nitems, &bytes_after, &prop) == Success);
2343
1756 if (!i || prop == NULL) 2344 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success);
2349
2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
1757 have_pixmap = 0; 2355 have_pixmap = 0;
1758 else 2356 else
1759 { 2357 {
1760 have_pixmap = 1; 2358 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2359 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2360 XFree (prop);
1763 } 2361 }
2362
1764 if (have_pixmap) 2363 if (have_pixmap)
1765 { 2364 {
1766 /* 2365 /*
1767 * Copy display->root pixmap transparency 2366 * Copy display->root pixmap transparency
1768 */ 2367 */
… …
1772 XImage *image; 2371 XImage *image;
1773 GC gc; 2372 GC gc;
1774 XGCValues gcvalue; 2373 XGCValues gcvalue;
1775 2374
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2376 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2377 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2378 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2379 nx = ny = 0;
1781 2380
1782 if (sx < 0) 2381 if (sx < 0)
… …
1794 } 2393 }
1795 2394
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1; 2397 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2399
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2401 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2402 allowedxerror = 0;
2403
1804 if (image == NULL) 2404 if (image == NULL)
1805 { 2405 {
1806 if (am_transparent && am_pixmap_trans) 2406 if (am_transparent && am_pixmap_trans)
1807 { 2407 {
1808 pchanged = 1; 2408 pchanged = 1;
… …
1810 { 2410 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2411 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2412 TermWin.pixmap = None;
1813 } 2413 }
1814 } 2414 }
2415
1815 am_pixmap_trans = 0; 2416 am_pixmap_trans = 0;
1816 } 2417 }
1817 else 2418 else
1818 { 2419 {
1819 if (TermWin.pixmap != None) 2420 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2421 XFreePixmap (display->display, TermWin.pixmap);
2422
2423#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint))
2425 {
2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2428
2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2430
2431 ShadeXImage (display, image, shade, rm, gm, bm);
2432 }
2433#endif
2434
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2436 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2439 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2440 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2441 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2443 XClearWindow (display->display, TermWin.parent[0]);
2444
1833 if (!am_transparent || !am_pixmap_trans) 2445 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2446 pchanged = 1;
2447
1835 am_transparent = am_pixmap_trans = 1; 2448 am_transparent = am_pixmap_trans = 1;
1836 } 2449 }
1837 } 2450 }
1838 2451
1839 if (!am_pixmap_trans) 2452 if (!am_pixmap_trans)
1840 { 2453 {
1841 unsigned int n; 2454 unsigned int n;
1842 /* 2455 /*
1843 * InheritPixmap transparency 2456 * InheritPixmap transparency
1844 */ 2457 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2459 {
1849 oldp = TermWin.parent[i]; 2460 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2462 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2463 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2464
1854 if (TermWin.parent[i] == display->root) 2465 if (TermWin.parent[i] == display->root)
1855 { 2466 {
1856 if (oldp != None) 2467 if (oldp != None)
1857 pchanged = 1; 2468 pchanged = 1;
2469
1858 break; 2470 break;
1859 } 2471 }
2472
1860 if (oldp != TermWin.parent[i]) 2473 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2474 pchanged = 1;
1862 } 2475 }
1863 2476
1864 n = 0; 2477 n = 0;
… …
1866 if (pchanged) 2479 if (pchanged)
1867 { 2480 {
1868 for (; n < (unsigned int)i; n++) 2481 for (; n < (unsigned int)i; n++)
1869 { 2482 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2485 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2487 break;
1876 } 2488 }
1877 } 2489 }
1878 } 2490 }
1879 2491
1880 if (n > (int) (sizeof (TermWin.parent) 2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2493 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2496 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2497 /* XXX: also turn off Opt_transparent? */
1890 } 2498 }
1891 else 2499 else
1892 { 2500 {
2501#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2502 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2503 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2504 sleep (1);
1903# endif 2505#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2511
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2513 am_transparent = 1;
1911 } 2514 }
1912 2515
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2517 TermWin.parent[i] = None;
1915 } 2518 }
2519
2520 // this is experimental
2521 if (scrollBar.win)
2522 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle ();
2526 scrollbar_show (0);
2527 }
2528
1916 return pchanged; 2529 return pchanged;
1917} 2530}
1918#endif 2531#endif
1919 2532
1920/*}}} */ 2533/*}}} */
… …
1935 } 2548 }
1936 2549
1937 if (ch == NOCHAR) // TODO: improve 2550 if (ch == NOCHAR) // TODO: improve
1938 break; 2551 break;
1939 2552
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 {
2555 if (!seen_input)
1941 { 2556 {
2557 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong.
2562 kill (-cmd_pid, SIGWINCH);
2563 }
2564
1942 /* Read a text string from the input buffer */ 2565 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2566 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2567 bool refreshnow = false;
1945 int nlines = 0; 2568 int nlines = 0;
1946 unicode_t *str = buf; 2569 unicode_t *str = buf;
1947 2570
1948 *str++ = ch;
1949
1950 for (;;) 2571 for (;;)
1951 { 2572 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2574 break;
1957 2575
1958 *str++ = ch; 2576 *str++ = ch;
1959 2577
1960 if (ch == '\n') 2578 if (ch == C0_LF)
1961 { 2579 {
1962 nlines++; 2580 nlines++;
1963 refresh_count++; 2581 refresh_count++;
1964 2582
1965 if (! (Options & Opt_jumpScroll) 2583 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2585 {
1968 refreshnow = true; 2586 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2587 ch = NOCHAR;
1971 break; 2588 break;
1972 } 2589 }
1973 2590
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2592 if (nlines >= TermWin.nrow - 1)
1976 { 2593 {
1977 scr_add_lines (buf, nlines, str - buf); 2594 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2595 nlines = 0;
1979 str = buf; 2596 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2600 if (str >= buf + UBUFSIZ)
1984 { 2601 {
1985 ch = NOCHAR; 2602 ch = NOCHAR;
1986 break; 2603 break;
1987 } 2604 }
2605
2606 seq_begin = cmdbuf_ptr;
2607 ch = next_char ();
1988 } 2608 }
1989 2609
1990 scr_add_lines (buf, nlines, str - buf); 2610 scr_add_lines (buf, nlines, str - buf);
1991 2611
1992 /* 2612 /*
1993 * If there have been a lot of new lines, then update the screen 2613 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2614 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2615 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2616 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2617 */
2001 if (refreshnow) 2618 if (refreshnow)
2002 { 2619 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2621 refresh_limit++;
2005 2622 else
2623 {
2624 flag = true;
2006 scr_refresh (refresh_type); 2625 scr_refresh (refresh_type);
2626 }
2007 } 2627 }
2008 2628
2009 } 2629 }
2010 else 2630 else
2011 { 2631 {
… …
2025 } 2645 }
2026 2646
2027 return flag; 2647 return flag;
2028} 2648}
2029 2649
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2030// read the next character 2659// read the next character
2031unicode_t 2660unicode_t
2032rxvt_term::next_char () 2661rxvt_term::next_char ()
2033{ 2662{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2663 while (cmdbuf_ptr < cmdbuf_endp)
… …
2065 */ 2694 */
2066unicode_t 2695unicode_t
2067rxvt_term::cmd_getc () 2696rxvt_term::cmd_getc ()
2068{ 2697{
2069 unicode_t c = next_char (); 2698 unicode_t c = next_char ();
2699
2700 if (c == NOCHAR)
2701 throw out_of_input;
2702
2703 return c;
2704}
2705
2706unicode_t
2707rxvt_term::cmd_get8 ()
2708{
2709 unicode_t c = next_octet ();
2070 2710
2071 if (c == NOCHAR) 2711 if (c == NOCHAR)
2072 throw out_of_input; 2712 throw out_of_input;
2073 2713
2074 return c; 2714 return c;
… …
2156/*}}} */ 2796/*}}} */
2157 2797
2158/* *INDENT-OFF* */ 2798/* *INDENT-OFF* */
2159enum { 2799enum {
2160 C1_40 = 0x40, 2800 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2801 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2802 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2803 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2804 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2805};
2166/* *INDENT-ON* */ 2806/* *INDENT-ON* */
2167 2807
2168/*{{{ process non-printing single characters */ 2808/*{{{ process non-printing single characters */
2169void 2809void
… …
2174 case C0_ESC: 2814 case C0_ESC:
2175 process_escape_seq (); 2815 process_escape_seq ();
2176 break; 2816 break;
2177 case C0_ENQ: /* terminal Status */ 2817 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2818 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2821 else
2183 tt_write ((unsigned char *)VT100_ANS, 2822 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2823 (unsigned int)strlen (VT100_ANS));
2185 break; 2824 break;
2186 case C0_BEL: /* bell */ 2825 case C0_BEL: /* bell */
2187 scr_bell (); 2826 scr_bell ();
2188 break; 2827 break;
2189 case C0_BS: /* backspace */ 2828 case C0_BS: /* backspace */
… …
2205 break; 2844 break;
2206 case C0_SI: /* shift in - acs */ 2845 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2846 scr_charset_choose (0);
2208 break; 2847 break;
2209 2848
2849#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2850 // 8-bit controls
2211 case 0x90: /* DCS */ 2851 case 0x90: /* DCS */
2212 process_dcs_seq (); 2852 process_dcs_seq ();
2213 break; 2853 break;
2214 case 0x9b: /* CSI */ 2854 case 0x9b: /* CSI */
2215 process_csi_seq (); 2855 process_csi_seq ();
2216 break; 2856 break;
2217 case 0x9d: /* CSI */ 2857 case 0x9d: /* CSI */
2218 process_osc_seq (); 2858 process_osc_seq ();
2219 break; 2859 break;
2860#endif
2220 } 2861 }
2221} 2862}
2222/*}}} */ 2863/*}}} */
2223 2864
2224 2865
… …
2286void 2927void
2287rxvt_term::process_escape_seq () 2928rxvt_term::process_escape_seq ()
2288{ 2929{
2289 unicode_t ch = cmd_getc (); 2930 unicode_t ch = cmd_getc ();
2290 2931
2291 if (PrivateModes & PrivMode_vt52) 2932 if (priv_modes & PrivMode_vt52)
2292 { 2933 {
2293 process_escape_vt52 (ch); 2934 process_escape_vt52 (ch);
2294 return; 2935 return;
2295 } 2936 }
2296 2937
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2952 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2953 break;
2313 case '+': 2954 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2955 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2956 break;
2316#ifndef NO_FRILLS 2957#if ENABLE_FRILLS
2317 case '6': 2958 case '6':
2318 scr_backindex (); 2959 scr_backindex ();
2319 break; 2960 break;
2320#endif 2961#endif
2321 case '7': 2962 case '7':
2322 scr_cursor (SAVE); 2963 scr_cursor (SAVE);
2323 break; 2964 break;
2324 case '8': 2965 case '8':
2325 scr_cursor (RESTORE); 2966 scr_cursor (RESTORE);
2326 break; 2967 break;
2327#ifndef NO_FRILLS 2968#if ENABLE_FRILLS
2328 case '9': 2969 case '9':
2329 scr_forwardindex (); 2970 scr_forwardindex ();
2330 break; 2971 break;
2331#endif 2972#endif
2332 case '=': 2973 case '=':
… …
2342 break; 2983 break;
2343 2984
2344 /* 8.3.87: NEXT LINE */ 2985 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2986 case C1_NEL: /* ESC E */
2346 { 2987 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2988 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2989 scr_add_lines (nlcr, 1, 2);
2349 } 2990 }
2350 break; 2991 break;
2351 2992
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2993 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3004 case C1_RI: /* ESC M */
2364 scr_index (DN); 3005 scr_index (DN);
2365 break; 3006 break;
2366 3007
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3008 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3009 /*case C1_SS2: scr_single_shift (2); break; */
2369 3010
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3011 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3012 /*case C1_SS3: scr_single_shift (3); break; */
2372 3013
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3014 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3015 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3016 process_dcs_seq ();
2376 break; 3017 break;
… …
2391 process_osc_seq (); 3032 process_osc_seq ();
2392 break; 3033 break;
2393 3034
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3035 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3036 case 'c':
3037 mbstate.reset ();
2396 scr_poweron (); 3038 scr_poweron ();
2397 scrollbar_show (1); 3039 scrollbar_show (1);
2398 break; 3040 break;
2399 3041
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3042 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3054
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3055/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3056/* *INDENT-OFF* */
2415enum { 3057enum {
2416 CSI_ICH = 0x40, 3058 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3059 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3060 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3061 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3062 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3063 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3064 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3079 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3080 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3081 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3082 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3083 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3084 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3085 };
2444/* *INDENT-ON* */ 3086/* *INDENT-ON* */
2445 3087
2446void 3088void
2447rxvt_term::process_csi_seq () 3089rxvt_term::process_csi_seq ()
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3273 break;
2632 3274
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3276 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3277 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3278 break;
2637 3279
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3281 process_sgr_mode (nargs, arg);
2640 break; 3282 break;
… …
2646 tt_printf ("\033[0n"); 3288 tt_printf ("\033[0n");
2647 break; 3289 break;
2648 case 6: /* CPR requested */ 3290 case 6: /* CPR requested */
2649 scr_report_position (); 3291 scr_report_position ();
2650 break; 3292 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3293 case 7: /* unofficial extension */
3294 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3295 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3296 break;
2655#endif
2656 case 8: /* unofficial extension */ 3297 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3299 break;
2659 } 3300 }
2660 break; 3301 break;
2661 3302
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3303 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3336 break;
2696 3337
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3338 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3339 if (arg[0] == 4)
2699 scr_insert_mode (0); 3340 scr_insert_mode (0);
3341 else if (arg[0] == 20)
3342 priv_modes &= ~PrivMode_LFNL;
2700 break; 3343 break;
2701 3344
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3345 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3346 if (arg[0] == 4)
2704 scr_insert_mode (1); 3347 scr_insert_mode (1);
3348 else if (arg[0] == 20)
3349 priv_modes |= PrivMode_LFNL;
2705 break; 3350 break;
2706 3351
2707 /* 3352 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3353 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3354 */
… …
2721 break; 3366 break;
2722 case CSI_75: 3367 case CSI_75:
2723 scr_cursor (RESTORE); 3368 scr_cursor (RESTORE);
2724 break; 3369 break;
2725 3370
2726#ifndef NO_FRILLS 3371#if ENABLE_FRILLS
2727 case CSI_74: 3372 case CSI_74:
2728 process_window_ops (arg, nargs); 3373 process_window_ops (arg, nargs);
2729 break; 3374 break;
2730#endif 3375#endif
2731 3376
… …
2738 break; 3383 break;
2739 } 3384 }
2740} 3385}
2741/*}}} */ 3386/*}}} */
2742 3387
2743#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2744/* ARGSUSED */ 3389/* ARGSUSED */
2745void 3390void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3391rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3392{
2748 int x, y; 3393 int x, y;
… …
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3446 break;
2802 case 13: /* report window position */ 3447 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3450 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3451 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3452 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3453 break;
2809 case 14: /* report window size (pixels) */ 3454 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
… …
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3460 break;
2816 case 19: /* report window size (chars) */ 3461 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3463 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3464 case 20: /* report icon label */
3465 {
3466 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3467 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s);
3470 }
2823 break; 3471 break;
2824 case 21: /* report window title */ 3472 case 21: /* report window title */
3473 {
3474 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3475 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s);
3478 }
2827 break; 3479 break;
2828#endif
2829 } 3480 }
2830} 3481}
2831#endif 3482#endif
2832 3483
2833/*----------------------------------------------------------------------*/ 3484/*----------------------------------------------------------------------*/
2834/* 3485/*
2835 * get input up until STRING TERMINATOR (or BEL) 3486 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3487 * ends_how is terminator used. returned input must be free()'d
2837 */ 3488 */
2838unsigned char * 3489unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3490rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3491{
2841 int seen_esc = 0; /* seen escape? */ 3492 unicode_t prev = 0, ch;
2842 unsigned int n = 0; 3493 unsigned int n = 0;
2843 unsigned char *s; 3494 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3495 unsigned char string[STRING_MAX];
2846 3496
2847 while ((ch = cmd_getc ())) 3497 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3498 {
2849 if (ch == C0_BEL
2850 || ch == CHAR_ST
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2852 break;
2853
2854 if (ch == C0_ESC) 3499 if (prev == C0_ESC)
2855 {
2856 seen_esc = 1;
2857 continue;
2858 } 3500 {
2859 else if (ch == '\t') 3501 if (ch == 0x5c) /* 7bit ST */
2860 ch = ' '; /* translate '\t' to space */ 3502 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3503 else
3504 return NULL;
3505 }
3506 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break;
3508 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3509 return NULL; /* other control character - exit */
2863 3510
2864 if (n < sizeof (string) - 1) 3511 if (n >= sizeof (string) - 1)
3512 // stop at some sane length
3513 return NULL;
3514
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
2865 string[n++] = ch; 3521 string[n++] = prev = ch;
2866
2867 seen_esc = 0;
2868 } 3522 }
2869 3523
2870 string[n++] = '\0'; 3524 string[n++] = '\0';
2871 3525
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL; 3527 return NULL;
2874 3528
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3529 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3530 strncpy (s, string, n);
2877 return s; 3531 return s;
2878} 3532}
2879 3533
2880/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
2881/* 3535/*
… …
2915 { 3569 {
2916 unsigned char *s = get_to_st (eh); 3570 unsigned char *s = get_to_st (eh);
2917 3571
2918 if (s) 3572 if (s)
2919 { 3573 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3574 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3575 free (s);
2934 } 3576 }
2935 } 3577 }
2936} 3578}
3579
3580void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3582{
3583 if (str[0] == '?' && !str[1])
3584 {
3585 unsigned short r, g, b;
3586 pix_colors_focused[color].get (display, r, g, b);
3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3588 }
3589 else
3590 set_window_color (color, str);
3591}
3592
2937/* 3593/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3595 * 0 = change iconName/title
2940 * 1 = change iconName 3596 * 1 = change iconName
2941 * 2 = change title 3597 * 2 = change title
2942 * 4 = change color 3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
2943 * 12 = change text color 3601 * 12 = change text color
2944 * 13 = change mouse foreground color 3602 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3603 * 17 = change highlight character colour
2946 * 18 = change bold character color 3604 * 18 = change bold character color
2947 * 19 = change underlined character color 3605 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3606 * 46 = change logfile (not implemented)
2949 * 50 = change font 3607 * 50 = change font
2950 * 3608 *
2951 * rxvt extensions: 3609 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3610 * 20 = bg pixmap
2954 * 39 = change default fg color 3611 * 39 = change default fg color
2955 * 49 = change default bg color 3612 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3613 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3614 * 701 = change locale
2958 * 702 = find font 3615 * 702 = find font
3616 * 703 = menu
2959 */ 3617 */
2960void 3618void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3620{
2963 int changed = 0; 3621 int changed = 0;
2964 int color; 3622 int color;
2965 char *buf, *name; 3623 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1];
2966 3625
2967 assert (str != NULL); 3626 assert (str != NULL);
2968 switch (op) 3627 switch (op)
2969 { 3628 {
2970 case XTerm_name: 3629 case XTerm_name:
… …
2974 set_icon_name (str); 3633 set_icon_name (str);
2975 break; 3634 break;
2976 case XTerm_title: 3635 case XTerm_title:
2977 set_title (str); 3636 set_title (str);
2978 break; 3637 break;
3638 case XTerm_property:
3639 if (str[0] == '?')
3640 {
3641 Atom prop = XInternAtom (display->display, str + 1, True);
3642 Atom actual_type;
3643 int actual_format;
3644 unsigned long nitems;
3645 unsigned long bytes_after;
3646 unsigned char *value = 0;
3647 const char *str = "";
3648
3649 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None
3655 && actual_format == 8)
3656 str = (const char *)(value);
3657
3658 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3659
3660 XFree (value);
3661 }
3662 else
3663 {
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665
3666 if (eq)
3667 {
3668 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0],
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 }
3674 else
3675 XDeleteProperty (display->display, TermWin.parent[0],
3676 display->atom (str));
3677 }
3678 break;
3679
2979 case XTerm_Color: 3680 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3681 for (buf = (char *)str; buf && *buf;)
2981 { 3682 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3683 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3684 break;
2984 3685
2985 *name++ = '\0'; 3686 *name++ = '\0';
2986 color = atoi (buf); 3687 color = atoi (buf);
2987 3688
2988 if (color < 0 || color >= TOTAL_COLORS) 3689 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3690 break;
2990 3691
2991 if ((buf = STRCHR (name, ';')) != NULL) 3692 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3693 *buf++ = '\0';
2993 3694
3695 if (name[0] == '?' && !name[1])
3696 {
3697 unsigned short r, g, b;
3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3700 }
3701 else
2994 set_window_color (color + minCOLOR, name); 3702 set_window_color (color + minCOLOR, name);
2995 } 3703 }
3704 break;
3705 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3707 break;
3708 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3710 break;
2997#ifndef NO_CURSORCOLOR 3711#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3712 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3714 break;
3001#endif 3715#endif
3002 case XTerm_Color_pointer: 3716 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3717 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3718 break;
3719 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3721 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3722#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3723 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3724 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3725 break;
3009 case XTerm_Color_UL: 3726 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3728 break;
3012 case XTerm_Color_RV: 3729 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3731 break;
3015#endif 3732#endif
3016 3733
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap: 3734 case XTerm_Pixmap:
3024 if (*str != ';') 3735 if (*str != ';')
3025 { 3736 {
3026#if XPM_BACKGROUND 3737#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3738 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3739 set_bgPixmap (str); /* change pixmap */
3029#endif 3740#endif
3030 scr_touch (true); 3741 scr_touch (true);
3031 } 3742 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3743 while ((str = strchr (str, ';')) != NULL)
3033 { 3744 {
3034 str++; 3745 str++;
3035#if XPM_BACKGROUND 3746#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3747 changed += scale_pixmap (str);
3037#endif 3748#endif
… …
3050 set_window_color (Color_fg, str); 3761 set_window_color (Color_fg, str);
3051 break; 3762 break;
3052 case XTerm_restoreBG: 3763 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3764 set_window_color (Color_bg, str);
3054 break; 3765 break;
3766
3055 case XTerm_logfile: 3767 case XTerm_logfile:
3056 // TODO, when secure mode? 3768 // TODO, when secure mode?
3057 break; 3769 break;
3770
3058 case XTerm_font: 3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3059 change_font (str); 3778 change_font (str);
3060 break; 3779 break;
3061#ifndef NO_FRILLS 3780
3781#if ENABLE_FRILLS
3062 case XTerm_locale: 3782 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3783 if (query)
3064 tt_printf ("%-.250s\n", locale); 3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3065 else 3785 else
3066 { 3786 {
3067 set_locale (str); 3787 set_locale (str);
3068# ifdef USE_XIM 3788# ifdef USE_XIM
3069 im_cb (); 3789 im_cb ();
3070# endif 3790# endif
3071 } 3791 }
3072 break; 3792 break;
3793
3073 case XTerm_findfont: 3794 case XTerm_findfont:
3074 { 3795 {
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3796 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3077 } 3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR
3806 case XTerm_Menu:
3807 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3078 break; 3809 break;
3079#endif 3810#endif
3080#if 0 3811#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3812 case XTerm_dumpscreen: /* no error notices */
3082 { 3813 {
3083 int fd; 3814 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3816 {
3086 scr_dump (fd); 3817 scr_dump (fd);
3087 close (fd); 3818 close (fd);
3088 } 3819 }
… …
3108{ 3839{
3109 int state; 3840 int state;
3110 3841
3111 if (mode == 's') 3842 if (mode == 's')
3112 { 3843 {
3113 SavedModes |= (PrivateModes & bit); 3844 SavedModes |= (priv_modes & bit);
3114 return -1; 3845 return -1;
3115 } 3846 }
3116 else 3847 else
3117 { 3848 {
3118 if (mode == 'r') 3849 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3851 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3852 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3853 PrivMode (state, bit);
3123 } 3854 }
3124 3855
3125 return state; 3856 return state;
3126} 3857}
… …
3144 { 3, PrivMode_132 }, 3875 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3876 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3877 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3878 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3879 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3881 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3882#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3883 { menuBar_esc, PrivMode_menuBar },
3152#endif 3884#endif
3885 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3887#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3888 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3889#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3890 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3891 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3892 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3893 // 45 margin bell NYI
3163 // 46 start logging 3894 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3906 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3907 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3908 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3909 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3910 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3911 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3912 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3913 };
3183 3914
3184 if (nargs == 0) 3915 if (nargs == 0)
3185 return; 3916 return;
… …
3204 3935
3205 /* extra handling for values with state unkept */ 3936 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3937 switch (arg[i])
3207 { 3938 {
3208 case 1048: /* alternative cursor save */ 3939 case 1048: /* alternative cursor save */
3209 case 1049: 3940 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 3941 if (mode == 0)
3211 scr_cursor (RESTORE); 3942 scr_cursor (RESTORE);
3212 else if (mode == 1) 3943 else if (mode == 1)
3213 scr_cursor (SAVE); 3944 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3945 break;
3215 } 3946 }
3216 3947
3217 if (state >= 0) 3948 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3949 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3950 switch (arg[i])
… …
3225 * within VT52 mode 3956 * within VT52 mode
3226 */ 3957 */
3227 PrivMode (1, PrivMode_vt52); 3958 PrivMode (1, PrivMode_vt52);
3228 break; 3959 break;
3229 case 3: /* 80/132 */ 3960 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3961 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 3963 break;
3233 case 4: /* smooth scrolling */ 3964 case 4: /* smooth scrolling */
3234 if (state) 3965 if (state)
3235 Options &= ~Opt_jumpScroll; 3966 options &= ~Opt_jumpScroll;
3236 else 3967 else
3237 Options |= Opt_jumpScroll; 3968 options |= Opt_jumpScroll;
3238 break; 3969 break;
3239 case 5: /* reverse video */ 3970 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3971 scr_rvideo_mode (state);
3241 break; 3972 break;
3242 case 6: /* relative/absolute origins */ 3973 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3974 scr_relative_origin (state);
3244 break; 3975 break;
3245 case 7: /* autowrap */ 3976 case 7: /* autowrap */
3246 scr_autowrap (state); 3977 scr_autowrap (state);
3247 break; 3978 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3979 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3980 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3981 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3982 priv_modes &= ~PrivMode_MouseX11;
3252 break; 3983 break;
3253#ifdef menuBar_esc 3984#ifdef menuBar_esc
3254 case menuBar_esc: 3985 case menuBar_esc:
3255#ifdef MENUBAR 3986#ifdef MENUBAR
3256 map_menuBar (state); 3987 map_menuBar (state);
… …
3267 break; 3998 break;
3268#endif 3999#endif
3269 case 25: /* visible/invisible cursor */ 4000 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4001 scr_cursor_visible (state);
3271 break; 4002 break;
3272 /* case 35: - shift keys */ 4003 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4004 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4005 case 47: /* secondary screen */
3275 scr_change_screen (state); 4006 scr_change_screen (state);
3276 break; 4007 break;
3277 /* case 66: - application key pad */ 4008 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4009 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4010 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4011 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4012 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4013 break;
3283#if 0 4014#if 0
3284 case 1001: 4015 case 1001:
3285 break; /* X11 mouse highlighting */ 4016 break; /* X11 mouse highlighting */
3286#endif 4017#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4018 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4019 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4020 options &= ~Opt_scrollTtyOutput;
3290 else 4021 else
3291 Options |= Opt_scrollTtyOutput; 4022 options |= Opt_scrollTtyOutput;
3292 break; 4023 break;
3293 case 1011: /* scroll to bottom on key press */ 4024 case 1011: /* scroll to bottom on key press */
3294 if (state) 4025 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4026 options |= Opt_scrollTtyKeypress;
3296 else 4027 else
3297 Options &= ~Opt_scrollTtyKeypress; 4028 options &= ~Opt_scrollTtyKeypress;
3298 break; 4029 break;
3299 case 1047: /* secondary screen w/ clearing */ 4030 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4031 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4032 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4033 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4034 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4035 break;
4036 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen)
4039 if (current_screen != PRIMARY)
4040 scr_erase_screen (2);
4041 break;
3306 default: 4042 default:
3307 break; 4043 break;
3308 } 4044 }
3309 } 4045 }
3310} 4046}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4069 rendset = 0, rendstyle = ~RS_None;
3334 break; 4070 break;
3335 case 1: 4071 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4072 rendset = 1, rendstyle = RS_Bold;
3337 break; 4073 break;
4074 //case 2: // faint or second colour
4075 //case 3: // italic
3338 case 4: 4076 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4077 rendset = 1, rendstyle = RS_Uline;
3340 break; 4078 break;
3341 case 5: 4079 case 5: // slowly blinking
4080 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4081 rendset = 1, rendstyle = RS_Blink;
3343 break; 4082 break;
4083 //case 6: // scoansi light background
3344 case 7: 4084 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4085 rendset = 1, rendstyle = RS_RVid;
3346 break; 4086 break;
3347 case 8: 4087 case 8:
3348 // invisible. NYI 4088 // invisible. NYI
3349 break; 4089 break;
4090 //case 9: // crossed out
4091 //case 10: // scoansi acs off, primary font
4092 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font
4094 //...
4095 //case 19: // ninth alt font
4096 //case 20: // gothic
4097 case 21: // disable bold, faint
4098 rendset = 0, rendstyle = RS_Bold;
4099 break;
3350 case 22: 4100 case 22:
3351 rendset = 0, rendstyle = RS_Bold; 4101 rendset = 0, rendstyle = RS_Bold;
3352 break; 4102 break;
4103 //case 23: disable italic
3353 case 24: 4104 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4105 rendset = 0, rendstyle = RS_Uline;
3355 break; 4106 break;
3356 case 25: 4107 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4108 rendset = 0, rendstyle = RS_Blink;
3358 break; 4109 break;
4110 case 26:
4111 rendset = 0, rendstyle = RS_Blink;
4112 break;
3359 case 27: 4113 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4114 rendset = 0, rendstyle = RS_RVid;
3361 break; 4115 break;
3362 case 28:
3363 // visible. NYI 4116 //case 28: // visible. NYI
3364 break; 4117 //case 29: // not crossed-out
3365 } 4118 }
3366 4119
3367 if (rendset != -1) 4120 if (rendset != -1)
3368 { 4121 {
3369 scr_rendition (rendset, rendstyle); 4122 scr_rendition (rendset, rendstyle);
… …
3446 } 4199 }
3447 } 4200 }
3448} 4201}
3449/*}}} */ 4202/*}}} */
3450 4203
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4204/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4205void
3453rxvt_term::process_graphics () 4206rxvt_term::process_graphics ()
3454{ 4207{
3455 unicode_t ch, cmd = cmd_getc (); 4208 unicode_t ch, cmd = cmd_getc ();
3456 4209
3457 if (cmd == 'Q') 4210 if (cmd == 'Q')
3458 { /* query graphics */ 4211 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4212 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4213 return;
3461 } 4214 }
3462 /* swallow other graphics sequences until terminating ':' */ 4215 /* swallow other graphics sequences until terminating ':' */
3463 do 4216 do
3464 ch = cmd_getc (); 4217 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4232 unsigned char buf[256];
3480 4233
3481 va_start (arg_ptr, fmt); 4234 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4236 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4237 tt_write (buf, strlen (buf));
3485} 4238}
3486 4239
3487/* ---------------------------------------------------------------------- */ 4240/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4241/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4242 * or generated by us in response to a query ESC sequence.
… …
3495 4248
3496 if (len) 4249 if (len)
3497 { 4250 {
3498 if (v_buflen == 0) 4251 if (v_buflen == 0)
3499 { 4252 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3501 4254
3502 if ((unsigned int)written == len) 4255 if ((unsigned int)written == len)
3503 return; 4256 return;
3504 4257
3505 data += written; 4258 data += written;
… …
3513 v_buflen += len; 4266 v_buflen += len;
3514 } 4267 }
3515 4268
3516 for (;;) 4269 for (;;)
3517 { 4270 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519 4272
3520 if (written > 0) 4273 if (written > 0)
3521 { 4274 {
3522 v_buflen -= written; 4275 v_buflen -= written;
3523 4276

Diff Legend

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