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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.170 by root, Sun Nov 21 20:19:24 2004 UTC

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

Diff Legend

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