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.59 by pcg, Wed Feb 25 15:39:48 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC

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

Diff Legend

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