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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.168 by root, Sun Sep 5 09:32:59 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 // 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 {
… …
683rxvt_term::check_cb (check_watcher &w) 939rxvt_term::check_cb (check_watcher &w)
684{ 940{
685 SET_R (this); 941 SET_R (this);
686 SET_LOCALE (locale); 942 SET_LOCALE (locale);
687 943
944 display->flush ();
945
946 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01);
948}
949
950void
951rxvt_term::flush_cb (time_watcher &w)
952{
953 SET_R (this);
954 SET_LOCALE (locale);
955
956 refresh_limit = 1;
957 refresh_count = 0;
688 flush (); 958 flush ();
689} 959}
690 960
691#ifdef CURSOR_BLINK 961#ifdef CURSOR_BLINK
692void 962void
… …
768 1038
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1039 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1040 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1041 cmdbuf_endp = cmdbuf_ptr + n;
772 1042
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1044
775 if (n > 0) 1045 if (n > 0)
776 { 1046 {
777 cmdbuf_endp += n; 1047 cmdbuf_endp += n;
778 return true; 1048 return true;
… …
805 recolour_cursor (); 1075 recolour_cursor ();
806 1076
807#ifdef POINTER_BLANK 1077#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1078 hidden_pointer = 0;
809 1079
810 if (Options & Opt_pointerBlank) 1080 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1081 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1082#endif
813} 1083}
814 1084
815#ifdef POINTER_BLANK 1085#ifdef POINTER_BLANK
816void 1086void
817rxvt_term::pointer_blank () 1087rxvt_term::pointer_blank ()
818{ 1088{
819 if (! (Options & Opt_pointerBlank)) 1089 if (! (options & Opt_pointerBlank))
820 return; 1090 return;
821 1091
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1092 XDefineCursor (display->display, TermWin.vt, blank_cursor);
823 XFlush (display->display); 1093 XFlush (display->display);
824 1094
… …
844 x = ev.x; 1114 x = ev.x;
845 y = ev.y; 1115 y = ev.y;
846 pixel_position (&x, &y); 1116 pixel_position (&x, &y);
847 1117
848 if (MEvent.button == AnyButton) 1118 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1119 button_number = 3;
851 }
852 else 1120 else
853 { 1121 {
854 button_number = MEvent.button - Button1; 1122 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1123 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1124 if (button_number >= 3)
857 button_number += (64 - 3); 1125 button_number += (64 - 3);
858 } 1126 }
859 1127
860 if (PrivateModes & PrivMode_MouseX10) 1128 if (priv_modes & PrivMode_MouseX10)
861 { 1129 {
862 /* 1130 /*
863 * do not report ButtonRelease 1131 * do not report ButtonRelease
864 * no state info allowed 1132 * no state info allowed
865 */ 1133 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1148 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1149 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1150#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1151 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1152#endif
885
886 } 1153 }
887 1154
888#ifdef DEBUG_MOUSEREPORT 1155#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1156 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1157 if (key_state & 16)
891 fputc ('C', stderr); 1158 fputc ('C', stderr);
892 if (key_state & 4) 1159 if (key_state & 4)
893 fputc ('S', stderr); 1160 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1164 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1165 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1166 button_number,
900 x + 1, 1167 x + 1,
901 y + 1); 1168 y + 1);
902#else 1169#endif
1170
903 tt_printf ("\033[M%c%c%c", 1171 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1172 (32 + button_number + key_state),
905 (32 + x + 1), 1173 (32 + x + 1),
906 (32 + y + 1)); 1174 (32 + y + 1));
907#endif
908} 1175}
909 1176
910#ifdef USING_W11LIB 1177#ifdef USING_W11LIB
911void 1178void
912rxvt_W11_process_x_event (XEvent *ev) 1179rxvt_W11_process_x_event (XEvent *ev)
… …
923{ 1190{
924 SET_R (this); 1191 SET_R (this);
925 SET_LOCALE (locale); 1192 SET_LOCALE (locale);
926 1193
927#if defined(CURSOR_BLINK) 1194#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1196 {
930 if (hidden_cursor) 1197 if (hidden_cursor)
931 { 1198 {
932 hidden_cursor = 0; 1199 hidden_cursor = 0;
933 want_refresh = 1; 1200 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1204 }
938#endif 1205#endif
939 1206
940#if defined(POINTER_BLANK) 1207#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1209 {
943 if (ev.type == MotionNotify 1210 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1211 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1212 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1213 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1216 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1217 pointer_blank ();
951 } 1218 }
952#endif 1219#endif
953 1220
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1221 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1222 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1223 unsigned int unused_mask;
962 1224
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011
1012 switch (ev.type) 1225 switch (ev.type)
1013 { 1226 {
1014 case KeyPress: 1227 case KeyPress:
1228#if ISO_14755
1229 if (!(iso14755buf & ISO_14755_52))
1230#endif
1015 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;
1016 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
1017 1296
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1297#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1298 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1299 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1300 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1301 mouse_slip_wheel_speed = 0;
1030 } 1302#endif
1031 break; 1303 break;
1032 } 1304 }
1033#endif
1034 1305
1035 case ButtonPress: 1306 case ButtonPress:
1036 button_press (ev.xbutton); 1307 button_press (ev.xbutton);
1037 break; 1308 break;
1038 1309
… …
1065 &Size, &RemainingBytes, 1336 &Size, &RemainingBytes,
1066 &data); 1337 &data);
1067 XChangeProperty (display->display, display->root, 1338 XChangeProperty (display->display, display->root,
1068 XA_CUT_BUFFER0, XA_STRING, 1339 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace, 1340 8, PropModeReplace,
1070 data, STRLEN (data)); 1341 data, strlen (data));
1071 XFree (data); 1342 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1343 selection_paste (display->root, XA_CUT_BUFFER0, True);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1074 } 1345 }
1075#endif /* OFFIX_DND */ 1346#endif /* OFFIX_DND */
1076 break; 1347 break;
1077 1348
1078 case MappingNotify: 1349 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1350 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1351 break;
1081 1352
1082 /* 1353 /*
1083 * XXX: this is not the _current_ arrangement 1354 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1355 * Here's my conclusion:
… …
1109 { 1380 {
1110 TermWin.focus = 1; 1381 TermWin.focus = 1;
1111 want_refresh = 1; 1382 want_refresh = 1;
1112#ifdef USE_XIM 1383#ifdef USE_XIM
1113 if (Input_Context != NULL) 1384 if (Input_Context != NULL)
1385 {
1386 IMSetStatusPosition ();
1114 XSetICFocus (Input_Context); 1387 XSetICFocus (Input_Context);
1388 }
1115#endif 1389#endif
1116#ifdef CURSOR_BLINK 1390#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink) 1391 if (options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif 1393#endif
1120#ifdef OFF_FOCUS_FADING 1394#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade]) 1395 if (rs[Rs_fade])
1122 { 1396 {
1123 PixColors = PixColorsFocused; 1397 pix_colors = pix_colors_focused;
1124 set_colorfgbg ();
1125 scr_clear (); 1398 scr_recolour ();
1126 scr_touch (true);
1127 } 1399 }
1128#endif 1400#endif
1129 1401
1130 } 1402 }
1131 break; 1403 break;
… …
1133 case FocusOut: 1405 case FocusOut:
1134 if (TermWin.focus) 1406 if (TermWin.focus)
1135 { 1407 {
1136 TermWin.focus = 0; 1408 TermWin.focus = 0;
1137 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
1138#ifdef USE_XIM 1417#ifdef USE_XIM
1139 if (Input_Context != NULL) 1418 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context); 1419 XUnsetICFocus (Input_Context);
1141#endif 1420#endif
1142#ifdef CURSOR_BLINK 1421#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink) 1422 if (options & Opt_cursorBlink)
1144 cursor_blink_ev.stop (); 1423 cursor_blink_ev.stop ();
1145 hidden_cursor = 0; 1424 hidden_cursor = 0;
1146#endif 1425#endif
1147#ifdef OFF_FOCUS_FADING 1426#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade]) 1427 if (rs[Rs_fade])
1149 { 1428 {
1150 PixColors = PixColorsUnFocused; 1429 pix_colors = pix_colors_unfocused;
1151 set_colorfgbg ();
1152 scr_clear (); 1430 scr_recolour ();
1153 scr_touch (true);
1154 } 1431 }
1155#endif 1432#endif
1156
1157 } 1433 }
1158 break; 1434 break;
1159 1435
1160 case ConfigureNotify: 1436 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1437 if (ev.xconfigure.window == TermWin.parent[0])
… …
1170 } 1446 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1448
1173 if (szHint.width != width || szHint.height != height) 1449 if (szHint.width != width || szHint.height != height)
1174 { 1450 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1451 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1452 resize_all_windows (width, height, 1);
1177 } 1453 }
1178#ifdef DEBUG_SIZE 1454
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1456 if (options & Opt_transparent)
1186 { 1457 {
1187 check_our_parents (); 1458 check_our_parents ();
1188 if (am_transparent) 1459 if (am_transparent)
1189 want_full_refresh = 1; 1460 want_refresh = want_full_refresh = 1;
1190 } 1461 }
1191#endif 1462#endif
1192 } 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
1193 break; 1471 break;
1194 1472
1195 case SelectionClear: 1473 case SelectionClear:
1196 selection_clear (); 1474 selection_clear ();
1197 break; 1475 break;
… …
1228 1506
1229 case GraphicsExpose: 1507 case GraphicsExpose:
1230 case Expose: 1508 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1509 if (ev.xany.window == TermWin.vt)
1232 { 1510 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1511 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1515
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1521
1241 // ev.xexpose.width, TermWin.height, False); 1522 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1523 }
1245 else 1524 else
1246 { 1525 {
1247 XEvent unused_event; 1526 XEvent unused_event;
1248 1527
… …
1258 } 1537 }
1259#ifdef MENUBAR 1538#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1540 menubar_expose ();
1262#endif 1541#endif
1542
1543#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0])
1545 XClearWindow (display->display, ev.xany.window);
1546#endif
1263 } 1547 }
1264 break; 1548 break;
1265 1549
1266 case MotionNotify: 1550 case MotionNotify:
1267#ifdef POINTER_BLANK 1551#ifdef POINTER_BLANK
… …
1273 { 1557 {
1274 menubar_control (ev.xbutton); 1558 menubar_control (ev.xbutton);
1275 break; 1559 break;
1276 } 1560 }
1277#endif 1561#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1563 break;
1280 1564
1281 if (ev.xany.window == TermWin.vt) 1565 if (ev.xany.window == TermWin.vt)
1282 { 1566 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1567 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1568 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1286 ; 1570 ;
1287 1571
1288 XQueryPointer (display->display, TermWin.vt, 1572 XQueryPointer (display->display, TermWin.vt,
1289 &unused_root, &unused_child, 1573 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1574 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1575 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1576 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1577#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1578 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1579 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1580 {
1297#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
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1590 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1591 ev.xbutton.state & Button3Mask ? 2 : 0);
1592
1300#ifdef SELECTION_SCROLLING 1593#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1594 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1596 {
1304 int dist; 1597 int dist;
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1603 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1604
1312 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1314 */ 1607 */
1315 selection_save_x=ev.xbutton.x; 1608 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1609 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1611
1320 /* calc number of lines to scroll */ 1612 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1613 if (ev.xbutton.y < TermWin.int_bwidth)
1322 { 1614 {
1323 scroll_selection_dir = UP; 1615 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1616 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1617 }
1326 else 1618 else
1327 { 1619 {
1328 scroll_selection_dir = DN; 1620 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1622 }
1623
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1624 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1625 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1;
1334 MIN_IT (scroll_selection_lines, 1627 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1628 SELECTION_SCROLL_MAX_LINES);
1336 } 1629 }
1337 else 1630 else
1338 { 1631 {
1339 /* we are within the text window, so we 1632 /* we are within the text window, so we
1340 * shouldn't be scrolling 1633 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1635 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1636 sel_scroll_ev.stop();
1344 } 1637 }
1345#endif 1638#endif
1346#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1347
1348 } 1640 }
1349#endif 1641#endif
1350
1351 } 1642 }
1352 } 1643 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1645 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1356 MotionNotify, &ev)) ; 1647 MotionNotify, &ev))
1648 ;
1649
1357 XQueryPointer (display->display, scrollBar.win, 1650 XQueryPointer (display->display, scrollBar.win,
1358 &unused_root, &unused_child, 1651 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1652 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1653 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1654 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1656 scrollbar_size ());
1364 scr_refresh (refresh_type); 1657 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1658 refresh_limit = 0;
… …
1367 } 1660 }
1368 break; 1661 break;
1369 } 1662 }
1370} 1663}
1371 1664
1665#if TRANSPARENT
1372void 1666void
1373rxvt_term::rootwin_cb (XEvent &ev) 1667rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1668{
1375 SET_R (this); 1669 SET_R (this);
1376 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1377 1671
1378 switch (ev.type) 1672 switch (ev.type)
1379 { 1673 {
1380 case PropertyNotify: 1674 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1675 /*
1391 * 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,
1392 * 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.
1393 */ 1678 */
1394 if (xa[XA_XROOTPMAPID] == 0) 1679 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396 1681
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1398 return; 1683 return;
1399 }
1400 1684
1401 /* FALLTHROUGH */ 1685 /* FALLTHROUGH */
1402 case ReparentNotify: 1686 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1688 want_refresh = want_full_refresh = 1;
1405 break; 1689 break;
1406#endif
1407 } 1690 }
1408} 1691}
1692#endif
1409 1693
1410void 1694void
1411rxvt_term::button_press (XButtonEvent &ev) 1695rxvt_term::button_press (XButtonEvent &ev)
1412{ 1696{
1413 int reportmode = 0, clickintime; 1697 int reportmode = 0, clickintime;
1414 1698
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1700 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1701 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702
1418 /* 1703 /*
1419 * VT window processing of button press 1704 * VT window processing of button press
1420 */ 1705 */
1421 if (ev.window == TermWin.vt) 1706 if (ev.window == TermWin.vt)
1422 { 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
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1717 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1718
1424 if (reportmode) 1719 if (reportmode)
1425 { 1720 {
1426 /* mouse report from vt window */ 1721 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1722 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1723 MEvent.state = ev.state;
… …
1457 } 1752 }
1458 else 1753 else
1459 { 1754 {
1460 if (ev.button != MEvent.button) 1755 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1756 MEvent.clicks = 0;
1757
1462 switch (ev.button) 1758 switch (ev.button)
1463 { 1759 {
1464 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
1465 /* allow shift+left click to extend selection */ 1769 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1771 {
1468 if (MEvent.button == Button1 && clickintime) 1772 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1773 selection_rotate (ev.x, ev.y);
1470 else 1774 else
1471 selection_extend (ev.x, ev.y, 1); 1775 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1790 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1791 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1792 selection_rotate (ev.x, ev.y);
1489 else 1793 else
1490 selection_extend (ev.x, ev.y, 1); 1794 selection_extend (ev.x, ev.y, 1);
1795
1491 MEvent.button = Button3; 1796 MEvent.button = Button3;
1492 break; 1797 break;
1493 } 1798 }
1494 } 1799 }
1800
1495 MEvent.time = ev.time; 1801 MEvent.time = ev.time;
1496 return; 1802 return;
1497 } 1803 }
1498 1804
1499 /* 1805 /*
… …
1591 break; 1897 break;
1592 case R_SB_ALIGN_BOTTOM: 1898 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1899 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1900 break;
1595 } 1901 }
1902
1596 if (scrollBar.style == R_SB_XTERM 1903 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1904 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1905 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1906 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1907
1601 scrollBar.setMotion (); 1908 scrollBar.setMotion ();
1602 break; 1909 break;
1603 1910
1604 case Button1: 1911 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1912 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1936 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1937 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1938 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1939 / scrollbar_size ()));
1633 } 1940 }
1941
1634 break; 1942 break;
1635 } 1943 }
1636 } 1944 }
1637 return; 1945 return;
1638 } 1946 }
… …
1650{ 1958{
1651 int reportmode = 0; 1959 int reportmode = 0;
1652 1960
1653 csrO = 0; /* reset csr Offset */ 1961 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1962 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1963 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1964
1657 if (scrollbar_isUpDn ()) 1965 if (scrollbar_isUpDn ())
1658 { 1966 {
1659 scrollBar.setIdle (); 1967 scrollBar.setIdle ();
1660 scrollbar_show (0); 1968 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1969#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 1970 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 1971#endif
1664
1665 } 1972 }
1973
1666#ifdef SELECTION_SCROLLING 1974#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 1975 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1976 sel_scroll_ev.stop();
1669#endif 1977#endif
1978
1670 if (ev.window == TermWin.vt) 1979 if (ev.window == TermWin.vt)
1671 { 1980 {
1981#if ISO_14755
1982 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return;
1985#endif
1672 if (reportmode) 1986 if (reportmode)
1673 { 1987 {
1674 /* mouse report from vt window */ 1988 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 1989 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 1990 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2004 MEvent.button = AnyButton;
1691 mouse_report (ev); 2005 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2006#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2007 return;
1694 } 2008 }
2009
1695 /* 2010 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2011 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2012 * when overriding mouse reporting
1698 */ 2013 */
1699 if (PrivateModes & PrivMode_mouse_report 2014 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2015 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2016 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2017 selection_extend (ev.x, ev.y, 0);
1703 2018
1704 switch (ev.button) 2019 switch (ev.button)
… …
1719 2034
1720 v = ev.button == Button4 ? UP : DN; 2035 v = ev.button == Button4 ? UP : DN;
1721 2036
1722 if (ev.state & ShiftMask) 2037 if (ev.state & ShiftMask)
1723 i = 1; 2038 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2039 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2040 i = TermWin.nrow - 1;
1726 else 2041 else
1727 i = 5; 2042 i = 5;
1728 2043
1729# ifdef MOUSE_SLIP_WHEELING 2044# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2082#endif
1768} 2083}
1769 2084
1770#ifdef TRANSPARENT 2085#ifdef TRANSPARENT
1771#if TINTING 2086#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2087/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2088
1775static void 2089typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2090
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2091void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2092{
1783 /* No saturation */ 2093 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2094 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i;
1787 2099
1788 b = ((uint16_t *) ptr)[x]; 2100 Visual* visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2101
1790 g = (b & 0x3e0) * gm; 2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2103
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2104 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2105 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2106 mask_g = visual->green_mask;
1795 } 2107 mask_b = visual->blue_mask;
1796 ptr += bpl; 2108
1797 } 2109 /* boring lookup table pre-initialization */
2110 switch (srcImage->bits_per_pixel) {
2111 case 15:
2112 if ((mask_r != 0x7c00) ||
2113 (mask_g != 0x03e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+32;
2120 sh_r = 10;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 16:
2125 if ((mask_r != 0xf800) ||
2126 (mask_g != 0x07e0) ||
2127 (mask_b != 0x001f))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2130 lookup_r = lookup;
2131 lookup_g = lookup+32;
2132 lookup_b = lookup+32+64;
2133 sh_r = 11;
2134 sh_g = 5;
2135 sh_b = 0;
2136 break;
2137 case 24:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 case 32:
2151 if ((mask_r != 0xff0000) ||
2152 (mask_g != 0x00ff00) ||
2153 (mask_b != 0x0000ff))
2154 return;
2155 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2156 lookup_r = lookup;
2157 lookup_g = lookup+256;
2158 lookup_b = lookup+256+256;
2159 sh_r = 16;
2160 sh_g = 8;
2161 sh_b = 0;
2162 break;
2163 default:
2164 return; /* we do not support this color depth */
2165 }
2166
2167 /* prepare limits for color transformation (each channel is handled separately) */
2168 if (shade < 0) {
2169 shade = -shade;
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = 65535-rm;
2174 lower_lim_g = 65535-gm;
2175 lower_lim_b = 65535-bm;
2176
2177 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2178 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2179 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2180
2181 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2182 } else {
1799 for (y = h; --y >= 0;) { 2183 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2184 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2185
1803 b = ((uint16_t *) ptr)[x]; 2186 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2187
1805 g = (b & 0x3e0) * gm; 2188 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2189 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2190 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2191 }
1809 b |= (!(b >> 5) - 1); 2192
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2193 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2194 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2195 {
1813 } 2196 unsigned int tmp;
1814 ptr += bpl; 2197
2198 tmp = lower_lim_r;
2199 lower_lim_r = lower_lim_b;
2200 lower_lim_b = tmp;
2201
2202 tmp = upper_lim_r;
2203 upper_lim_r = upper_lim_b;
2204 upper_lim_b = tmp;
2205 }
2206
2207 /* fill our lookup tables */
2208 for (i = 0; i <= mask_r>>sh_r; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2212 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2213 lookup_r[i] = (tmp/65535)<<sh_r;
2214 }
2215 for (i = 0; i <= mask_g>>sh_g; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2219 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2220 lookup_g[i] = (tmp/65535)<<sh_g;
2221 }
2222 for (i = 0; i <= mask_b>>sh_b; i++)
2223 {
2224 RUINT32T tmp;
2225 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2226 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2227 lookup_b[i] = (tmp/65535)<<sh_b;
2228 }
2229
2230 /* apply table to input image (replacing colors by newly calculated ones) */
2231 switch (srcImage->bits_per_pixel)
2232 {
2233 case 15:
2234 {
2235 unsigned short *p1, *pf, *p, *pl;
2236 p1 = (unsigned short *) srcImage->data;
2237 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2238 while (p1 < pf)
2239 {
2240 p = p1;
2241 pl = p1 + srcImage->width;
2242 for (; p < pl; p++)
1815 } 2243 {
2244 *p = lookup_r[(*p & 0x7c00)>>10] |
2245 lookup_g[(*p & 0x03e0)>> 5] |
2246 lookup_b[(*p & 0x001f)];
2247 }
2248 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2249 }
1817} 2250 break;
1818 2251 }
1819/* RGB 16 */ 2252 case 16:
1820static void 2253 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2254 unsigned short *p1, *pf, *p, *pl;
1822{ 2255 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2256 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2257 while (p1 < pf)
1825 2258 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2259 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2260 pl = p1 + srcImage->width;
1828 /* No saturation */ 2261 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2262 {
1843 } else { 2263 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2264 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2265 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2266 }
1859 ptr += bpl; 2267 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2268 }
2269 break;
2270 }
2271 case 24:
2272 {
2273 unsigned char *p1, *pf, *p, *pl;
2274 p1 = (unsigned char *) srcImage->data;
2275 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width * 3;
2280 for (; p < pl; p += 3)
1860 } 2281 {
2282 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2283 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2284 p[2] = lookup_r[(p[2] & 0x0000ff)];
2285 }
2286 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2287 }
1862} 2288 break;
2289 }
2290 case 32:
2291 {
2292 RUINT32T *p1, *pf, *p, *pl;
2293 p1 = (RUINT32T *) srcImage->data;
2294 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2295
1864/* RGB 24 */ 2296 while (p1 < pf)
1865static void 2297 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2298 p = p1;
1867{ 2299 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2300 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2301 {
1896 } else { 2302 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2303 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2304 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2305 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2306 }
1927 ptr += bpl; 2307 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2308 }
2309 break;
2310 }
1929 } 2311 }
1930}
1931 2312
1932/* RGB 32 */ 2313 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2314}
2003
2004#endif 2315#endif
2005 2316
2006/* 2317/*
2007 * Check our parents are still who we think they are. 2318 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2319 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2329 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2330 XWindowAttributes wattr, wrootattr;
2020 2331
2021 pchanged = 0; 2332 pchanged = 0;
2022 2333
2023 if (!(Options & Opt_transparent)) 2334 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2335 return pchanged; /* Don't try any more */
2025 2336
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2337 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2338 rootdepth = wrootattr.depth;
2028 2339
… …
2031 if (rootdepth != wattr.depth) 2342 if (rootdepth != wattr.depth)
2032 { 2343 {
2033 if (am_transparent) 2344 if (am_transparent)
2034 { 2345 {
2035 pchanged = 1; 2346 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2348 am_transparent = am_pixmap_trans = 0;
2038 } 2349 }
2039 2350
2040 return pchanged; /* Don't try any more */ 2351 return pchanged; /* Don't try any more */
2041 } 2352 }
… …
2057 i = (xa[XA_XSETROOTID] 2368 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2371 &nitems, &bytes_after, &prop) == Success);
2061 2372
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2373 if (!i || prop == NULL
2374#if TINTING
2375 || !rs[Rs_color + Color_tint]
2376#endif
2377 )
2063 have_pixmap = 0; 2378 have_pixmap = 0;
2064 else 2379 else
2065 { 2380 {
2066 have_pixmap = 1; 2381 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2382 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2393 Window cr;
2079 XImage *image; 2394 XImage *image;
2080 GC gc; 2395 GC gc;
2081 XGCValues gcvalue; 2396 XGCValues gcvalue;
2082 2397
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2399 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2400 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2401 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2402 nx = ny = 0;
2088 2403
… …
2130 2445
2131#if TINTING 2446#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2447 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2448 {
2134 unsigned short rm, gm, bm; 2449 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2450 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2451
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2452 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2453
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2454 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2455 }
2151#endif 2456#endif
2152 2457
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2459 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2462 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2463 XFreeGC (display->display, gc);
2159 XDestroyImage (image); 2464 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]);
2161 2467
2162 if (!am_transparent || !am_pixmap_trans) 2468 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2469 pchanged = 1;
2164 2470
2165 am_transparent = am_pixmap_trans = 1; 2471 am_transparent = am_pixmap_trans = 1;
… …
2170 { 2476 {
2171 unsigned int n; 2477 unsigned int n;
2172 /* 2478 /*
2173 * InheritPixmap transparency 2479 * InheritPixmap transparency
2174 */ 2480 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2482 {
2178 oldp = TermWin.parent[i]; 2483 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2484 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2485 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2486 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2487
2184 if (TermWin.parent[i] == display->root) 2488 if (TermWin.parent[i] == display->root)
2185 { 2489 {
2186 if (oldp != None) 2490 if (oldp != None)
2187 pchanged = 1; 2491 pchanged = 1;
… …
2198 if (pchanged) 2502 if (pchanged)
2199 { 2503 {
2200 for (; n < (unsigned int)i; n++) 2504 for (; n < (unsigned int)i; n++)
2201 { 2505 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2508 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2510 break;
2208 } 2511 }
2209 } 2512 }
2210 } 2513 }
2211 2514
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2516 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2519 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2520 /* XXX: also turn off Opt_transparent? */
2219 } 2521 }
2220 else 2522 else
2221 { 2523 {
2222#if WAIT_FOR_WM 2524#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2525 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2526 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2527 sleep (1);
2226#endif 2528#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2529 for (n = 0; n < (unsigned int)i; n++)
2530 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]);
2533 }
2230 2534
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2536 am_transparent = 1;
2233 } 2537 }
2234 2538
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2540 TermWin.parent[i] = None;
2541 }
2542
2543 if (scrollBar.win)
2544 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle ();
2547 scrollbar_show (0);
2237 } 2548 }
2238 2549
2239 return pchanged; 2550 return pchanged;
2240} 2551}
2241#endif 2552#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2571 if (ch == NOCHAR) // TODO: improve
2261 break; 2572 break;
2262 2573
2263 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)
2264 { 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
2265 /* Read a text string from the input buffer */ 2590 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2591 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2592 bool refreshnow = false;
2268 int nlines = 0; 2593 int nlines = 0;
2269 unicode_t *str = buf; 2594 unicode_t *str = buf;
2270 2595
2271 *str++ = ch;
2272
2273 for (;;) 2596 for (;;)
2274 { 2597 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 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))
2279 break; 2599 break;
2280 2600
2281 *str++ = ch; 2601 *str++ = ch;
2282 2602
2283 if (ch == C0_LF) 2603 if (ch == C0_LF)
2284 { 2604 {
2285 nlines++; 2605 nlines++;
2286 refresh_count++; 2606 refresh_count++;
2287 2607
2288 if (! (Options & Opt_jumpScroll) 2608 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2610 {
2291 refreshnow = true; 2611 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2612 ch = NOCHAR;
2294 break; 2613 break;
2295 } 2614 }
2296 2615
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2617 if (nlines >= TermWin.nrow - 1)
2299 { 2618 {
2300 scr_add_lines (buf, nlines, str - buf); 2619 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2620 nlines = 0;
2302 str = buf; 2621 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2625 if (str >= buf + UBUFSIZ)
2307 { 2626 {
2308 ch = NOCHAR; 2627 ch = NOCHAR;
2309 break; 2628 break;
2310 } 2629 }
2630
2631 seq_begin = cmdbuf_ptr;
2632 ch = next_char ();
2311 } 2633 }
2312 2634
2313 scr_add_lines (buf, nlines, str - buf); 2635 scr_add_lines (buf, nlines, str - buf);
2314 2636
2315 /* 2637 /*
2316 * If there have been a lot of new lines, then update the screen 2638 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2639 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2640 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2641 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2642 */
2324 if (refreshnow) 2643 if (refreshnow)
2325 { 2644 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2646 refresh_limit++;
2328 else 2647 else
2648 {
2649 flag = true;
2329 scr_refresh (refresh_type); 2650 scr_refresh (refresh_type);
2651 }
2330 } 2652 }
2331 2653
2332 } 2654 }
2333 else 2655 else
2334 { 2656 {
… …
2518 process_escape_seq (); 2840 process_escape_seq ();
2519 break; 2841 break;
2520 case C0_ENQ: /* terminal Status */ 2842 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2843 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2846 else
2525 tt_write ((unsigned char *)VT100_ANS, 2847 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2848 (unsigned int)strlen (VT100_ANS));
2527 break; 2849 break;
2528 case C0_BEL: /* bell */ 2850 case C0_BEL: /* bell */
2529 scr_bell (); 2851 scr_bell ();
2530 break; 2852 break;
2531 case C0_BS: /* backspace */ 2853 case C0_BS: /* backspace */
… …
2630void 2952void
2631rxvt_term::process_escape_seq () 2953rxvt_term::process_escape_seq ()
2632{ 2954{
2633 unicode_t ch = cmd_getc (); 2955 unicode_t ch = cmd_getc ();
2634 2956
2635 if (PrivateModes & PrivMode_vt52) 2957 if (priv_modes & PrivMode_vt52)
2636 { 2958 {
2637 process_escape_vt52 (ch); 2959 process_escape_vt52 (ch);
2638 return; 2960 return;
2639 } 2961 }
2640 2962
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2977 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2978 break;
2657 case '+': 2979 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2980 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2981 break;
2660#ifndef NO_FRILLS 2982#if ENABLE_FRILLS
2661 case '6': 2983 case '6':
2662 scr_backindex (); 2984 scr_backindex ();
2663 break; 2985 break;
2664#endif 2986#endif
2665 case '7': 2987 case '7':
2666 scr_cursor (SAVE); 2988 scr_cursor (SAVE);
2667 break; 2989 break;
2668 case '8': 2990 case '8':
2669 scr_cursor (RESTORE); 2991 scr_cursor (RESTORE);
2670 break; 2992 break;
2671#ifndef NO_FRILLS 2993#if ENABLE_FRILLS
2672 case '9': 2994 case '9':
2673 scr_forwardindex (); 2995 scr_forwardindex ();
2674 break; 2996 break;
2675#endif 2997#endif
2676 case '=': 2998 case '=':
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3298 break;
2977 3299
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3301 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3302 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3303 break;
2982 3304
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3306 process_sgr_mode (nargs, arg);
2985 break; 3307 break;
… …
2992 break; 3314 break;
2993 case 6: /* CPR requested */ 3315 case 6: /* CPR requested */
2994 scr_report_position (); 3316 scr_report_position ();
2995 break; 3317 break;
2996 case 7: /* unofficial extension */ 3318 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3319 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3320 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3321 break;
3000 case 8: /* unofficial extension */ 3322 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3324 break;
3003 } 3325 }
… …
3039 break; 3361 break;
3040 3362
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3363 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3364 if (arg[0] == 4)
3043 scr_insert_mode (0); 3365 scr_insert_mode (0);
3366 else if (arg[0] == 20)
3367 priv_modes &= ~PrivMode_LFNL;
3044 break; 3368 break;
3045 3369
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3370 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3371 if (arg[0] == 4)
3048 scr_insert_mode (1); 3372 scr_insert_mode (1);
3373 else if (arg[0] == 20)
3374 priv_modes |= PrivMode_LFNL;
3049 break; 3375 break;
3050 3376
3051 /* 3377 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3378 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3379 */
… …
3065 break; 3391 break;
3066 case CSI_75: 3392 case CSI_75:
3067 scr_cursor (RESTORE); 3393 scr_cursor (RESTORE);
3068 break; 3394 break;
3069 3395
3070#ifndef NO_FRILLS 3396#if ENABLE_FRILLS
3071 case CSI_74: 3397 case CSI_74:
3072 process_window_ops (arg, nargs); 3398 process_window_ops (arg, nargs);
3073 break; 3399 break;
3074#endif 3400#endif
3075 3401
… …
3082 break; 3408 break;
3083 } 3409 }
3084} 3410}
3085/*}}} */ 3411/*}}} */
3086 3412
3087#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
3088/* ARGSUSED */ 3414/* ARGSUSED */
3089void 3415void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3417{
3092 int x, y; 3418 int x, y;
… …
3159 break; 3485 break;
3160 case 19: /* report window size (chars) */ 3486 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3488 break;
3163 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3490 {
3166 char *s; 3491 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (display->display, TermWin.parent[0], &s);
3168 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);
3169 } 3495 }
3170 break; 3496 break;
3171 case 21: /* report window title */ 3497 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3498 {
3174 char *s; 3499 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (display->display, TermWin.parent[0], &s);
3176 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);
3177 } 3503 }
3178 break; 3504 break;
3179 } 3505 }
3180} 3506}
3181#endif 3507#endif
3182 3508
… …
3186 * ends_how is terminator used. returned input must be free()'d 3512 * ends_how is terminator used. returned input must be free()'d
3187 */ 3513 */
3188unsigned char * 3514unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3515rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3516{
3191 unicode_t prev = 0, ch; 3517 unicode_t seen_esc = 0, ch;
3192 unsigned int n = 0; 3518 unsigned int n = 0;
3193 unsigned char *s; 3519 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3520 unsigned char string[STRING_MAX];
3195 3521
3196 while ((ch = cmd_getc ()) != NOCHAR) 3522 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3523 {
3198 if (prev == C0_ESC) 3524 if (seen_esc)
3199 { 3525 {
3200 if (ch == 0x5c) /* 7bit ST */ 3526 if (ch == 0x5c) /* 7bit ST */
3201 break; 3527 break;
3202 else 3528 else
3203 return NULL; 3529 return NULL;
3204 } 3530 }
3531 else if (ch == C0_ESC)
3532 {
3533 seen_esc = 1;
3534 continue;
3535 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3536 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3537 break;
3207 else if (ch < 0x20) 3538 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3539 return NULL; /* other control character - exit */
3540
3541 seen_esc = 0;
3209 3542
3210 if (n >= sizeof (string) - 1) 3543 if (n >= sizeof (string) - 1)
3211 // stop at some sane length 3544 // stop at some sane length
3212 return NULL; 3545 return NULL;
3213 3546
3214 if (ch == C0_SYN) 3547 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3548 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3549 else
3220 string[n++] = prev = ch; 3550 string[n++] = ch;
3221 } 3551 }
3222 3552
3223 string[n++] = '\0'; 3553 string[n++] = '\0';
3224 3554
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL; 3556 return NULL;
3227 3557
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3558 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3559 strncpy (s, string, n);
3230 return s; 3560 return s;
3231} 3561}
3232 3562
3233/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
3234/* 3564/*
… …
3279void 3609void
3280rxvt_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)
3281{ 3611{
3282 if (str[0] == '?' && !str[1]) 3612 if (str[0] == '?' && !str[1])
3283 { 3613 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3614 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3615 pix_colors_focused[color].get (display, r, g, b);
3288 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);
3289 }
3290 } 3617 }
3291 else 3618 else
3292 set_window_color (color, str); 3619 set_window_color (color, str);
3293} 3620}
3294 3621
… …
3322{ 3649{
3323 int changed = 0; 3650 int changed = 0;
3324 int color; 3651 int color;
3325 char *buf, *name; 3652 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3653 bool query = str[0] == '?' && !str[1];
3654 int saveop = op;
3327 3655
3328 assert (str != NULL); 3656 assert (str != NULL);
3329 switch (op) 3657 switch (op)
3330 { 3658 {
3331 case XTerm_name: 3659 case XTerm_name:
… …
3380 break; 3708 break;
3381 3709
3382 case XTerm_Color: 3710 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3711 for (buf = (char *)str; buf && *buf;)
3384 { 3712 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3713 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3714 break;
3387 3715
3388 *name++ = '\0'; 3716 *name++ = '\0';
3389 color = atoi (buf); 3717 color = atoi (buf);
3390 3718
3391 if (color < 0 || color >= TOTAL_COLORS) 3719 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3720 break;
3393 3721
3394 if ((buf = STRCHR (name, ';')) != NULL) 3722 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3723 *buf++ = '\0';
3396 3724
3397 if (name[0] == '?' && !name[1]) 3725 if (name[0] == '?' && !name[1])
3398 { 3726 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3727 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3728 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 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);
3404 }
3405 } 3730 }
3406 else 3731 else
3407 set_window_color (color + minCOLOR, name); 3732 set_window_color (color + minCOLOR, name);
3408 } 3733 }
3409 break; 3734 break;
… …
3426 break; 3751 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3752#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3753 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break; 3755 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3431 case XTerm_Color_UL: 3759 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3761 break;
3434 case XTerm_Color_RV: 3762 case XTerm_Color_RV:
3435 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;
3436 break; 3772 break;
3437#endif 3773#endif
3438 3774
3439 case XTerm_Pixmap: 3775 case XTerm_Pixmap:
3440 if (*str != ';') 3776 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3779 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3780 set_bgPixmap (str); /* change pixmap */
3445#endif 3781#endif
3446 scr_touch (true); 3782 scr_touch (true);
3447 } 3783 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3784 while ((str = strchr (str, ';')) != NULL)
3449 { 3785 {
3450 str++; 3786 str++;
3451#if XPM_BACKGROUND 3787#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3788 changed += scale_pixmap (str);
3453#endif 3789#endif
… …
3472 case XTerm_logfile: 3808 case XTerm_logfile:
3473 // TODO, when secure mode? 3809 // TODO, when secure mode?
3474 break; 3810 break;
3475 3811
3476 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
3477 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
3478 { 3826 {
3479 if (Options & Opt_insecure) 3827 const char *&res = rs[Rs_font + (op - URxvt_font)];
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3828
3481 TermWin.fontset->fontdesc 3829 res = strdup (str);
3482 ? TermWin.fontset->fontdesc 3830 allocated.push_back ((void *)res);
3483 : "", 3831 set_fonts ();
3484 resp);
3485 } 3832 }
3486 else
3487 change_font (str);
3488 break; 3833 break;
3489 3834
3490#ifndef NO_FRILLS 3835#if ENABLE_FRILLS
3491 case XTerm_locale: 3836 case XTerm_locale:
3492 if (query) 3837 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3839 else
3498 { 3840 {
3499 set_locale (str); 3841 set_locale (str);
3500# ifdef USE_XIM 3842# ifdef USE_XIM
3501 im_cb (); 3843 im_cb ();
3502# endif 3844# endif
3503 } 3845 }
3504 break; 3846 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif 3847#endif
3515 3848
3516#ifdef MENUBAR 3849#ifdef MENUBAR
3517 case XTerm_Menu: 3850 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3851 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3853 break;
3521#endif 3854#endif
3522#if 0 3855#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3856 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3883{
3551 int state; 3884 int state;
3552 3885
3553 if (mode == 's') 3886 if (mode == 's')
3554 { 3887 {
3555 SavedModes |= (PrivateModes & bit); 3888 SavedModes |= (priv_modes & bit);
3556 return -1; 3889 return -1;
3557 } 3890 }
3558 else 3891 else
3559 { 3892 {
3560 if (mode == 'r') 3893 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3894 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3895 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3896 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3897 PrivMode (state, bit);
3565 } 3898 }
3566 3899
3567 return state; 3900 return state;
3568} 3901}
… …
3586 { 3, PrivMode_132 }, 3919 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3920 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3921 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3922 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3923 { 7, PrivMode_Autowrap },
3924 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3925 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3926#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3927 { menuBar_esc, PrivMode_menuBar },
3594#endif 3928#endif
3929 // 18, 19 printing-related
3930 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3931#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3932 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3933#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3934 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3935 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3936 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3937 // 45 margin bell NYI
3605 // 46 start logging 3938 // 46 start logging
… …
3646 3979
3647 /* extra handling for values with state unkept */ 3980 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3981 switch (arg[i])
3649 { 3982 {
3650 case 1048: /* alternative cursor save */ 3983 case 1048: /* alternative cursor save */
3984 case 1049:
3651 if (Options & Opt_secondaryScreen) 3985 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 3986 if (mode == 0)
3653 scr_cursor (RESTORE); 3987 scr_cursor (RESTORE);
3654 else if (mode == 1) 3988 else if (mode == 1)
3655 scr_cursor (SAVE); 3989 scr_cursor (SAVE);
3656 break; 3990 break;
… …
3667 * within VT52 mode 4001 * within VT52 mode
3668 */ 4002 */
3669 PrivMode (1, PrivMode_vt52); 4003 PrivMode (1, PrivMode_vt52);
3670 break; 4004 break;
3671 case 3: /* 80/132 */ 4005 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4006 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4008 break;
3675 case 4: /* smooth scrolling */ 4009 case 4: /* smooth scrolling */
3676 if (state) 4010 if (state)
3677 Options &= ~Opt_jumpScroll; 4011 options &= ~Opt_jumpScroll;
3678 else 4012 else
3679 Options |= Opt_jumpScroll; 4013 options |= Opt_jumpScroll;
3680 break; 4014 break;
3681 case 5: /* reverse video */ 4015 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4016 scr_rvideo_mode (state);
3683 break; 4017 break;
3684 case 6: /* relative/absolute origins */ 4018 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4022 scr_autowrap (state);
3689 break; 4023 break;
3690 /* 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 */
3691 case 9: /* X10 mouse reporting */ 4025 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4026 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4027 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4028 break;
3695#ifdef menuBar_esc 4029#ifdef menuBar_esc
3696 case menuBar_esc: 4030 case menuBar_esc:
3697#ifdef MENUBAR 4031#ifdef MENUBAR
3698 map_menuBar (state); 4032 map_menuBar (state);
… …
3718 break; 4052 break;
3719 /* case 66: - application key pad */ 4053 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4054 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4055 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4056 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4057 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4058 break;
3725#if 0 4059#if 0
3726 case 1001: 4060 case 1001:
3727 break; /* X11 mouse highlighting */ 4061 break; /* X11 mouse highlighting */
3728#endif 4062#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4063 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4064 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4065 options &= ~Opt_scrollTtyOutput;
3732 else 4066 else
3733 Options |= Opt_scrollTtyOutput; 4067 options |= Opt_scrollTtyOutput;
3734 break; 4068 break;
3735 case 1011: /* scroll to bottom on key press */ 4069 case 1011: /* scroll to bottom on key press */
3736 if (state) 4070 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4071 options |= Opt_scrollTtyKeypress;
3738 else 4072 else
3739 Options &= ~Opt_scrollTtyKeypress; 4073 options &= ~Opt_scrollTtyKeypress;
3740 break; 4074 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4075 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4076 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4077 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4078 scr_erase_screen (2);
3745 scr_change_screen (state); 4079 scr_change_screen (state);
3746 break; 4080 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4081 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4082 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4083 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4084 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4085 scr_erase_screen (2);
3752 break; 4086 break;
3753 default: 4087 default:
3754 break; 4088 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4114 rendset = 0, rendstyle = ~RS_None;
3781 break; 4115 break;
3782 case 1: 4116 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4117 rendset = 1, rendstyle = RS_Bold;
3784 break; 4118 break;
3785 //case 2: // faint or second colour 4119 //case 2: // low intensity
4120 case 3:
4121 rendset = 1, rendstyle = RS_Italic;
4122 break;
3786 case 4: 4123 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4124 rendset = 1, rendstyle = RS_Uline;
3788 break; 4125 break;
3789 case 5: // slowly blinking 4126 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4127 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4139 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4140 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4141 //...
3805 //case 19: // ninth alt font 4142 //case 19: // ninth alt font
3806 //case 20: // gothic 4143 //case 20: // gothic
3807 case 21: // disable bold, faint 4144 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4145 rendset = 0, rendstyle = RS_Bold;
3809 break; 4146 break;
3810 case 22: 4147 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4148 rendset = 0, rendstyle = RS_Bold;
3812 break; 4149 break;
3813 //case 23: disable italic 4150 case 23: // disable italic
4151 rendset = 0, rendstyle = RS_Italic;
4152 break;
3814 case 24: 4153 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4154 rendset = 0, rendstyle = RS_Uline;
3816 break; 4155 break;
3817 case 25: 4156 case 25:
4157 rendset = 0, rendstyle = RS_Blink;
4158 break;
4159 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4160 rendset = 0, rendstyle = RS_Blink;
3819 break; 4161 break;
3820 case 27: 4162 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4163 rendset = 0, rendstyle = RS_RVid;
3822 break; 4164 break;
… …
3840 case 35: 4182 case 35:
3841 case 36: 4183 case 36:
3842 case 37: 4184 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4185 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4186 break;
3845#ifdef TTY_256COLOR 4187 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4188 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4189 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4190 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4191 i += 2;
3851 } 4192 }
3852 break; 4193 break;
3853#endif
3854 case 39: /* default fg */ 4194 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4195 scr_color (Color_fg, Color_fg);
3856 break; 4196 break;
3857 4197
3858 case 40: 4198 case 40:
… …
3863 case 45: 4203 case 45:
3864 case 46: 4204 case 46:
3865 case 47: 4205 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4206 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4207 break;
3868#ifdef TTY_256COLOR 4208 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4209 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4210 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4211 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4212 i += 2;
3874 } 4213 }
3875 break; 4214 break;
3876#endif
3877 case 49: /* default bg */ 4215 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4216 scr_color (Color_bg, Color_bg);
3879 break; 4217 break;
4218
4219 //case 50: // not variable spacing
3880 4220
3881#ifndef NO_BRIGHTCOLOR 4221#ifndef NO_BRIGHTCOLOR
3882 case 90: 4222 case 90:
3883 case 91: /* set bright fg color */ 4223 case 91: /* set bright fg color */
3884 case 92: 4224 case 92:
3885 case 93: 4225 case 93:
3886 case 94: 4226 case 94:
3887 case 95: 4227 case 95:
3888 case 96: 4228 case 96:
3889 case 97: 4229 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4230 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4231 break;
3893 case 100: 4232 case 100:
3894 case 101: /* set bright bg color */ 4233 case 101: /* set bright bg color */
3895 case 102: 4234 case 102:
3896 case 103: 4235 case 103:
3897 case 104: 4236 case 104:
3898 case 105: 4237 case 105:
3899 case 106: 4238 case 106:
3900 case 107: 4239 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4241 break;
3904#endif 4242#endif
3905 4243
3906 } 4244 }
3907 } 4245 }
… …
3914{ 4252{
3915 unicode_t ch, cmd = cmd_getc (); 4253 unicode_t ch, cmd = cmd_getc ();
3916 4254
3917 if (cmd == 'Q') 4255 if (cmd == 'Q')
3918 { /* query graphics */ 4256 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4257 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4258 return;
3921 } 4259 }
3922 /* swallow other graphics sequences until terminating ':' */ 4260 /* swallow other graphics sequences until terminating ':' */
3923 do 4261 do
3924 ch = cmd_getc (); 4262 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4277 unsigned char buf[256];
3940 4278
3941 va_start (arg_ptr, fmt); 4279 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4281 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4282 tt_write (buf, strlen (buf));
3945} 4283}
3946 4284
3947/* ---------------------------------------------------------------------- */ 4285/* ---------------------------------------------------------------------- */
3948/* 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,
3949 * or generated by us in response to a query ESC sequence. 4287 * or generated by us in response to a query ESC sequence.
3950 */ 4288 */
3951void 4289void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4290rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4291{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 4293
3956 if (len) 4294 if (len)
3957 { 4295 {
3958 if (v_buflen == 0) 4296 if (v_buflen == 0)
3959 { 4297 {
3960 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));
3961 4299
3962 if ((unsigned int)written == len) 4300 if ((unsigned int)written == len)
3963 return; 4301 return;
3964 4302
3965 data += written; 4303 data += written;
… …
3973 v_buflen += len; 4311 v_buflen += len;
3974 } 4312 }
3975 4313
3976 for (;;) 4314 for (;;)
3977 { 4315 {
3978 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));
3979 4317
3980 if (written > 0) 4318 if (written > 0)
3981 { 4319 {
3982 v_buflen -= written; 4320 v_buflen -= written;
3983 4321

Diff Legend

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