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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC

… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
… …
674 IMSendSpot (); 932 IMSendSpot ();
675#endif 933#endif
676 } 934 }
677 935
678 display->flush (); 936 display->flush ();
679
680 flush_ev.stop ();
681} 937}
682 938
683void 939void
684rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
685{ 941{
… …
783 1039
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
787 1043
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
789 1045
790 if (n > 0) 1046 if (n > 0)
791 { 1047 {
792 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
793 return true; 1049 return true;
… …
820 recolour_cursor (); 1076 recolour_cursor ();
821 1077
822#ifdef POINTER_BLANK 1078#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1079 hidden_pointer = 0;
824 1080
825 if (Options & Opt_pointerBlank) 1081 if (options & Opt_pointerBlank)
826 pointer_ev.start (NOW + pointerBlankDelay); 1082 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1083#endif
828} 1084}
829 1085
830#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
831void 1087void
832rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
833{ 1089{
834 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
835 return; 1091 return;
836 1092
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
838 XFlush (display->display); 1094 XFlush (display->display);
839 1095
… …
859 x = ev.x; 1115 x = ev.x;
860 y = ev.y; 1116 y = ev.y;
861 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
862 1118
863 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1120 button_number = 3;
866 }
867 else 1121 else
868 { 1122 {
869 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1125 if (button_number >= 3)
872 button_number += (64 - 3); 1126 button_number += (64 - 3);
873 } 1127 }
874 1128
875 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
876 { 1130 {
877 /* 1131 /*
878 * do not report ButtonRelease 1132 * do not report ButtonRelease
879 * no state info allowed 1133 * no state info allowed
880 */ 1134 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1153#endif
900
901 } 1154 }
902 1155
903#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1158 if (key_state & 16)
906 fputc ('C', stderr); 1159 fputc ('C', stderr);
907 if (key_state & 4) 1160 if (key_state & 4)
908 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1165 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1167 button_number,
915 x + 1, 1168 x + 1,
916 y + 1); 1169 y + 1);
917#else 1170#endif
1171
918 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
920 (32 + x + 1), 1174 (32 + x + 1),
921 (32 + y + 1)); 1175 (32 + y + 1));
922#endif
923} 1176}
924 1177
925#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
926void 1179void
927rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
938{ 1191{
939 SET_R (this); 1192 SET_R (this);
940 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
941 1194
942#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
944 { 1197 {
945 if (hidden_cursor) 1198 if (hidden_cursor)
946 { 1199 {
947 hidden_cursor = 0; 1200 hidden_cursor = 0;
948 want_refresh = 1; 1201 want_refresh = 1;
… …
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 } 1205 }
953#endif 1206#endif
954 1207
955#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 { 1210 {
958 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
959 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
960 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
961 if (hidden_pointer) 1214 if (hidden_pointer)
… …
964 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank (); 1218 pointer_blank ();
966 } 1219 }
967#endif 1220#endif
968 1221
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return;
972#endif
973
974 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1224 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1225
1027 switch (ev.type) 1226 switch (ev.type)
1028 { 1227 {
1029 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1030 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1031 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1032 1297
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1300 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1045 } 1303#endif
1046 break; 1304 break;
1047 } 1305 }
1048#endif
1049 1306
1050 case ButtonPress: 1307 case ButtonPress:
1051 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1052 break; 1309 break;
1053 1310
… …
1077 0L, 1000000L, 1334 0L, 1000000L,
1078 False, AnyPropertyType, 1335 False, AnyPropertyType,
1079 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1080 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1081 &data); 1338 &data);
1082 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1083 XA_CUT_BUFFER0, XA_STRING,
1084 8, PropModeReplace,
1085 data, STRLEN (data));
1086 XFree (data); 1340 XFree (data);
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1089 } 1343 }
1090#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1091 break; 1345 break;
1092 1346
… …
1124 { 1378 {
1125 TermWin.focus = 1; 1379 TermWin.focus = 1;
1126 want_refresh = 1; 1380 want_refresh = 1;
1127#ifdef USE_XIM 1381#ifdef USE_XIM
1128 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1129 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1130#endif 1387#endif
1131#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif 1391#endif
1135#ifdef OFF_FOCUS_FADING 1392#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade]) 1393 if (rs[Rs_fade])
1137 { 1394 {
1138 PixColors = PixColorsFocused; 1395 pix_colors = pix_colors_focused;
1139 set_colorfgbg ();
1140 scr_clear (); 1396 scr_recolour ();
1141 scr_touch (true);
1142 } 1397 }
1143#endif 1398#endif
1144 1399
1145 } 1400 }
1146 break; 1401 break;
… …
1148 case FocusOut: 1403 case FocusOut:
1149 if (TermWin.focus) 1404 if (TermWin.focus)
1150 { 1405 {
1151 TermWin.focus = 0; 1406 TermWin.focus = 0;
1152 want_refresh = 1; 1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1153#ifdef USE_XIM 1415#ifdef USE_XIM
1154 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1156#endif 1418#endif
1157#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1159 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1160 hidden_cursor = 0; 1422 hidden_cursor = 0;
1161#endif 1423#endif
1162#ifdef OFF_FOCUS_FADING 1424#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade]) 1425 if (rs[Rs_fade])
1164 { 1426 {
1165 PixColors = PixColorsUnFocused; 1427 pix_colors = pix_colors_unfocused;
1166 set_colorfgbg ();
1167 scr_clear (); 1428 scr_recolour ();
1168 scr_touch (true);
1169 } 1429 }
1170#endif 1430#endif
1171
1172 } 1431 }
1173 break; 1432 break;
1174 1433
1175 case ConfigureNotify: 1434 case ConfigureNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 } 1444 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187 1446
1188 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1448 {
1449 seen_resize = 1;
1189 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1451 }
1190 1452
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1193 {
1194 check_our_parents (); 1455 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif 1456#endif
1199 } 1457 }
1458 break;
1459
1460 case PropertyNotify:
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1200 break; 1465 break;
1201 1466
1202 case SelectionClear: 1467 case SelectionClear:
1203 selection_clear (); 1468 selection_clear ();
1204 break; 1469 break;
1205 1470
1206 case SelectionNotify: 1471 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1474 break;
1211 1475
1212 case SelectionRequest: 1476 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1214 break; 1478 break;
… …
1286 { 1550 {
1287 menubar_control (ev.xbutton); 1551 menubar_control (ev.xbutton);
1288 break; 1552 break;
1289 } 1553 }
1290#endif 1554#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1292 break; 1556 break;
1293 1557
1294 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1295 { 1559 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1561 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1299 ; 1563 ;
1300 1564
1301 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1302 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1569 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1573 {
1310#endif 1574#endif
1575#if ISO_14755
1576 // 5.4
1577 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1578 {
1579 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1580 break;
1581 }
1582#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1313#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1316 { 1589 {
1317 int dist; 1590 int dist;
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1597
1325 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1327 */ 1600 */
1328 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1604
1333 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1335 { 1607 {
1336 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1338 } 1610 }
1339 else 1611 else
1340 { 1612 {
1341 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y -
1343 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1344 } 1615 }
1616
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1347 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1349 } 1622 }
1350 else 1623 else
1351 { 1624 {
1352 /* we are within the text window, so we 1625 /* we are within the text window, so we
1353 * shouldn't be scrolling 1626 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1628 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1629 sel_scroll_ev.stop();
1357 } 1630 }
1358#endif 1631#endif
1359#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1360
1361 } 1633 }
1362#endif 1634#endif
1363
1364 } 1635 }
1365 } 1636 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1638 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1369 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1370 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1371 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1647 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1649 scrollbar_size ());
1377 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1380 } 1653 }
1381 break; 1654 break;
1382 } 1655 }
1383} 1656}
1384 1657
1658#if TRANSPARENT
1385void 1659void
1386rxvt_term::rootwin_cb (XEvent &ev) 1660rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1661{
1388 SET_R (this); 1662 SET_R (this);
1389 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1390 1664
1391 switch (ev.type) 1665 switch (ev.type)
1392 { 1666 {
1393 case PropertyNotify: 1667 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1668 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1669 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1670 * use the property to determine the pixmap. We use it later on.
1406 */ 1671 */
1407 if (xa[XA_XROOTPMAPID] == 0) 1672 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409 1674
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1411 return; 1676 return;
1412 }
1413 1677
1414 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1415 case ReparentNotify: 1679 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1418 break; 1682 break;
1419#endif
1420 } 1683 }
1421} 1684}
1685#endif
1422 1686
1423void 1687void
1424rxvt_term::button_press (XButtonEvent &ev) 1688rxvt_term::button_press (XButtonEvent &ev)
1425{ 1689{
1426 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1427 1691
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1429 if (!bypass_keystate) 1693 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1431 /* 1696 /*
1432 * VT window processing of button press 1697 * VT window processing of button press
1433 */ 1698 */
1434 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1435 { 1700 {
1701#if ISO_14755
1702 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 {
1705 iso14755_54 (ev.x, ev.y);
1706 return;
1707 }
1708#endif
1709
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1437 if (reportmode) 1712 if (reportmode)
1438 { 1713 {
1439 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1470 } 1745 }
1471 else 1746 else
1472 { 1747 {
1473 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1475 switch (ev.button) 1751 switch (ev.button)
1476 { 1752 {
1477 case Button1: 1753 case Button1:
1754 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */
1756#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask);
1758#else
1759 selection.rect = false;
1760#endif
1761
1478 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1480 { 1764 {
1481 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1483 else 1767 else
1484 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1783 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1502 else 1786 else
1503 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1504 MEvent.button = Button3; 1789 MEvent.button = Button3;
1505 break; 1790 break;
1506 } 1791 }
1507 } 1792 }
1793
1508 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1509 return; 1795 return;
1510 } 1796 }
1511 1797
1512 /* 1798 /*
… …
1665{ 1951{
1666 int reportmode = 0; 1952 int reportmode = 0;
1667 1953
1668 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 1955 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 1957
1672 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1673 { 1959 {
1674 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1675 scrollbar_show (0); 1961 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1678#endif 1964#endif
1679
1680 } 1965 }
1966
1681#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 1968 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 1969 sel_scroll_ev.stop();
1684#endif 1970#endif
1971
1685 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1686 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1687 if (reportmode) 1979 if (reportmode)
1688 { 1980 {
1689 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1706 mouse_report (ev); 1998 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2000 return;
1709 } 2001 }
2002
1710 /* 2003 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2005 * when overriding mouse reporting
1713 */ 2006 */
1714 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2008 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1718 2011
1719 switch (ev.button) 2012 switch (ev.button)
… …
1734 2027
1735 v = ev.button == Button4 ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
1736 2029
1737 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1738 i = 1; 2031 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2032 else if (options & Opt_mouseWheelScrollPage)
1740 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1741 else 2034 else
1742 i = 5; 2035 i = 5;
1743 2036
1744# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
… …
2029 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
2031 2324
2032 pchanged = 0; 2325 pchanged = 0;
2033 2326
2034 if (!(Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
2036 2329
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
2039 2332
… …
2042 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
2043 { 2336 {
2044 if (am_transparent) 2337 if (am_transparent)
2045 { 2338 {
2046 pchanged = 1; 2339 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
2049 } 2342 }
2050 2343
2051 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
2052 } 2345 }
… …
2115 sy = 0; 2408 sy = 0;
2116 } 2409 }
2117 2410
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2120 allowedxerror = -1; 2415 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2417
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
… …
2147 if (ISSET_PIXCOLOR (Color_tint)) 2442 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2443 {
2149 unsigned short rm, gm, bm; 2444 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2446
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2153 2448
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2449 ShadeXImage (display, image, shade, rm, gm, bm);
2155 } 2450 }
2156#endif 2451#endif
2157 2452
… …
2170 2465
2171 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2172 } 2467 }
2173 } 2468 }
2174 2469
2175 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2176 { 2473 {
2177 unsigned int n; 2474 unsigned int n;
2178 /* 2475 /*
2179 * InheritPixmap transparency 2476 * InheritPixmap transparency
2180 */ 2477 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 { 2479 {
2184 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2483 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2484
2190 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2191 { 2486 {
2192 if (oldp != None) 2487 if (oldp != None)
2193 pchanged = 1; 2488 pchanged = 1;
… …
2204 if (pchanged) 2499 if (pchanged)
2205 { 2500 {
2206 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2207 { 2502 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2505 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break; 2507 break;
2214 } 2508 }
2215 } 2509 }
2216 } 2510 }
2217 2511
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 { 2513 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2516 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2225 } 2518 }
2226 else 2519 else
2227 { 2520 {
2228#if WAIT_FOR_WM 2521#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1); 2524 sleep (1);
2232#endif 2525#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2235 { 2527 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2529 XClearWindow (display->display, TermWin.parent[n]);
2238 } 2530 }
… …
2243 2535
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2537 TermWin.parent[i] = None;
2246 } 2538 }
2247 2539
2248 // this is experimental
2249 if (scrollBar.win) 2540 if (scrollBar.win)
2250 { 2541 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2543 scrollBar.setIdle ();
2254 scrollbar_show (0); 2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2255 } 2552 }
2256 2553
2257 return pchanged; 2554 return pchanged;
2258} 2555}
2259#endif 2556#endif
… …
2278 if (ch == NOCHAR) // TODO: improve 2575 if (ch == NOCHAR) // TODO: improve
2279 break; 2576 break;
2280 2577
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2578 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2579 {
2580 if (!seen_input)
2581 {
2582 seen_input = 1;
2583 // many badly-written programs (e.g. jed) contain a race condition:
2584 // they first read the screensize and then install a SIGWINCH handler.
2585 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized.
2590 if (seen_resize)
2591 kill (-cmd_pid, SIGWINCH);
2592 }
2593
2283 /* Read a text string from the input buffer */ 2594 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2595 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2596 bool refreshnow = false;
2286 int nlines = 0; 2597 int nlines = 0;
2287 unicode_t *str = buf; 2598 unicode_t *str = buf;
… …
2296 if (ch == C0_LF) 2607 if (ch == C0_LF)
2297 { 2608 {
2298 nlines++; 2609 nlines++;
2299 refresh_count++; 2610 refresh_count++;
2300 2611
2301 if (!(Options & Opt_jumpScroll) 2612 if (!(options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2614 {
2304 refreshnow = true; 2615 refreshnow = true;
2305 ch = NOCHAR; 2616 ch = NOCHAR;
2306 break; 2617 break;
… …
2333 * the number of pages between refreshes is refresh_limit, which 2644 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2645 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2646 */
2336 if (refreshnow) 2647 if (refreshnow)
2337 { 2648 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2650 refresh_limit++;
2340 else 2651 else
2341 { 2652 {
2342 flag = true; 2653 flag = true;
2343 scr_refresh (refresh_type); 2654 scr_refresh (refresh_type);
… …
2533 process_escape_seq (); 2844 process_escape_seq ();
2534 break; 2845 break;
2535 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2539 else 2850 else
2540 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2541 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2542 break; 2853 break;
2543 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2544 scr_bell (); 2855 scr_bell ();
2545 break; 2856 break;
2546 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2645void 2956void
2646rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2647{ 2958{
2648 unicode_t ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2649 2960
2650 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2651 { 2962 {
2652 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2653 return; 2964 return;
2654 } 2965 }
2655 2966
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2982 break;
2672 case '+': 2983 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 2985 break;
2675#ifndef NO_FRILLS 2986#if ENABLE_FRILLS
2676 case '6': 2987 case '6':
2677 scr_backindex (); 2988 scr_backindex ();
2678 break; 2989 break;
2679#endif 2990#endif
2680 case '7': 2991 case '7':
2681 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2682 break; 2993 break;
2683 case '8': 2994 case '8':
2684 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2685 break; 2996 break;
2686#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2687 case '9': 2998 case '9':
2688 scr_forwardindex (); 2999 scr_forwardindex ();
2689 break; 3000 break;
2690#endif 3001#endif
2691 case '=': 3002 case '=':
… …
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2991 break; 3302 break;
2992 3303
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
2995 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3307 break;
2997 3308
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
3000 break; 3311 break;
… …
3007 break; 3318 break;
3008 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
3009 scr_report_position (); 3320 scr_report_position ();
3010 break; 3321 break;
3011 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3323 if (options & Opt_insecure)
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3325 break;
3015 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3328 break;
3018 } 3329 }
… …
3054 break; 3365 break;
3055 3366
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3368 if (arg[0] == 4)
3058 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
3059 break; 3372 break;
3060 3373
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3375 if (arg[0] == 4)
3063 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
3064 break; 3379 break;
3065 3380
3066 /* 3381 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3383 */
… …
3080 break; 3395 break;
3081 case CSI_75: 3396 case CSI_75:
3082 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
3083 break; 3398 break;
3084 3399
3085#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
3086 case CSI_74: 3401 case CSI_74:
3087 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
3088 break; 3403 break;
3089#endif 3404#endif
3090 3405
… …
3097 break; 3412 break;
3098 } 3413 }
3099} 3414}
3100/*}}} */ 3415/*}}} */
3101 3416
3102#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
3103/* ARGSUSED */ 3418/* ARGSUSED */
3104void 3419void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3421{
3107 int x, y; 3422 int x, y;
… …
3174 break; 3489 break;
3175 case 19: /* report window size (chars) */ 3490 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break; 3492 break;
3178 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3494 {
3181 char *s; 3495 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3498 XFree (s);
3184 } 3499 }
3185 break; 3500 break;
3186 case 21: /* report window title */ 3501 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3502 {
3189 char *s; 3503 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3506 XFree (s);
3192 } 3507 }
3193 break; 3508 break;
3194 } 3509 }
3195} 3510}
3196#endif 3511#endif
3197 3512
… …
3201 * ends_how is terminator used. returned input must be free()'d 3516 * ends_how is terminator used. returned input must be free()'d
3202 */ 3517 */
3203unsigned char * 3518unsigned char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3520{
3206 unicode_t prev = 0, ch; 3521 unicode_t ch;
3522 bool seen_esc = false;
3207 unsigned int n = 0; 3523 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3524 wchar_t string[STRING_MAX];
3210 3525
3211 while ((ch = cmd_getc ()) != NOCHAR) 3526 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3527 {
3213 if (prev == C0_ESC) 3528 if (seen_esc)
3214 { 3529 {
3215 if (ch == 0x5c) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
3216 break; 3531 break;
3217 else 3532 else
3218 return NULL; 3533 return NULL;
3219 } 3534 }
3535 else if (ch == C0_ESC)
3536 {
3537 seen_esc = true;
3538 continue;
3539 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3540 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3541 break;
3222 else if (ch < 0x20) 3542 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3224 3546
3225 if (n >= sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3226 // stop at some sane length 3548 // stop at some sane length
3227 return NULL; 3549 return NULL;
3228 3550
3229 if (ch == C0_SYN) 3551 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3552 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3553 else
3235 string[n++] = prev = ch; 3554 string[n++] = ch;
3236 } 3555 }
3237 3556
3238 string[n++] = '\0'; 3557 string[n++] = '\0';
3239 3558
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3560
3245 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
3246} 3562}
3247 3563
3248/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3249/* 3565/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3294void 3610void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{ 3612{
3297 if (str[0] == '?' && !str[1]) 3613 if (str[0] == '?' && !str[1])
3298 { 3614 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3615 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3616 pix_colors_focused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3618 }
3306 else 3619 else
3307 set_window_color (color, str); 3620 set_window_color (color, str);
3308} 3621}
3309 3622
… …
3337{ 3650{
3338 int changed = 0; 3651 int changed = 0;
3339 int color; 3652 int color;
3340 char *buf, *name; 3653 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
3342 3656
3343 assert (str != NULL); 3657 assert (str != NULL);
3344 switch (op) 3658 switch (op)
3345 { 3659 {
3346 case XTerm_name: 3660 case XTerm_name:
… …
3353 set_title (str); 3667 set_title (str);
3354 break; 3668 break;
3355 case XTerm_property: 3669 case XTerm_property:
3356 if (str[0] == '?') 3670 if (str[0] == '?')
3357 { 3671 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3672 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3673 Atom actual_type;
3360 int actual_format; 3674 int actual_format;
3361 unsigned long nitems; 3675 unsigned long nitems;
3362 unsigned long bytes_after; 3676 unsigned long bytes_after;
3363 unsigned char *value = 0; 3677 unsigned char *value = 0;
… …
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3696
3383 if (eq) 3697 if (eq)
3384 { 3698 {
3385 *eq = 0; 3699 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3700 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3701 }
3391 else 3702 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3703 XDeleteProperty (display->display, TermWin.parent[0],
3393 display->atom (str)); 3704 display->atom (str));
3394 } 3705 }
3395 break; 3706 break;
3396 3707
3397 case XTerm_Color: 3708 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3399 { 3710 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3712 break;
3402 3713
3403 *name++ = '\0'; 3714 *name++ = '\0';
3404 color = atoi (buf); 3715 color = atoi (buf);
3405 3716
3406 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3407 break; 3718 break;
3408 3719
3409 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3721 *buf++ = '\0';
3411 3722
3412 if (name[0] == '?' && !name[1]) 3723 if (name[0] == '?' && !name[1])
3413 { 3724 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3725 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3728 }
3421 else 3729 else
3422 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3423 } 3731 }
3424 break; 3732 break;
… …
3441 break; 3749 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break; 3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3446 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break; 3759 break;
3449 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762 break;
3763#endif
3764#if TRANSPARENT && TINTING
3765 case XTerm_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3767 check_our_parents ();
3768 if (am_transparent)
3769 want_full_refresh = want_refresh = 1;
3451 break; 3770 break;
3452#endif 3771#endif
3453 3772
3454 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3455 if (*str != ';') 3774 if (*str != ';')
… …
3458 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3460#endif 3779#endif
3461 scr_touch (true); 3780 scr_touch (true);
3462 } 3781 }
3463 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3464 { 3783 {
3465 str++; 3784 str++;
3466#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3468#endif 3787#endif
… …
3487 case XTerm_logfile: 3806 case XTerm_logfile:
3488 // TODO, when secure mode? 3807 // TODO, when secure mode?
3489 break; 3808 break;
3490 3809
3491 case XTerm_font: 3810 case XTerm_font:
3811 op = URxvt_font;
3812 case URxvt_font:
3813#if ENABLE_STYLES
3814 case URxvt_boldFont:
3815 case URxvt_italicFont:
3816 case URxvt_boldItalicFont:
3817#endif
3492 if (query) 3818 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3822 resp);
3823 else
3493 { 3824 {
3494 if (Options & Opt_insecure) 3825 const char *&res = rs[Rs_font + (op - URxvt_font)];
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3826
3496 TermWin.fontset->fontdesc 3827 res = strdup (str);
3497 ? TermWin.fontset->fontdesc 3828 allocated.push_back ((void *)res);
3498 : "", 3829 set_fonts ();
3499 resp);
3500 } 3830 }
3501 else
3502 change_font (str);
3503 break; 3831 break;
3504 3832
3505#ifndef NO_FRILLS 3833#if ENABLE_FRILLS
3506 case XTerm_locale: 3834 case XTerm_locale:
3507 if (query) 3835 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3511 }
3512 else 3837 else
3513 { 3838 {
3514 set_locale (str); 3839 set_locale (str);
3515# ifdef USE_XIM 3840# ifdef USE_XIM
3516 im_cb (); 3841 im_cb ();
3517# endif 3842# endif
3518 } 3843 }
3519 break; 3844 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif 3845#endif
3530 3846
3531#ifdef MENUBAR 3847#ifdef MENUBAR
3532 case XTerm_Menu: 3848 case XTerm_Menu:
3533 if (Options & Opt_insecure) 3849 if (options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3851 break;
3536#endif 3852#endif
3537#if 0 3853#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
… …
3565{ 3881{
3566 int state; 3882 int state;
3567 3883
3568 if (mode == 's') 3884 if (mode == 's')
3569 { 3885 {
3570 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3571 return -1; 3887 return -1;
3572 } 3888 }
3573 else 3889 else
3574 { 3890 {
3575 if (mode == 'r') 3891 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3893 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3895 PrivMode (state, bit);
3580 } 3896 }
3581 3897
3582 return state; 3898 return state;
3583} 3899}
… …
3601 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3924#ifdef menuBar_esc
3608 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3609#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3610#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3931#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3934 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3935 // 45 margin bell NYI
3620 // 46 start logging 3936 // 46 start logging
… …
3661 3977
3662 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3979 switch (arg[i])
3664 { 3980 {
3665 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3666 if (Options & Opt_secondaryScreen) 3983 if (options & Opt_secondaryScreen)
3667 if (mode == 0) 3984 if (mode == 0)
3668 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3669 else if (mode == 1) 3986 else if (mode == 1)
3670 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3671 break; 3988 break;
… …
3682 * within VT52 mode 3999 * within VT52 mode
3683 */ 4000 */
3684 PrivMode (1, PrivMode_vt52); 4001 PrivMode (1, PrivMode_vt52);
3685 break; 4002 break;
3686 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3689 break; 4006 break;
3690 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3691 if (state) 4008 if (state)
3692 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3693 else 4010 else
3694 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3695 break; 4012 break;
3696 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3698 break; 4015 break;
3699 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4020 scr_autowrap (state);
3704 break; 4021 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4022 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4025 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4026 break;
3710#ifdef menuBar_esc 4027#ifdef menuBar_esc
3711 case menuBar_esc: 4028 case menuBar_esc:
3712#ifdef MENUBAR 4029#ifdef MENUBAR
3713 map_menuBar (state); 4030 map_menuBar (state);
… …
3733 break; 4050 break;
3734 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4055 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4056 break;
3740#if 0 4057#if 0
3741 case 1001: 4058 case 1001:
3742 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3743#endif 4060#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state) 4062 if (state)
3746 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3747 else 4064 else
3748 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3749 break; 4066 break;
3750 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3751 if (state) 4068 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3753 else 4070 else
3754 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3755 break; 4072 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4073 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4074 if (options & Opt_secondaryScreen)
3758 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4076 scr_erase_screen (2);
3760 scr_change_screen (state); 4077 scr_change_screen (state);
3761 break; 4078 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4079 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4080 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4081 if (options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY) 4082 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4083 scr_erase_screen (2);
3767 break; 4084 break;
3768 default: 4085 default:
3769 break; 4086 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3796 break; 4113 break;
3797 case 1: 4114 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3799 break; 4116 break;
3800 //case 2: // faint or second colour 4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3801 case 4: 4121 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3803 break; 4123 break;
3804 case 5: // slowly blinking 4124 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4125 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4137 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4138 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4139 //...
3820 //case 19: // ninth alt font 4140 //case 19: // ninth alt font
3821 //case 20: // gothic 4141 //case 20: // gothic
3822 case 21: // disable bold, faint 4142 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
3824 break; 4144 break;
3825 case 22: 4145 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
3827 break; 4147 break;
3828 //case 23: disable italic 4148 case 23: // disable italic
4149 rendset = 0, rendstyle = RS_Italic;
4150 break;
3829 case 24: 4151 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3831 break; 4153 break;
3832 case 25: 4154 case 25:
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
4157 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3834 break; 4159 break;
3835 case 27: 4160 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3837 break; 4162 break;
… …
3855 case 35: 4180 case 35:
3856 case 36: 4181 case 36:
3857 case 37: 4182 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4184 break;
3860#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4187 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4189 i += 2;
3866 } 4190 }
3867 break; 4191 break;
3868#endif
3869 case 39: /* default fg */ 4192 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
3871 break; 4194 break;
3872 4195
3873 case 40: 4196 case 40:
… …
3878 case 45: 4201 case 45:
3879 case 46: 4202 case 46:
3880 case 47: 4203 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4205 break;
3883#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4208 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4210 i += 2;
3889 } 4211 }
3890 break; 4212 break;
3891#endif
3892 case 49: /* default bg */ 4213 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
3894 break; 4215 break;
4216
4217 //case 50: // not variable spacing
3895 4218
3896#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
3897 case 90: 4220 case 90:
3898 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
3899 case 92: 4222 case 92:
3900 case 93: 4223 case 93:
3901 case 94: 4224 case 94:
3902 case 95: 4225 case 95:
3903 case 96: 4226 case 96:
3904 case 97: 4227 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4229 break;
3908 case 100: 4230 case 100:
3909 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
3910 case 102: 4232 case 102:
3911 case 103: 4233 case 103:
3912 case 104: 4234 case 104:
3913 case 105: 4235 case 105:
3914 case 106: 4236 case 106:
3915 case 107: 4237 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4239 break;
3919#endif 4240#endif
3920 4241
3921 } 4242 }
3922 } 4243 }
… …
3929{ 4250{
3930 unicode_t ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
3931 4252
3932 if (cmd == 'Q') 4253 if (cmd == 'Q')
3933 { /* query graphics */ 4254 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4256 return;
3936 } 4257 }
3937 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
3938 do 4259 do
3939 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
3954 unsigned char buf[256]; 4275 unsigned char buf[256];
3955 4276
3956 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4279 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
3960} 4281}
3961 4282
3962/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4284/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4285 * or generated by us in response to a query ESC sequence.
3965 */ 4286 */
3966void 4287void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3968{ 4289{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3970 4291
3971 if (len) 4292 if (len)
3972 { 4293 {
3973 if (v_buflen == 0) 4294 if (v_buflen == 0)
3974 { 4295 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3976 4297
3977 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
3978 return; 4299 return;
3979 4300
3980 data += written; 4301 data += written;
… …
3988 v_buflen += len; 4309 v_buflen += len;
3989 } 4310 }
3990 4311
3991 for (;;) 4312 for (;;)
3992 { 4313 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3994 4315
3995 if (written > 0) 4316 if (written > 0)
3996 { 4317 {
3997 v_buflen -= written; 4318 v_buflen -= written;
3998 4319

Diff Legend

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