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.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
127 }
119 } 128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129
130 { 138 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
136 { 144 {
137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL
140 if (ctrl)
141# else
142 if (meta)
143# endif
144 {
145 if (keysym == ks_bigfont)
146 {
147 change_font (0, FONT_UP);
148 return;
149 }
150 else if (keysym == ks_smallfont)
151 {
152 change_font (0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (TermWin.saveLines) 145 if (TermWin.saveLines)
159 { 146 {
160#ifdef UNSHIFTED_SCROLLKEYS 147#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 148 if (!ctrl && !meta)
162 { 149 {
163#else 150#else
164 if (IS_SCROLL_MOD) 151 if (IS_SCROLL_MOD)
165 { 152 {
166#endif 153#endif
167 int lnsppg; 154 int lnsppg;
168 155
169#ifdef PAGING_CONTEXT_LINES 156#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 158#else
172 lnsppg = TermWin.nrow * 4 / 5; 159 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 197 scr_move_to (1, 0);
211 return; 198 return;
212 } 199 }
213 } 200 }
214#endif 201#endif
215
216 } 202 }
217 203
218 if (shft) 204 if (shft)
219 { 205 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 206 /* Shift + F1 - F10 generates F11 - F20 */
… …
227 { 213 {
228 switch (keysym) 214 switch (keysym)
229 { 215 {
230 /* normal XTerm key bindings */ 216 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 217 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 218 selection_request (ev.time, 0, 0);
233 return; 219 return;
234 /* rxvt extras */ 220 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 221 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 222 change_font (FONT_UP);
237 return; 223 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 225 change_font (FONT_DN);
240 return; 226 return;
241 } 227 }
242 } 228 }
243 } 229 }
244#ifdef PRINTPIPE 230#ifdef PRINTPIPE
… …
246 { 232 {
247 scr_printscreen (ctrl | shft); 233 scr_printscreen (ctrl | shft);
248 return; 234 return;
249 } 235 }
250#endif 236#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 237
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 238 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 239 {
270#ifdef KEYSYM_RESOURCE 240#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 242 {
273 unsigned int l; 243 unsigned int l;
274 const unsigned char *kbuf0; 244 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC;
276 245
277 kbuf0 = (Keysym_map[keysym & 0xFF]); 246 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++; 247 l = (unsigned int)*kbuf0++;
279 248
280 /* escape prefix */ 249 /* escape prefix */
281 if (meta) 250 if (meta
282# ifdef META8_OPTION 251# ifdef META8_OPTION
283 if (meta_char == C0_ESC) 252 && meta_char == C0_ESC
284# endif 253# endif
254 )
255 {
256 const unsigned char ch = C0_ESC;
285 tt_write (&ch, 1); 257 tt_write (&ch, 1);
258 }
259
286 tt_write (kbuf0, l); 260 tt_write (kbuf0, l);
287 return; 261 return;
288 } 262 }
289 else 263 else
290#endif 264#endif
291
292 { 265 {
293 newlen = 1; 266 newlen = 1;
294 switch (keysym) 267 switch (keysym)
295 { 268 {
296#ifndef NO_BACKSPACE_KEY 269#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 270 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 271 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 272 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 274 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 275 kbuf[1] = '\0';
303 } 276 }
304 else 277 else
305 STRCPY(kbuf, key_backspace); 278 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
311 newlen = STRLEN(kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
316 }
317# endif
318 break; 279 break;
319#endif 280#endif
320#ifndef NO_DELETE_KEY 281#ifndef NO_DELETE_KEY
321 case XK_Delete: 282 case XK_Delete:
322 STRCPY(kbuf, key_delete); 283 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN(kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 284 break;
336#endif 285#endif
337 case XK_Tab: 286 case XK_Tab:
338 if (shft) 287 if (shft)
339 STRCPY(kbuf, "\033[Z"); 288 STRCPY (kbuf, "\033[Z");
340 else 289 else
341 { 290 {
342#ifdef CTRL_TAB_MAKES_META 291#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 292 if (ctrl)
344 meta = 1; 293 meta = 1;
345#endif 294#endif
346#ifdef MOD4_TAB_MAKES_META 295#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 296 if (ev.state & Mod4Mask)
348 meta = 1; 297 meta = 1;
349#endif 298#endif
350 newlen = 0; 299 newlen = 0;
351 } 300 }
352 break; 301 break;
353
354 302
355#ifdef XK_KP_Left 303#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 304 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 305 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 306 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 307 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 309 {
362 STRCPY(kbuf, "\033OZ"); 310 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 311 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 312 break;
365 } 313 }
366 else 314 else
367 /* translate to std. cursor key */ 315 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 316 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 318#endif
371 case XK_Up: /* "\033[A" */ 319 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 320 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 321 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 322 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 323 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 324 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 325 /* do Shift first */
378 if (shft) 326 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 327 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 328 else if (ctrl)
381 { 329 {
382 kbuf[1] = 'O'; 330 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 331 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 332 }
385 else if (PrivateModes & PrivMode_aplCUR) 333 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 334 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2(screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2(screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 335 break;
423 336
424#ifndef UNSHIFTED_SCROLLKEYS 337#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 338# ifdef XK_KP_Prior
426 case XK_KP_Prior: 339 case XK_KP_Prior:
427 /* allow shift to override */ 340 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 342 {
430 STRCPY(kbuf, "\033Oy"); 343 STRCPY (kbuf, "\033Oy");
431 break; 344 break;
432 } 345 }
433 /* FALLTHROUGH */ 346 /* FALLTHROUGH */
434# endif 347# endif
435 case XK_Prior: 348 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 349 STRCPY (kbuf, "\033[5~");
437 break; 350 break;
438# ifdef XK_KP_Next 351# ifdef XK_KP_Next
439 case XK_KP_Next: 352 case XK_KP_Next:
440 /* allow shift to override */ 353 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 355 {
443 STRCPY(kbuf, "\033Os"); 356 STRCPY (kbuf, "\033Os");
444 break; 357 break;
445 } 358 }
446 /* FALLTHROUGH */ 359 /* FALLTHROUGH */
447# endif 360# endif
448 case XK_Next: 361 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 362 STRCPY (kbuf, "\033[6~");
450 break; 363 break;
451#endif 364#endif
452 case XK_KP_Enter: 365 case XK_KP_Enter:
453 /* allow shift to override */ 366 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 368 {
456 STRCPY(kbuf, "\033OM"); 369 STRCPY (kbuf, "\033OM");
457 } 370 }
458 else 371 else
459 { 372 {
460 kbuf[0] = '\r'; 373 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 374 kbuf[1] = '\0';
462 } 375 }
463 break; 376 break;
464 377
465#ifdef XK_KP_Begin 378#ifdef XK_KP_Begin
466 case XK_KP_Begin: 379 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 380 STRCPY (kbuf, "\033Ou");
468 break; 381 break;
469 382
470 case XK_KP_Insert: 383 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 384 STRCPY (kbuf, "\033Op");
472 break; 385 break;
473 386
474 case XK_KP_Delete: 387 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 388 STRCPY (kbuf, "\033On");
476 break; 389 break;
477#endif 390#endif
478 case XK_KP_F1: /* "\033OP" */ 391 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 392 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 393 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 394 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 395 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 396 kbuf[2] += (keysym - XK_KP_F1);
484 break; 397 break;
485 398
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 399 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 400 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 401 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 402 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 403 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 404 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 405 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 413 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 414 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 415 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 417 {
505 STRCPY(kbuf, "\033Oj"); 418 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 419 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 420 }
508 else 421 else
509 { 422 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 424 kbuf[1] = '\0';
512 } 425 }
513 break; 426 break;
514 427
515 case XK_Find: 428 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 429 STRCPY (kbuf, "\033[1~");
517 break; 430 break;
518 case XK_Insert: 431 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 432 STRCPY (kbuf, "\033[2~");
520 break; 433 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 434#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 435 case DXK_Remove:
523 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
524#endif 437#endif
525 case XK_Execute: 438 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 439 STRCPY (kbuf, "\033[3~");
527 break; 440 break;
528 case XK_Select: 441 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 442 STRCPY (kbuf, "\033[4~");
530 break; 443 break;
531#ifdef XK_KP_End 444#ifdef XK_KP_End
532 case XK_KP_End: 445 case XK_KP_End:
533 /* allow shift to override */ 446 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 448 {
536 STRCPY(kbuf, "\033Oq"); 449 STRCPY (kbuf, "\033Oq");
537 break; 450 break;
538 } 451 }
539 /* FALLTHROUGH */ 452 /* FALLTHROUGH */
540#endif 453#endif
541 case XK_End: 454 case XK_End:
542 STRCPY(kbuf, KS_END); 455 STRCPY (kbuf, KS_END);
543 break; 456 break;
544#ifdef XK_KP_Home 457#ifdef XK_KP_Home
545 case XK_KP_Home: 458 case XK_KP_Home:
546 /* allow shift to override */ 459 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 461 {
549 STRCPY(kbuf, "\033Ow"); 462 STRCPY (kbuf, "\033Ow");
550 break; 463 break;
551 } 464 }
552 /* FALLTHROUGH */ 465 /* FALLTHROUGH */
553#endif 466#endif
554 case XK_Home: 467 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 468 STRCPY (kbuf, KS_HOME);
556 break; 469 break;
557 470
558#define FKEY(n, fkey) \ 471#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 473
561 case XK_F1: /* "\033[11~" */ 474 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 475 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 476 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 477 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 478 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 479 FKEY (11, XK_F1);
567 break; 480 break;
568 case XK_F6: /* "\033[17~" */ 481 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 482 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 483 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 484 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 485 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 486 FKEY (17, XK_F6);
574 break; 487 break;
575 case XK_F11: /* "\033[23~" */ 488 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 489 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 490 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 491 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 492 FKEY (23, XK_F11);
580 break; 493 break;
581 case XK_F15: /* "\033[28~" */ 494 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 495 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 496 FKEY (28, XK_F15);
584 break; 497 break;
585 case XK_Help: /* "\033[28~" */ 498 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 499 FKEY (28, XK_Help);
587 break; 500 break;
588 case XK_Menu: /* "\033[29~" */ 501 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 502 FKEY (29, XK_Menu);
590 break; 503 break;
591 case XK_F17: /* "\033[31~" */ 504 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 505 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 506 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 507 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 518 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 519 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 520 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 521 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 522 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 523 FKEY (31, XK_F17);
611 break; 524 break;
612#undef FKEY 525#undef FKEY
613 default: 526 default:
614 newlen = 0; 527 newlen = 0;
615 break; 528 break;
616 } 529 }
617 if (newlen) 530 if (newlen)
618 len = STRLEN(kbuf); 531 len = STRLEN (kbuf);
619 } 532 }
533
620 /* 534 /*
621 * Pass meta for all function keys, if 'meta' option set 535 * Pass meta for all function keys, if 'meta' option set
622 */ 536 */
623#ifdef META8_OPTION 537#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 538 if (meta && (meta_char == 0x80) && len > 0)
… …
639 { 553 {
640 unsigned char *ch; 554 unsigned char *ch;
641 555
642 for (ch = kbuf; ch < kbuf + len; ch++) 556 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 557 *ch |= 0x80;
558
644 meta = 0; 559 meta = 0;
645 } 560 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 561#endif
651 /* nil */ ; 562 /* nil */ ;
652 } 563 }
653 } 564 }
654 565
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 588 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 589
679 /* escape prefix */ 590 /* escape prefix */
680 if (meta 591 if (meta
681#ifdef META8_OPTION 592#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 593 && meta_char == C0_ESC
683#endif 594#endif
684 ) 595 )
685 { 596 {
686 const unsigned char ch = C0_ESC; 597 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 598 tt_write (&ch, 1);
689 } 599 }
600
690#ifdef DEBUG_CMD 601#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 602 /* Display keyboard buffer contents */
693 char *p; 603 unsigned char *p;
694 int i; 604 int i;
695 605
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 606 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 607 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 608 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 609 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 610#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 611 tt_write (kbuf, (unsigned int)len);
703} 612}
704/*}}} */ 613/*}}} */
705 614
706#if (MENUBAR_MAX) 615#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 617/* attempt to `write' count to the input buffer */
709unsigned int 618unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 619rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 620{
712 unsigned int n, s; 621 unsigned int n, s;
713 622
714 n = cmdbuf_ptr - cmdbuf_base; 623 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
625
716 if (n > 0 && s < count) 626 if (n > 0 && s < count)
717 { 627 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 628 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 630 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 631 cmdbuf_endp -= n;
722 s += n; 632 s += n;
723 } 633 }
634
724 if (count > s) 635 if (count > s)
725 { 636 {
726 rxvt_print_error("data loss: cmd_write too large"); 637 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 638 count = s;
728 } 639 }
640
729 for (; count--;) 641 for (; count--;)
730 *cmdbuf_endp++ = *str++; 642 *cmdbuf_endp++ = *str++;
643
644 cmd_parse ();
645
731 return 0; 646 return 0;
732} 647}
733#endif /* MENUBAR_MAX */ 648#endif /* MENUBAR_MAX */
734 649
735void 650void
… …
753 IMSendSpot (); 668 IMSendSpot ();
754#endif 669#endif
755 670
756 } 671 }
757 672
758 XFlush (Xdisplay); 673 display->flush ();
759} 674}
760 675
761void 676void
762rxvt_term::check_cb (check_watcher &w) 677rxvt_term::check_cb (check_watcher &w)
763{ 678{
764 SET_R (this); 679 SET_R (this);
765 SET_LOCALE (locale); 680 SET_LOCALE (locale);
766 681
767 flush (); 682 flush ();
768}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 683}
813 684
814#ifdef CURSOR_BLINK 685#ifdef CURSOR_BLINK
815void 686void
816rxvt_term::cursor_blink_cb (time_watcher &w) 687rxvt_term::cursor_blink_cb (time_watcher &w)
… …
833 w.start (w.at + TEXT_BLINK_INTERVAL); 704 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 705 }
835} 706}
836#endif 707#endif
837 708
838void
839rxvt_term::x_cb (io_watcher &w, short revents)
840{
841 SET_R (this);
842 SET_LOCALE (locale);
843
844 process_x_events ();
845}
846
847bool 709bool
848rxvt_term::pty_fill () 710rxvt_term::pty_fill ()
849{ 711{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 712 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
851 713
… …
860 cmdbuf_endp += n; 722 cmdbuf_endp += n;
861 return true; 723 return true;
862 } 724 }
863 else if (n < 0 && errno != EAGAIN) 725 else if (n < 0 && errno != EAGAIN)
864 destroy (); 726 destroy ();
865 727
866 return false; 728 return false;
867} 729}
868 730
869void 731void
870rxvt_term::pty_cb (io_watcher &w, short revents) 732rxvt_term::pty_cb (io_watcher &w, short revents)
… …
887 seen_input = 1; 749 seen_input = 1;
888 /* once we know the shell is running, send the screen size. Again! */ 750 /* once we know the shell is running, send the screen size. Again! */
889 tt_winch (); 751 tt_winch ();
890 } 752 }
891 753
754 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
892 uint32_t ch = NOCHAR; 764 uint32_t ch = NOCHAR;
765
766 for (;;)
767 {
768 if (ch == NOCHAR)
769 ch = next_char ();
770
771 if (ch == NOCHAR) // TODO: improve
772 break;
773
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
893 783
894 for (;;) 784 for (;;)
895 { 785 {
896 if (ch == NOCHAR)
897 ch = next_char (); 786 ch = next_char ();
898 787
899 if (ch == NOCHAR) // TODO: improve 788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
900 break; 789 break;
901 790 else
902 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
903 { 791 {
904 /* Read a text string from the input buffer */
905 uint32_t buf[BUFSIZ];
906 bool refreshnow = false;
907 int nlines = 0;
908 uint32_t *str = buf;
909
910 *str++ = ch; 792 *str++ = ch;
911 793
912 for (;;) 794 if (ch == '\n')
913 { 795 {
914 ch = next_char ();
915
916 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
917 break;
918 else 796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
919 { 801 {
920 *str++ = ch;
921
922 if (ch == '\n')
923 {
924 nlines++;
925 refresh_count++;
926
927 if (!(Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 {
930 refreshnow = true; 802 refreshnow = true;
931 flag = false; 803 flag = false;
932 ch = NOCHAR;
933 break;
934 }
935 }
936
937 if (str >= buf + BUFSIZ)
938 {
939 ch = NOCHAR; 804 ch = NOCHAR;
940 break; 805 break;
941 } 806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
942 } 814 }
943 } 815 }
944 816
945 scr_add_lines (buf, nlines, str - buf); 817 if (str >= buf + BUFSIZ)
946
947 /*
948 * If there have been a lot of new lines, then update the screen
949 * What the heck I'll cheat and only refresh less than every page-full.
950 * the number of pages between refreshes is refresh_limit, which
951 * is incremented here because we must be doing flat-out scrolling.
952 *
953 * refreshing should be correct for small scrolls, because of the
954 * time-out
955 */
956 if (refreshnow)
957 { 818 {
958 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 819 ch = NOCHAR;
959 refresh_limit++; 820 break;
960
961 scr_refresh (refresh_type);
962 } 821 }
963
964 }
965 else
966 {
967 switch (ch)
968 {
969 default:
970 process_nonprinting (ch);
971 break;
972 case C0_ESC: /* escape char */
973 process_escape_seq ();
974 break;
975 /*case 0x9b: */ /* CSI */
976 /* process_csi_seq (); */
977 }
978
979 ch = NOCHAR;
980 } 822 }
981 } 823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
982 } 846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
983 } 861 }
862
863 return flag;
984} 864}
985 865
986// read the next character, currently handles UTF-8 866// read the next character, currently handles UTF-8
987// will probably handle all sorts of other stuff in the future 867// will probably handle all sorts of other stuff in the future
988uint32_t 868uint32_t
989rxvt_term::next_char () 869rxvt_term::next_char ()
990{ 870{
991 while (cmdbuf_ptr < cmdbuf_endp) 871 while (cmdbuf_ptr < cmdbuf_endp)
992 { 872 {
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
994 return *cmdbuf_ptr++; 876 return *cmdbuf_ptr++;
995 877
996 wchar_t wc; 878 wchar_t wc;
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
998 880
999 if (len == (size_t)-2) 881 if (len == (size_t)-2)
1000 return NOCHAR; 882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
1001 887
1002 if (len == (size_t)-1) 888 if (len == (size_t)-1)
1003 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
1004 890
1005 // assume wchar == unicode 891 // assume wchar == unicode
… …
1008 } 894 }
1009 895
1010 return NOCHAR; 896 return NOCHAR;
1011} 897}
1012 898
1013/* rxvt_cmd_getc() - Return next input character */ 899/* rxvt_cmd_getc () - Return next input character */
1014/* 900/*
1015 * Return the next input character after first passing any keyboard input 901 * Return the next input character after first passing any keyboard input
1016 * to the command. 902 * to the command.
1017 */ 903 */
1018uint32_t 904uint32_t
… …
1034 920
1035#ifdef POINTER_BLANK 921#ifdef POINTER_BLANK
1036void 922void
1037rxvt_term::pointer_unblank () 923rxvt_term::pointer_unblank ()
1038{ 924{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1040 recolour_cursor (); 926 recolour_cursor ();
1041 927
1042 hidden_pointer = 0; 928 hidden_pointer = 0;
1043 929
1044 if (Options & Opt_pointerBlank) 930 if (Options & Opt_pointerBlank)
… …
1046} 932}
1047 933
1048void 934void
1049rxvt_term::pointer_blank () 935rxvt_term::pointer_blank ()
1050{ 936{
1051 if (!(Options & Opt_pointerBlank)) 937 if (! (Options & Opt_pointerBlank))
1052 return; 938 return;
1053 939
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 940 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 941 XFlush (display->display);
1056 942
1057 hidden_pointer = 1; 943 hidden_pointer = 1;
1058} 944}
1059 945
1060void 946void
… …
1066 pointer_blank (); 952 pointer_blank ();
1067} 953}
1068#endif 954#endif
1069 955
1070void 956void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 957rxvt_term::mouse_report (XButtonEvent &ev)
1072{ 958{
1073 int button_number, key_state = 0; 959 int button_number, key_state = 0;
1074 int x, y; 960 int x, y;
1075 961
1076 x = ev->x; 962 x = ev.x;
1077 y = ev->y; 963 y = ev.y;
1078 pixel_position (&x, &y); 964 pixel_position (&x, &y);
1079 965
1080 if (MEvent.button == AnyButton) 966 if (MEvent.button == AnyButton)
1081 { 967 {
1082 button_number = 3; 968 button_number = 3;
… …
1116#endif 1002#endif
1117 1003
1118 } 1004 }
1119 1005
1120#ifdef DEBUG_MOUSEREPORT 1006#ifdef DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 1007 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 1008 if (key_state & 16)
1123 fputc('C', stderr); 1009 fputc ('C', stderr);
1124 if (key_state & 4) 1010 if (key_state & 4)
1125 fputc('S', stderr); 1011 fputc ('S', stderr);
1126 if (key_state & 8) 1012 if (key_state & 8)
1127 fputc('A', stderr); 1013 fputc ('A', stderr);
1128 if (key_state & 32) 1014 if (key_state & 32)
1129 fputc('2', stderr); 1015 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 1016 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 1017 button_number,
1132 x + 1, 1018 x + 1,
1133 y + 1); 1019 y + 1);
1134#else 1020#else
1135 tt_printf("\033[M%c%c%c", 1021 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 1022 (32 + button_number + key_state),
1137 (32 + x + 1), 1023 (32 + x + 1),
1138 (32 + y + 1)); 1024 (32 + y + 1));
1139#endif 1025#endif
1140} 1026}
1141 1027
1142#ifdef USING_W11LIB 1028#ifdef USING_W11LIB
1143void 1029void
1144rxvt_W11_process_x_event(XEvent *ev) 1030rxvt_W11_process_x_event (XEvent *ev)
1145{ 1031{
1146 rxvt_t *r = rxvt_get_r(); 1032 rxvt_t *r = rxvt_get_r ();
1147 1033
1148 process_x_event (ev); 1034 x_cb (*ev);
1149} 1035}
1150#endif 1036#endif
1151 1037
1152/*{{{ process an X event */ 1038/*{{{ process an X event */
1153void 1039void
1154rxvt_term::process_x_event (XEvent *ev) 1040rxvt_term::x_cb (XEvent &ev)
1155{ 1041{
1042 SET_R (this);
1043 SET_LOCALE (locale);
1044
1045#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1047 {
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 }
1056#endif
1057
1058#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 {
1061 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease)
1064 if (hidden_pointer)
1065 pointer_unblank ();
1066
1067 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank ();
1069 }
1070#endif
1071
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1156 Window unused_root, unused_child; 1077 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1078 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1079 unsigned int unused_mask;
1159 1080
1160#ifdef DEBUG_X 1081#ifdef DEBUG_X
… …
1199#endif 1120#endif
1200 1121
1201#ifdef DEBUG_X 1122#ifdef DEBUG_X
1202 struct timeval tp; 1123 struct timeval tp;
1203 struct tm *ltt; 1124 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL); 1125 (void)gettimeofday (&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec)); 1126 ltt = localtime (& (tp.tv_sec));
1206 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)); 1127 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));
1207#endif 1128#endif
1208 1129
1209 switch (ev->type) 1130 switch (ev.type)
1210 { 1131 {
1211 case KeyPress: 1132 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1133 lookup_key (ev.xkey);
1213 break; 1134 break;
1214 1135
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1137 case KeyRelease:
1217 { 1138 {
1218 if (!(ev->xkey.state & ControlMask)) 1139 if (! (ev.xkey.state & ControlMask))
1219 mouse_slip_wheel_speed = 0; 1140 mouse_slip_wheel_speed = 0;
1220 else 1141 else
1221 { 1142 {
1222 KeySym ks; 1143 KeySym ks;
1223 1144
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R) 1146 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0; 1147 mouse_slip_wheel_speed = 0;
1227 } 1148 }
1228 break; 1149 break;
1229 } 1150 }
1230#endif 1151#endif
1231 1152
1232 case ButtonPress: 1153 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1154 button_press (ev.xbutton);
1234 break; 1155 break;
1235 1156
1236 case ButtonRelease: 1157 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1158 button_release (ev.xbutton);
1238 break; 1159 break;
1239 1160
1240 case ClientMessage: 1161 case ClientMessage:
1241 if (ev->xclient.format == 32 1162 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1243 destroy (); 1164 destroy ();
1244#ifdef OFFIX_DND 1165#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1166 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1168 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1169 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1170 || ev.xclient.data.l[0] == DndLink))
1250 { 1171 {
1251 /* Get Dnd data */ 1172 /* Get Dnd data */
1252 Atom ActualType; 1173 Atom ActualType;
1253 int ActualFormat; 1174 int ActualFormat;
1254 unsigned char *data; 1175 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1176 unsigned long Size, RemainingBytes;
1256 1177
1257 XGetWindowProperty(Xdisplay, Xroot, 1178 XGetWindowProperty (display->display, display->root,
1258 xa[XA_DNDSELECTION], 1179 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1180 0L, 1000000L,
1260 False, AnyPropertyType, 1181 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1182 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1183 &Size, &RemainingBytes,
1263 &data); 1184 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1185 XChangeProperty (display->display, display->root,
1265 XA_CUT_BUFFER0, XA_STRING, 1186 XA_CUT_BUFFER0, XA_STRING,
1266 8, PropModeReplace, 1187 8, PropModeReplace,
1267 data, STRLEN(data)); 1188 data, STRLEN (data));
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1189 selection_paste (display->root, XA_CUT_BUFFER0, True);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1270 } 1191 }
1271#endif /* OFFIX_DND */ 1192#endif /* OFFIX_DND */
1272 break; 1193 break;
1273 1194
1274 case MappingNotify: 1195 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1196 XRefreshKeyboardMapping (& (ev.xmapping));
1276 break; 1197 break;
1277 1198
1278 /* 1199 /*
1279 * XXX: this is not the _current_ arrangement 1200 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1201 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1205 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1206 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1207 * which ought to make things real slow!
1287 */ 1208 */
1288 case VisibilityNotify: 1209 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1210 switch (ev.xvisibility.state)
1290 { 1211 {
1291 case VisibilityUnobscured: 1212 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1213 refresh_type = FAST_REFRESH;
1293 break; 1214 break;
1294 case VisibilityPartiallyObscured: 1215 case VisibilityPartiallyObscured:
… …
1305 { 1226 {
1306 TermWin.focus = 1; 1227 TermWin.focus = 1;
1307 want_refresh = 1; 1228 want_refresh = 1;
1308#ifdef USE_XIM 1229#ifdef USE_XIM
1309 if (Input_Context != NULL) 1230 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context); 1231 XSetICFocus (Input_Context);
1311#endif 1232#endif
1312#ifdef CURSOR_BLINK 1233#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink) 1234 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif 1236#endif
… …
1322 { 1243 {
1323 TermWin.focus = 0; 1244 TermWin.focus = 0;
1324 want_refresh = 1; 1245 want_refresh = 1;
1325#ifdef USE_XIM 1246#ifdef USE_XIM
1326 if (Input_Context != NULL) 1247 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context); 1248 XUnsetICFocus (Input_Context);
1328#endif 1249#endif
1329#ifdef CURSOR_BLINK 1250#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink) 1251 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop (); 1252 cursor_blink_ev.stop ();
1332 hidden_cursor = 0; 1253 hidden_cursor = 0;
… …
1334 1255
1335 } 1256 }
1336 break; 1257 break;
1337 1258
1338 case ConfigureNotify: 1259 case ConfigureNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1260 if (ev.xconfigure.window == TermWin.parent[0])
1340 { 1261 {
1341 int height, width; 1262 int height, width;
1342 1263
1343 do 1264 do
1344 { /* Wrap lots of configures into one */ 1265 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width; 1266 width = ev.xconfigure.width;
1346 height = ev->xconfigure.height; 1267 height = ev.xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 } 1269 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1350 ConfigureNotify, ev)); 1271
1351 if (szHint.width != width || szHint.height != height) 1272 if (szHint.width != width || szHint.height != height)
1352 { 1273 {
1353 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1354 resize_all_windows (width, height, 1); 1275 resize_all_windows (width, height, 1);
1355 } 1276 }
1356#ifdef DEBUG_SIZE 1277#ifdef DEBUG_SIZE
1357 else 1278 else
1358 { 1279 {
1359 D_SIZE((stderr, "Size: Not resizing")); 1280 D_SIZE ((stderr, "Size: Not resizing"));
1360 } 1281 }
1361#endif 1282#endif
1362#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent) 1284 if (Options & Opt_transparent)
1364 { 1285 {
… …
1370 1291
1371 } 1292 }
1372 break; 1293 break;
1373 1294
1374 case SelectionClear: 1295 case SelectionClear:
1375 selection_clear (); 1296 display->set_selection_owner (0);
1376 break; 1297 break;
1377 1298
1378 case SelectionNotify: 1299 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1300 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1301 selection_paste (ev.xselection.requestor,
1381 ev->xselection.property, True); 1302 ev.xselection.property, True);
1382 break; 1303 break;
1383 1304
1384 case SelectionRequest: 1305 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1306 selection_send (ev.xselectionrequest);
1386 break; 1307 break;
1387 1308
1388 case UnmapNotify: 1309 case UnmapNotify:
1389 TermWin.mapped = 0; 1310 TermWin.mapped = 0;
1390#ifdef TEXT_BLINK 1311#ifdef TEXT_BLINK
… …
1397#ifdef TEXT_BLINK 1318#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1320#endif
1400 break; 1321 break;
1401 1322
1402 case PropertyNotify:
1403 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1404 {
1405 if (ev->xproperty.state == PropertyNewValue)
1406 selection_property (ev->xproperty.window,
1407 ev->xproperty.atom);
1408 break;
1409 }
1410#ifdef TRANSPARENT 1323#ifdef TRANSPARENT
1411 /*
1412 * if user used some Esetroot compatible prog to set the root bg,
1413 * use the property to determine the pixmap. We use it later on.
1414 */
1415 if (xa[XA_XROOTPMAPID] == 0)
1416 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1417 "_XROOTPMAP_ID", False);
1418 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1419 break;
1420 /* FALLTHROUGH */
1421 case ReparentNotify: 1324 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1325 rootwin_cb (ev);
1423 { 1326 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1327#endif /* TRANSPARENT */
1428 break;
1429 1328
1430 case GraphicsExpose: 1329 case GraphicsExpose:
1431 case Expose: 1330 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1331 if (ev.xany.window == TermWin.vt)
1433 { 1332 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1333#ifdef NO_SLOW_LINK_SUPPORT
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1334 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1335 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1336#else
1438 // don't understand this, so commented it out 1337 // don't understand this, so commented it out
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1338 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1339 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1340 //scr_expose (ev.xexpose.x, 0,
1442 // ev->xexpose.width, TermWin.height, False); 1341 // ev.xexpose.width, TermWin.height, False);
1443#endif 1342#endif
1444 want_refresh = 1; 1343 want_refresh = 1;
1445 } 1344 }
1446 else 1345 else
1447 { 1346 {
1448 XEvent unused_xevent; 1347 XEvent unused_event;
1449 1348
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1451 Expose, 1350 Expose,
1452 &unused_xevent)) ; 1351 &unused_event)) ;
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1454 GraphicsExpose, 1353 GraphicsExpose,
1455 &unused_xevent)) ; 1354 &unused_event)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1355 if (isScrollbarWindow (ev.xany.window))
1457 { 1356 {
1458 scrollBar.setIdle(); 1357 scrollBar.setIdle ();
1459 scrollbar_show (0); 1358 scrollbar_show (0);
1460 } 1359 }
1461#ifdef MENUBAR 1360#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1362 menubar_expose ();
1464#endif 1363#endif
1465#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window);
1467#endif
1468
1469 } 1364 }
1470 break; 1365 break;
1471 1366
1472 case MotionNotify: 1367 case MotionNotify:
1473#ifdef POINTER_BLANK 1368#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1369 if (hidden_pointer)
1475 pointer_unblank (); 1370 pointer_unblank ();
1476#endif 1371#endif
1477#if MENUBAR 1372#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1373 if (isMenuBarWindow (ev.xany.window))
1479 { 1374 {
1480 menubar_control (&(ev->xbutton)); 1375 menubar_control (ev.xbutton);
1481 break; 1376 break;
1482 } 1377 }
1483#endif 1378#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1485 break; 1380 break;
1486 1381
1487 if (ev->xany.window == TermWin.vt) 1382 if (ev.xany.window == TermWin.vt)
1488 { 1383 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1490 { 1385 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1387 ;
1388
1493 XQueryPointer(Xdisplay, TermWin.vt, 1389 XQueryPointer (display->display, TermWin.vt,
1494 &unused_root, &unused_child, 1390 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1391 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1392 & (ev.xbutton.x), & (ev.xbutton.y),
1497 &unused_mask); 1393 &unused_mask);
1498#ifdef MOUSE_THRESHOLD 1394#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1395 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1397 {
1502#endif 1398#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1400 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1401#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1402 if (ev.xbutton.y < TermWin.int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 { 1404 {
1509 int dist; 1405 int dist;
1510 1406
1511 pending_scroll_selection=1; 1407 pending_scroll_selection=1;
1512 1408
… …
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1518 1414
1519 /* save the event params so we can highlight 1415 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1416 * the selection in the pending-scroll loop
1521 */ 1417 */
1522 selection_save_x=ev->xbutton.x; 1418 selection_save_x=ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1419 selection_save_y=ev.xbutton.y;
1524 selection_save_state= 1420 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1421 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1422
1527 /* calc number of lines to scroll */ 1423 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1424 if (ev.xbutton.y<TermWin.int_bwidth)
1529 { 1425 {
1530 scroll_selection_dir = UP; 1426 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1427 dist = TermWin.int_bwidth - ev.xbutton.y;
1532 } 1428 }
1533 else 1429 else
1534 { 1430 {
1535 scroll_selection_dir = DN; 1431 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1432 dist = ev.xbutton.y -
1537 (TermWin.int_bwidth + TermWin.height); 1433 (TermWin.int_bwidth + TermWin.height);
1538 } 1434 }
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1435 scroll_selection_lines= (Pixel2Height (dist)/
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1436 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1541 MIN_IT(scroll_selection_lines, 1437 MIN_IT (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1438 SELECTION_SCROLL_MAX_LINES);
1543 } 1439 }
1544 else 1440 else
1545 { 1441 {
1546 /* we are within the text window, so we 1442 /* we are within the text window, so we
… …
1554 } 1450 }
1555#endif 1451#endif
1556 1452
1557 } 1453 }
1558 } 1454 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1456 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1562 MotionNotify, ev)) ; 1458 MotionNotify, &ev)) ;
1563 XQueryPointer(Xdisplay, scrollBar.win, 1459 XQueryPointer (display->display, scrollBar.win,
1564 &unused_root, &unused_child, 1460 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1461 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1462 & (ev.xbutton.x), & (ev.xbutton.y),
1567 &unused_mask); 1463 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1465 scrollbar_size ());
1570 scr_refresh (refresh_type); 1466 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1467 refresh_limit = 0;
1572 scrollbar_show (1); 1468 scrollbar_show (1);
1573 } 1469 }
1574 break; 1470 break;
1575 } 1471 }
1576} 1472}
1577 1473
1578void 1474void
1475rxvt_term::rootwin_cb (XEvent &ev)
1476{
1477 SET_R (this);
1478 SET_LOCALE (locale);
1479
1480 switch (ev.type)
1481 {
1482 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /*
1493 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on.
1495 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1500 return;
1501 }
1502
1503 /* FALLTHROUGH */
1504 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ())
1506 if (am_transparent)
1507 want_full_refresh = 1;
1508 break;
1509#endif
1510 }
1511}
1512
1513void
1579rxvt_term::button_press (XButtonEvent *ev) 1514rxvt_term::button_press (XButtonEvent &ev)
1580{ 1515{
1581 int reportmode = 0, clickintime; 1516 int reportmode = 0, clickintime;
1582 1517
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1519 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1520 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1586 /* 1521 /*
1587 * VT window processing of button press 1522 * VT window processing of button press
1588 */ 1523 */
1589 if (ev->window == TermWin.vt) 1524 if (ev.window == TermWin.vt)
1590 { 1525 {
1591#if RXVT_GRAPHICS
1592 if (ev->subwindow != None)
1593 rxvt_Gr_ButtonPress (ev->x, ev->y);
1594 else
1595#endif
1596
1597 {
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1599 if (reportmode) 1527 if (reportmode)
1528 {
1529 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime)
1600 { 1534 {
1601 /* mouse report from vt window */ 1535 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1536 MEvent.clicks++;
1603 MEvent.state = ev->state; 1537 if (MEvent.clicks > 1)
1604#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1538 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1539 /* only report double clicks */
1612 MEvent.clicks = 2; 1540 MEvent.clicks = 2;
1613 mouse_report (ev); 1541 mouse_report (ev);
1614 1542
1615 /* don't report the release */ 1543 /* don't report the release */
1616 MEvent.clicks = 0; 1544 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1545 MEvent.button = AnyButton;
1618 }
1619 } 1546 }
1620 else
1621 {
1622 /* different button, or time expired */
1623 MEvent.clicks = 1;
1624 MEvent.button = ev->button;
1625 mouse_report (ev);
1626 }
1627#else
1628 MEvent.button = ev->button;
1629 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */
1631
1632 } 1547 }
1633 else 1548 else
1634 { 1549 {
1635 if (ev->button != MEvent.button) 1550 /* different button, or time expired */
1636 MEvent.clicks = 0; 1551 MEvent.clicks = 1;
1552 MEvent.button = ev.button;
1553 mouse_report (ev);
1554 }
1555#else
1556 MEvent.button = ev.button;
1557 mouse_report (ev);
1558#endif /* MOUSE_REPORT_DOUBLECLICK */
1559
1560 }
1561 else
1562 {
1563 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0;
1637 switch (ev->button) 1565 switch (ev.button)
1638 { 1566 {
1639 case Button1: 1567 case Button1:
1640 /* allow shift+left click to extend selection */ 1568 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1642 { 1570 {
1643 if (MEvent.button == Button1 && clickintime) 1571 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1572 selection_rotate (ev.x, ev.y);
1645 else
1646 selection_extend (ev->x, ev->y, 1);
1647 }
1648 else 1573 else
1649 { 1574 selection_extend (ev.x, ev.y, 1);
1650 if (MEvent.button == Button1 && clickintime)
1651 MEvent.clicks++;
1652 else
1653 MEvent.clicks = 1;
1654
1655 selection_click (MEvent.clicks, ev->x, ev->y);
1656 } 1575 }
1657 1576 else
1658 MEvent.button = Button1;
1659 break; 1577 {
1660
1661 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1578 if (MEvent.button == Button1 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1579 MEvent.clicks++;
1664 else 1580 else
1581 MEvent.clicks = 1;
1582
1583 selection_click (MEvent.clicks, ev.x, ev.y);
1584 }
1585
1586 MEvent.button = Button1;
1587 break;
1588
1589 case Button3:
1590 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y);
1592 else
1665 selection_extend (ev->x, ev->y, 1); 1593 selection_extend (ev.x, ev.y, 1);
1666 MEvent.button = Button3; 1594 MEvent.button = Button3;
1667 break; 1595 break;
1668 }
1669 } 1596 }
1597 }
1670 MEvent.time = ev->time; 1598 MEvent.time = ev.time;
1671 return; 1599 return;
1672 }
1673 } 1600 }
1674 1601
1675 /* 1602 /*
1676 * Scrollbar window processing of button press 1603 * Scrollbar window processing of button press
1677 */ 1604 */
1678 if (isScrollbarWindow(ev->window)) 1605 if (isScrollbarWindow (ev.window))
1679 { 1606 {
1680 scrollBar.setIdle (); 1607 scrollBar.setIdle ();
1681 /* 1608 /*
1682 * Rxvt-style scrollbar: 1609 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1610 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1622 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1623 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1624 * click on scrollbar - send pageup/down
1698 */ 1625 */
1699 if ((scrollBar.style == R_SB_NEXT 1626 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1627 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1628 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1629 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1630 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1631 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1632 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1633 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1634 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1635 tt_printf ("\033[B");
1709 else 1636 else
1710 switch (ev->button) 1637 switch (ev.button)
1711 { 1638 {
1712 case Button2: 1639 case Button2:
1713 tt_printf("\014"); 1640 tt_printf ("\014");
1714 break; 1641 break;
1715 case Button1: 1642 case Button1:
1716 tt_printf("\033[6~"); 1643 tt_printf ("\033[6~");
1717 break; 1644 break;
1718 case Button3: 1645 case Button3:
1719 tt_printf("\033[5~"); 1646 tt_printf ("\033[5~");
1720 break; 1647 break;
1721 } 1648 }
1722 } 1649 }
1723 else 1650 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1651#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1653 {
1727 char upordown = 0; 1654 char upordown = 0;
1728 1655
1729 if (scrollBar.style == R_SB_NEXT) 1656 if (scrollBar.style == R_SB_NEXT)
1730 { 1657 {
1731 if (scrollbarnext_upButton(ev->y)) 1658 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1659 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1660 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1661 upordown = 1; /* down */
1735 } 1662 }
1736 else if (scrollBar.style == R_SB_RXVT) 1663 else if (scrollBar.style == R_SB_RXVT)
1737 { 1664 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1665 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1666 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1667 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1668 upordown = 1; /* down */
1742 } 1669 }
1743 if (upordown) 1670 if (upordown)
1744 { 1671 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1752 else 1679 else
1753 scrollBar.setDn (); 1680 scrollBar.setDn ();
1754 } 1681 }
1755 } 1682 }
1756 else 1683 else
1757 switch (ev->button) 1684 switch (ev.button)
1758 { 1685 {
1759 case Button2: 1686 case Button2:
1760 switch (scrollbar_align) 1687 switch (scrollbar_align)
1761 { 1688 {
1762 case R_SB_ALIGN_TOP: 1689 case R_SB_ALIGN_TOP:
… …
1768 case R_SB_ALIGN_BOTTOM: 1695 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1696 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1697 break;
1771 } 1698 }
1772 if (scrollBar.style == R_SB_XTERM 1699 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1700 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1701 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1702 scr_move_to ( scrollbar_position (ev.y) - csrO,
1776 scrollbar_size()); 1703 scrollbar_size ());
1777 scrollBar.setMotion (); 1704 scrollBar.setMotion ();
1778 break; 1705 break;
1779 1706
1780 case Button1: 1707 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1708 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1709 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1710 /* FALLTHROUGH */
1784 1711
1785 case Button3: 1712 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1713 if (scrollBar.style != R_SB_XTERM)
1787 { 1714 {
1788 if (scrollbar_above_slider(ev->y)) 1715 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1716# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1717 scr_page (UP, TermWin.nrow - 1);
1791# else 1718# else
1792 scr_page (UP, TermWin.nrow / 4); 1719 scr_page (UP, TermWin.nrow / 4);
1793# endif 1720# endif
1794 else if (scrollbar_below_slider(ev->y)) 1721 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1722# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 1723 scr_page (DN, TermWin.nrow - 1);
1797# else 1724# else
1798 scr_page (DN, TermWin.nrow / 4); 1725 scr_page (DN, TermWin.nrow / 4);
1799# endif 1726# endif
1800 else 1727 else
1801 scrollBar.setMotion (); 1728 scrollBar.setMotion ();
1802 } 1729 }
1803 else 1730 else
1804 { 1731 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 1732 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 1733 (TermWin.nrow
1807 * scrollbar_position(ev->y) 1734 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 1735 / scrollbar_size ()));
1809 } 1736 }
1810 break; 1737 break;
1811 } 1738 }
1812 } 1739 }
1813 return; 1740 return;
1814 } 1741 }
1815#if MENUBAR 1742#if MENUBAR
1816 /* 1743 /*
1817 * Menubar window processing of button press 1744 * Menubar window processing of button press
1818 */ 1745 */
1819 if (isMenuBarWindow(ev->window)) 1746 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 1747 menubar_control (ev);
1821#endif 1748#endif
1822} 1749}
1823 1750
1824void 1751void
1825rxvt_term::button_release (XButtonEvent *ev) 1752rxvt_term::button_release (XButtonEvent &ev)
1826{ 1753{
1827 int reportmode = 0; 1754 int reportmode = 0;
1828 1755
1829 csrO = 0; /* reset csr Offset */ 1756 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 1757 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1758 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1832 1759
1833 if (scrollbar_isUpDn()) 1760 if (scrollbar_isUpDn ())
1834 { 1761 {
1835 scrollBar.setIdle (); 1762 scrollBar.setIdle ();
1836 scrollbar_show (0); 1763 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 1765 refresh_type &= ~SMOOTH_REFRESH;
… …
1840 1767
1841 } 1768 }
1842#ifdef SELECTION_SCROLLING 1769#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 1770 pending_scroll_selection=0;
1844#endif 1771#endif
1845 if (ev->window == TermWin.vt) 1772 if (ev.window == TermWin.vt)
1846 { 1773 {
1847#ifdef RXVT_GRAPHICS
1848 if (ev->subwindow != None)
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1850 else
1851#endif
1852
1853 {
1854 if (reportmode) 1774 if (reportmode)
1775 {
1776 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4)
1779 return;
1780#ifdef MOUSE_REPORT_DOUBLECLICK
1781 /* only report the release of 'slow' single clicks */
1782 if (MEvent.button != AnyButton
1783 && (ev.button != MEvent.button
1784 || (ev.time - MEvent.time
1785 > MULTICLICK_TIME / 2)))
1855 { 1786 {
1856 /* mouse report from vt window */
1857 /* don't report release of wheel "buttons" */
1858 if (ev->button >= 4)
1859 return;
1860#ifdef MOUSE_REPORT_DOUBLECLICK
1861 /* only report the release of 'slow' single clicks */
1862 if (MEvent.button != AnyButton
1863 && (ev->button != MEvent.button
1864 || (ev->time - MEvent.time
1865 > MULTICLICK_TIME / 2)))
1866 {
1867 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 1788 MEvent.button = AnyButton;
1873 mouse_report (ev); 1789 mouse_report (ev);
1790 }
1791#else /* MOUSE_REPORT_DOUBLECLICK */
1792 MEvent.button = AnyButton;
1793 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1794#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 1795 return;
1876 } 1796 }
1877 /* 1797 /*
1878 * dumb hack to compensate for the failure of click-and-drag 1798 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 1799 * when overriding mouse reporting
1880 */ 1800 */
1881 if (PrivateModes & PrivMode_mouse_report 1801 if (PrivateModes & PrivMode_mouse_report
1882 && bypass_keystate 1802 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 1803 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 1804 selection_extend (ev.x, ev.y, 0);
1885 1805
1886 switch (ev->button) 1806 switch (ev.button)
1807 {
1808 case Button1:
1809 case Button3:
1810 selection_make (ev.time);
1811 break;
1812 case Button2:
1813 selection_request (ev.time, ev.x, ev.y);
1814 break;
1815#ifdef MOUSE_WHEEL
1816 case Button4:
1817 case Button5:
1887 { 1818 {
1888 case Button1: 1819 int i;
1889 case Button3: 1820 page_dirn v;
1890 selection_make (ev->time); 1821
1822 v = (ev.button == Button4) ? UP : DN;
1823 if (ev.state & ShiftMask)
1891 break; 1824 i = 1;
1892 case Button2: 1825 else if ((Options & Opt_mouseWheelScrollPage))
1893 selection_request (ev->time, ev->x, ev->y); 1826 i = TermWin.nrow - 1;
1827 else
1894 break; 1828 i = 5;
1895#ifdef MOUSE_WHEEL 1829# ifdef MOUSE_SLIP_WHEELING
1896 case Button4: 1830 if (ev.state & ControlMask)
1897 case Button5:
1898 { 1831 {
1899 int i;
1900 page_dirn v;
1901
1902 v = (ev->button == Button4) ? UP : DN;
1903 if (ev->state & ShiftMask)
1904 i = 1;
1905 else if ((Options & Opt_mouseWheelScrollPage))
1906 i = TermWin.nrow - 1;
1907 else
1908 i = 5;
1909# ifdef MOUSE_SLIP_WHEELING
1910 if (ev->state & ControlMask)
1911 {
1912 mouse_slip_wheel_speed += (v ? -1 : 1); 1832 mouse_slip_wheel_speed += (v ? -1 : 1);
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1914 } 1834 }
1915# endif 1835# endif
1916# ifdef JUMP_MOUSE_WHEEL 1836# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1917 scr_page (v, i); 1843 scr_page (v, 1);
1918 scr_refresh (SMOOTH_REFRESH); 1844 scr_refresh (SMOOTH_REFRESH);
1919 scrollbar_show (1); 1845 scrollbar_show (1);
1920# else
1921 while (i--)
1922 {
1923 scr_page (v, 1);
1924 scr_refresh (SMOOTH_REFRESH);
1925 scrollbar_show (1);
1926 } 1846 }
1927# endif 1847# endif
1928 1848
1929 }
1930 break;
1931#endif
1932
1933 } 1849 }
1850 break;
1851#endif
1852
1934 } 1853 }
1935 } 1854 }
1936#ifdef MENUBAR 1855#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 1856 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 1857 menubar_control (ev);
1939#endif 1858#endif
1940} 1859}
1941 1860
1942 1861
… …
1956 Pixmap rootpixmap = None; 1875 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 1876 XWindowAttributes wattr, wrootattr;
1958 1877
1959 pchanged = 0; 1878 pchanged = 0;
1960 1879
1961 if (!(Options & Opt_transparent)) 1880 if (! (Options & Opt_transparent))
1962 return pchanged; /* Don't try any more */ 1881 return pchanged; /* Don't try any more */
1963 1882
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1883 XGetWindowAttributes (display->display, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 1884 rootdepth = wrootattr.depth;
1966 1885
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1968 if (rootdepth != wattr.depth) 1887 if (rootdepth != wattr.depth)
1969 { 1888 {
1970 if (am_transparent) 1889 if (am_transparent)
1971 { 1890 {
1972 pchanged = 1; 1891 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 1892 XSetWindowBackground (display->display, TermWin.vt,
1974 PixColors[Color_bg]); 1893 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 1894 am_transparent = am_pixmap_trans = 0;
1976 } 1895 }
1977 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1978 } 1897 }
1979 1898
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 1899 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 1900 XSync (display->display, False);
1982 1901
1983 /* 1902 /*
1984 * Make the frame window set by the window manager have 1903 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 1904 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 1905 * windows for each client, so we have to take care about that.
1987 */ 1906 */
1988 i = (xa[XA_XROOTPMAPID] != 0 1907 i = (xa[XA_XROOTPMAPID] != 0
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 1910 &nitems, &bytes_after, &prop) == Success));
1992 if (!i || prop == NULL) 1911 if (!i || prop == NULL)
1993 have_pixmap = 0; 1912 have_pixmap = 0;
1994 else 1913 else
1995 { 1914 {
1996 have_pixmap = 1; 1915 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 1916 rootpixmap = * ((Pixmap *)prop);
1998 XFree(prop); 1917 XFree (prop);
1999 } 1918 }
2000 if (have_pixmap) 1919 if (have_pixmap)
2001 { 1920 {
2002 /* 1921 /*
2003 * Copy Xroot pixmap transparency 1922 * Copy display->root pixmap transparency
2004 */ 1923 */
2005 int sx, sy, nx, ny; 1924 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 1925 unsigned int nw, nh;
2007 Window cr; 1926 Window cr;
2008 XImage *image; 1927 XImage *image;
2009 GC gc; 1928 GC gc;
2010 XGCValues gcvalue; 1929 XGCValues gcvalue;
2011 1930
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 1932 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 1933 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 1934 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 1935 nx = ny = 0;
1936
2017 if (sx < 0) 1937 if (sx < 0)
2018 { 1938 {
2019 nw += sx; 1939 nw += sx;
2020 nx = -sx; 1940 nx = -sx;
2021 sx = 0; 1941 sx = 0;
2022 } 1942 }
1943
2023 if (sy < 0) 1944 if (sy < 0)
2024 { 1945 {
2025 nh += sy; 1946 nh += sy;
2026 ny = -sy; 1947 ny = -sy;
2027 sy = 0; 1948 sy = 0;
2028 } 1949 }
1950
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1; 1953 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2033 ZPixmap); 1955 ZPixmap);
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 1957 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 1958 allowedxerror = 0;
2037 if (image == NULL) 1959 if (image == NULL)
… …
2039 if (am_transparent && am_pixmap_trans) 1961 if (am_transparent && am_pixmap_trans)
2040 { 1962 {
2041 pchanged = 1; 1963 pchanged = 1;
2042 if (TermWin.pixmap != None) 1964 if (TermWin.pixmap != None)
2043 { 1965 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 1966 XFreePixmap (display->display, TermWin.pixmap);
2045 TermWin.pixmap = None; 1967 TermWin.pixmap = None;
2046 } 1968 }
2047 } 1969 }
2048 am_pixmap_trans = 0; 1970 am_pixmap_trans = 0;
2049 } 1971 }
2050 else 1972 else
2051 { 1973 {
2052 if (TermWin.pixmap != None) 1974 if (TermWin.pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 1975 XFreePixmap (display->display, TermWin.pixmap);
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2055 (unsigned int)szHint.width, 1977 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 1978 (unsigned int)szHint.height,
2057 (unsigned int)image->depth); 1979 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width, 1982 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 1983 (unsigned int)image->height);
2062 XFreeGC(Xdisplay, gc); 1984 XFreeGC (display->display, gc);
2063 XDestroyImage(image); 1985 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2065 TermWin.pixmap); 1987 TermWin.pixmap);
2066 if (!am_transparent || !am_pixmap_trans) 1988 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 1989 pchanged = 1;
2068 am_transparent = am_pixmap_trans = 1; 1990 am_transparent = am_pixmap_trans = 1;
2069 } 1991 }
2070 } 1992 }
1993
2071 if (!am_pixmap_trans) 1994 if (!am_pixmap_trans)
2072 { 1995 {
2073 unsigned int n; 1996 unsigned int n;
2074 /* 1997 /*
2075 * InheritPixmap transparency 1998 * InheritPixmap transparency
2076 */ 1999 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2079 i++) 2002 i++)
2080 { 2003 {
2081 oldp = TermWin.parent[i]; 2004 oldp = TermWin.parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2005 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2006 &TermWin.parent[i], &list, &n);
2084 XFree(list); 2007 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2086 if (TermWin.parent[i] == Xroot) 2009 if (TermWin.parent[i] == display->root)
2087 { 2010 {
2088 if (oldp != None) 2011 if (oldp != None)
2089 pchanged = 1; 2012 pchanged = 1;
2090 break; 2013 break;
2091 } 2014 }
2092 if (oldp != TermWin.parent[i]) 2015 if (oldp != TermWin.parent[i])
2093 pchanged = 1; 2016 pchanged = 1;
2094 } 2017 }
2018
2095 n = 0; 2019 n = 0;
2020
2096 if (pchanged) 2021 if (pchanged)
2097 { 2022 {
2098 for (; n < (unsigned int)i; n++) 2023 for (; n < (unsigned int)i; n++)
2099 { 2024 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2028 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2105 break; 2030 break;
2106 } 2031 }
2107 } 2032 }
2108 } 2033 }
2034
2109 if (n > (int)(sizeof(TermWin.parent) 2035 if (n > (int) (sizeof (TermWin.parent)
2110 / sizeof(TermWin.parent[0]))) 2036 / sizeof (TermWin.parent[0])))
2111 { 2037 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2038 D_X ((stderr, "InheritPixmap Turning off"));
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2039 XSetWindowBackground (display->display, TermWin.parent[0],
2114 PixColors[Color_fg]); 2040 PixColors[Color_fg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt, 2041 XSetWindowBackground (display->display, TermWin.vt,
2116 PixColors[Color_bg]); 2042 PixColors[Color_bg]);
2117 am_transparent = 0; 2043 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2044 /* XXX: also turn off Opt_transparent? */
2119 } 2045 }
2120 else 2046 else
… …
2124# ifdef HAVE_NANOSLEEP 2050# ifdef HAVE_NANOSLEEP
2125 struct timespec rqt; 2051 struct timespec rqt;
2126 2052
2127 rqt.tv_sec = 1; 2053 rqt.tv_sec = 1;
2128 rqt.tv_nsec = 0; 2054 rqt.tv_nsec = 0;
2129 nanosleep(&rqt, NULL); 2055 nanosleep (&rqt, NULL);
2130# else 2056# else
2131 sleep(1); 2057 sleep (1);
2132# endif 2058# endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2060 for (n = 0; n < (unsigned int)i; n++)
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2136 ParentRelative); 2062 ParentRelative);
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2138 ParentRelative); 2064 ParentRelative);
2139 am_transparent = 1; 2065 am_transparent = 1;
2140 } 2066 }
2067
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2069 TermWin.parent[i] = None;
2143 } 2070 }
2144 return pchanged; 2071 return pchanged;
2145} 2072}
2146#endif 2073#endif
… …
2151/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2153FILE * 2080FILE *
2154rxvt_term::popen_printer () 2081rxvt_term::popen_printer ()
2155{ 2082{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2084
2158 if (stream == NULL) 2085 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2086 rxvt_print_error ("can't open printer pipe");
2160 return stream; 2087 return stream;
2161} 2088}
2162 2089
2163int 2090int
2164rxvt_term::pclose_printer (FILE *stream) 2091rxvt_term::pclose_printer (FILE *stream)
2165{ 2092{
2166 fflush (stream); 2093 fflush (stream);
2167 /* pclose() reported not to work on SunOS 4.1.3 */ 2094 /* pclose () reported not to work on SunOS 4.1.3 */
2168# if defined (__sun__) /* TODO: RESOLVE THIS */ 2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2169 /* pclose works provided SIGCHLD handler uses waitpid */ 2096 /* pclose works provided SIGCHLD handler uses waitpid */
2170 return pclose (stream); /* return fclose (stream); */ 2097 return pclose (stream); /* return fclose (stream); */
2171# else 2098# else
2172 return pclose (stream); 2099 return pclose (stream);
… …
2195 unsigned char ch; 2122 unsigned char ch;
2196 unsigned int i, len; 2123 unsigned int i, len;
2197 2124
2198 if ((ch = cmd_getc ()) != C0_ESC) 2125 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2126 {
2200 if (putc(ch, fd) == EOF) 2127 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2128 break; /* done = 1 */
2202 } 2129 }
2203 else 2130 else
2204 { 2131 {
2205 len = 0; 2132 len = 0;
… …
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2144 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2145 break; /* done = 1 */
2219 } 2146 }
2220 } 2147 }
2221 for (i = 0; i < len; i++) 2148 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2149 if (putc (buf[i], fd) == EOF)
2223 { 2150 {
2224 done = 1; 2151 done = 1;
2225 break; 2152 break;
2226 } 2153 }
2227 } 2154 }
… …
2247{ 2174{
2248 switch (ch) 2175 switch (ch)
2249 { 2176 {
2250 case C0_ENQ: /* terminal Status */ 2177 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2178 if (rs[Rs_answerbackstring])
2252 tt_write( 2179 tt_write (
2253 (const unsigned char *)rs[Rs_answerbackstring], 2180 (const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2255 else 2182 else
2256 tt_write((unsigned char *)VT100_ANS, 2183 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2184 (unsigned int)STRLEN (VT100_ANS));
2258 break; 2185 break;
2259 case C0_BEL: /* bell */ 2186 case C0_BEL: /* bell */
2260 scr_bell (); 2187 scr_bell ();
2261 break; 2188 break;
2262 case C0_BS: /* backspace */ 2189 case C0_BS: /* backspace */
… …
2324 row = cmd_getc () - ' '; 2251 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2252 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2253 scr_gotorc (row, col, 0);
2327 break; 2254 break;
2328 case 'Z': /* identify the terminal type */ 2255 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2256 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2257 break;
2331 case '<': /* turn off VT52 mode */ 2258 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2259 PrivMode (0, PrivMode_vt52);
2333 break; 2260 break;
2334 case 'F': /* use special graphics character set */ 2261 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2262 case 'G': /* use regular character set */
2336 /* unimplemented */ 2263 /* unimplemented */
2337 break; 2264 break;
… …
2373 scr_charset_set (2, (unsigned int)cmd_getc ()); 2300 scr_charset_set (2, (unsigned int)cmd_getc ());
2374 break; 2301 break;
2375 case '+': 2302 case '+':
2376 scr_charset_set (3, (unsigned int)cmd_getc ()); 2303 scr_charset_set (3, (unsigned int)cmd_getc ());
2377 break; 2304 break;
2378#ifdef MULTICHAR_SET
2379 case '$':
2380 scr_charset_set (-2, (unsigned int)cmd_getc ());
2381 break;
2382#endif
2383#ifndef NO_FRILLS 2305#ifndef NO_FRILLS
2384 case '6': 2306 case '6':
2385 scr_backindex (); 2307 scr_backindex ();
2386 break; 2308 break;
2387#endif 2309#endif
… …
2396 scr_forwardindex (); 2318 scr_forwardindex ();
2397 break; 2319 break;
2398#endif 2320#endif
2399 case '=': 2321 case '=':
2400 case '>': 2322 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2323 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2324 break;
2403 2325
2404 case C1_40: 2326 case C1_40:
2405 cmd_getc (); 2327 cmd_getc ();
2406 break; 2328 break;
… …
2442 process_dcs_seq (); 2364 process_dcs_seq ();
2443 break; 2365 break;
2444 2366
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2368 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2369 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2371 break; /* steal obsolete ESC [ c */
2450 2372
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2374 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2375 process_csi_seq ();
… …
2493 2415
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2416#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2417 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2418 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2419#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2420 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2421
2500const unsigned char csi_defaults[] = 2422const unsigned char csi_defaults[] =
2501 { 2423 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2424 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2503 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2425 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2504 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2505 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2506 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2507 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2508 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2509 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2510 }; 2432 };
2511/* *INDENT-ON* */ 2433/* *INDENT-ON* */
2512 2434
2513void 2435void
2514rxvt_term::process_csi_seq () 2436rxvt_term::process_csi_seq ()
… …
2529 ch = cmd_getc (); 2451 ch = cmd_getc ();
2530 } 2452 }
2531 /* read any numerical arguments */ 2453 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2454 for (n = -1; ch < CSI_ICH; )
2533 { 2455 {
2534 if (isdigit(ch)) 2456 if (isdigit (ch))
2535 { 2457 {
2536 if (n < 0) 2458 if (n < 0)
2537 n = ch - '0'; 2459 n = ch - '0';
2538 else 2460 else
2539 n = n * 10 + ch - '0'; 2461 n = n * 10 + ch - '0';
… …
2565 2487
2566 if (nargs < ESC_ARGS) 2488 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2489 arg[nargs++] = n;
2568 2490
2569 i = ch - CSI_ICH; 2491 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2492 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2493 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2494 if (arg[p] == -1)
2573 arg[p] = ndef; 2495 arg[p] = ndef;
2574 2496
2575#ifdef DEBUG_CMD 2497#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 2498 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 2499 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2500 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 2501 fprintf (stderr, "%c\n", ch);
2580#endif 2502#endif
2581 2503
2582 /* 2504 /*
2583 * private mode handling 2505 * private mode handling
2584 */ 2506 */
… …
2586 { 2508 {
2587 switch (priv) 2509 switch (priv)
2588 { 2510 {
2589 case '>': 2511 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2512 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2592 break; 2514 break;
2593 case '?': 2515 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2517 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2518 break;
… …
2599 } 2521 }
2600 2522
2601 switch (ch) 2523 switch (ch)
2602 { 2524 {
2603 /* 2525 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2526 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2527 */
2606#ifdef PRINTPIPE 2528#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2529 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2530 switch (arg[0])
2609 { 2531 {
… …
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2707 break; 2629 break;
2708 2630
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2632 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 2634 break;
2713 2635
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 2637 process_sgr_mode (nargs, arg);
2716 break; 2638 break;
2717 2639
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2640 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 2641 switch (arg[0])
2720 { 2642 {
2721 case 5: /* DSR requested */ 2643 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 2644 tt_printf ("\033[0n");
2723 break; 2645 break;
2724 case 6: /* CPR requested */ 2646 case 6: /* CPR requested */
2725 scr_report_position (); 2647 scr_report_position ();
2726 break; 2648 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2649#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2650 case 7: /* unofficial extension */
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 2651 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2730 break; 2652 break;
2731#endif 2653#endif
2732 case 8: /* unofficial extension */ 2654 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2734 break; 2656 break;
2735 } 2657 }
2736 break; 2658 break;
2737 2659
2738 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2805 break; 2727 break;
2806#endif 2728#endif
2807 2729
2808 case CSI_78: /* DECREQTPARM */ 2730 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 2731 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 2733 /* FALLTHROUGH */
2812 2734
2813 default: 2735 default:
2814 break; 2736 break;
2815 } 2737 }
… …
2834 { 2756 {
2835 /* 2757 /*
2836 * commands 2758 * commands
2837 */ 2759 */
2838 case 1: /* deiconify window */ 2760 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 2761 XMapWindow (display->display, TermWin.parent[0]);
2840 break; 2762 break;
2841 case 2: /* iconify window */ 2763 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 2764 XIconifyWindow (display->display, TermWin.parent[0],
2843 DefaultScreen(Xdisplay)); 2765 DefaultScreen (display->display));
2844 break; 2766 break;
2845 case 3: /* set position (pixels) */ 2767 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2847 break; 2769 break;
2848 case 4: /* set size (pixels) */ 2770 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 2772 break;
2851 case 5: /* raise window */ 2773 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2774 XRaiseWindow (display->display, TermWin.parent[0]);
2853 break; 2775 break;
2854 case 6: /* lower window */ 2776 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 2777 XLowerWindow (display->display, TermWin.parent[0]);
2856 break; 2778 break;
2857 case 7: /* refresh window */ 2779 case 7: /* refresh window */
2858 scr_touch (true); 2780 scr_touch (true);
2859 break; 2781 break;
2860 case 8: /* set size (chars) */ 2782 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 2784 (unsigned int) (args[1] * TermWin.fheight));
2863 break; 2785 break;
2864 default: 2786 default:
2865 if (args[0] >= 24) /* set height (chars) */ 2787 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 2788 set_widthheight ((unsigned int)TermWin.width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 2789 (unsigned int) (args[1] * TermWin.fheight));
2868 break; 2790 break;
2869 /* 2791 /*
2870 * reports - some output format copied from XTerm 2792 * reports - some output format copied from XTerm
2871 */ 2793 */
2872 case 11: /* report window state */ 2794 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 2797 break;
2876 case 13: /* report window position */ 2798 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 2801 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 2802 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 2803 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 2804 break;
2883 case 14: /* report window size (pixels) */ 2805 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 2808 break;
2887 case 18: /* report window size (chars) */ 2809 case 18: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2889 break; 2811 break;
2890#if 0 /* XXX: currently disabled due to security concerns */ 2812#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 2813 case 20: /* report icon label */
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2814 XGetIconName (display->display, TermWin.parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2894 break; 2816 break;
2895 case 21: /* report window title */ 2817 case 21: /* report window title */
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 2818 XFetchName (display->display, TermWin.parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2898 break; 2820 break;
2899#endif 2821#endif
2900 2822
2901 } 2823 }
2902} 2824}
2903#endif 2825#endif
2904 2826
2905/*----------------------------------------------------------------------*/ 2827/*----------------------------------------------------------------------*/
2906/* 2828/*
2907 * get input up until STRING TERMINATOR (or BEL) 2829 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 2830 * ends_how is terminator used. returned input must be free ()d
2909 */ 2831 */
2910unsigned char * 2832unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 2833rxvt_term::get_to_st (unsigned char *ends_how)
2912{ 2834{
2913 int seen_esc = 0; /* seen escape? */ 2835 int seen_esc = 0; /* seen escape? */
… …
2928 } 2850 }
2929 else if (ch == '\t') 2851 else if (ch == '\t')
2930 ch = ' '; /* translate '\t' to space */ 2852 ch = ' '; /* translate '\t' to space */
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2932 return NULL; /* other control character - exit */ 2854 return NULL; /* other control character - exit */
2933 if (n < sizeof(string) - 1) 2855 if (n < sizeof (string) - 1)
2934 string[n++] = ch; 2856 string[n++] = ch;
2935 seen_esc = 0; 2857 seen_esc = 0;
2936 } 2858 }
2937 string[n++] = '\0'; 2859 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2939 return NULL; 2861 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2862 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 2863 STRNCPY (s, string, n);
2942 return s; 2864 return s;
2943} 2865}
2944 2866
2945/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2946/* 2868/*
… …
2953 /* 2875 /*
2954 * Not handled yet 2876 * Not handled yet
2955 */ 2877 */
2956 s = get_to_st (&eh); 2878 s = get_to_st (&eh);
2957 if (s) 2879 if (s)
2958 free(s); 2880 free (s);
2959 return; 2881 return;
2960} 2882}
2961 2883
2962/*----------------------------------------------------------------------*/ 2884/*----------------------------------------------------------------------*/
2963/* 2885/*
… …
2968{ 2890{
2969 unsigned char ch, eh, *s; 2891 unsigned char ch, eh, *s;
2970 int arg; 2892 int arg;
2971 2893
2972 ch = cmd_getc (); 2894 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2895 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 2896 arg = arg * 10 + (ch - '0');
2975 2897
2976 if (ch == ';') 2898 if (ch == ';')
2977 { 2899 {
2978 s = get_to_st (&eh); 2900 s = get_to_st (&eh);
2979 if (s) 2901 if (s)
2980 { 2902 {
2981 /* 2903 /*
2982 * rxvt_menubar_dispatch() violates the constness of the string, 2904 * rxvt_menubar_dispatch () violates the constness of the string,
2983 * so do it here 2905 * so do it here
2984 */ 2906 */
2985 if (arg == XTerm_Menu) 2907 if (arg == XTerm_Menu)
2986#if 0 /* XXX: currently disabled due to security concerns */ 2908#if 0 /* XXX: currently disabled due to security concerns */
2987 menubar_dispatch ((char *)s); 2909 menubar_dispatch ((char *)s);
2988#else 2910#else
2989 (void)0; 2911 (void)0;
2990#endif 2912#endif
2991 else 2913 else
2992 xterm_seq (arg, (char *)s, eh); 2914 xterm_seq (arg, (char *)s, eh);
2993 free(s); 2915 free (s);
2994 } 2916 }
2995 } 2917 }
2996} 2918}
2997/* 2919/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3012 * 10 = menu (may change in future) 2934 * 10 = menu (may change in future)
3013 * 20 = bg pixmap 2935 * 20 = bg pixmap
3014 * 39 = change default fg color 2936 * 39 = change default fg color
3015 * 49 = change default bg color 2937 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen 2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
3017 */ 2941 */
3018void 2942void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3020{ 2944{
3021 int changed = 0; 2945 int changed = 0;
3022 int color; 2946 int color;
3023 char *buf, *name; 2947 char *buf, *name;
3024 2948
3025 assert(str != NULL); 2949 assert (str != NULL);
3026 switch (op) 2950 switch (op)
3027 { 2951 {
3028 case XTerm_name: 2952 case XTerm_name:
3029 set_title (str); 2953 set_title (str);
3030 /* FALLTHROUGH */ 2954 /* FALLTHROUGH */
… …
3035 set_title (str); 2959 set_title (str);
3036 break; 2960 break;
3037 case XTerm_Color: 2961 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 2962 for (buf = (char *)str; buf && *buf;)
3039 { 2963 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 2964 if ((name = STRCHR (buf, ';')) == NULL)
3041 break; 2965 break;
3042 *name++ = '\0'; 2966 *name++ = '\0';
3043 color = atoi(buf); 2967 color = atoi (buf);
3044 if (color < 0 || color >= TOTAL_COLORS) 2968 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 2969 break;
3046 if ((buf = STRCHR(name, ';')) != NULL) 2970 if ((buf = STRCHR (name, ';')) != NULL)
3047 *buf++ = '\0'; 2971 *buf++ = '\0';
3048 set_window_color (color + minCOLOR, name); 2972 set_window_color (color + minCOLOR, name);
3049 } 2973 }
3050 break; 2974 break;
3051#ifndef NO_CURSORCOLOR 2975#ifndef NO_CURSORCOLOR
… …
3068 break; 2992 break;
3069#endif 2993#endif
3070 2994
3071 case XTerm_Menu: 2995 case XTerm_Menu:
3072 /* 2996 /*
3073 * rxvt_menubar_dispatch() violates the constness of the string, 2997 * rxvt_menubar_dispatch () violates the constness of the string,
3074 * so DON'T do it here 2998 * so DON'T do it here
3075 */ 2999 */
3076 break; 3000 break;
3077 case XTerm_Pixmap: 3001 case XTerm_Pixmap:
3078 if (*str != ';') 3002 if (*str != ';')
… …
3081 scale_pixmap (""); /* reset to default scaling */ 3005 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3006 set_bgPixmap (str); /* change pixmap */
3083#endif 3007#endif
3084 scr_touch (true); 3008 scr_touch (true);
3085 } 3009 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3010 while ((str = STRCHR (str, ';')) != NULL)
3087 { 3011 {
3088 str++; 3012 str++;
3089#if XPM_BACKGROUND 3013#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3014 changed += scale_pixmap (str);
3091#endif 3015#endif
… …
3107 set_window_color (Color_bg, str); 3031 set_window_color (Color_bg, str);
3108 break; 3032 break;
3109 case XTerm_logfile: 3033 case XTerm_logfile:
3110 break; 3034 break;
3111 case XTerm_font: 3035 case XTerm_font:
3112 change_font (0, str); 3036 change_font (str);
3113 break; 3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif
3114#if 0 3057#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3058 case XTerm_dumpscreen: /* no error notices */
3116 { 3059 {
3117 int fd; 3060 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3062 {
3120 scr_dump (fd); 3063 scr_dump (fd);
3121 close(fd); 3064 close (fd);
3122 } 3065 }
3123 } 3066 }
3124 break; 3067 break;
3125#endif 3068#endif
3126 3069
… …
3151 else 3094 else
3152 { 3095 {
3153 if (mode == 'r') 3096 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3098 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3157 PrivMode(state, bit); 3100 PrivMode (state, bit);
3158 } 3101 }
3159 return state; 3102 return state;
3160} 3103}
3161 3104
3162/* we're not using priv _yet_ */ 3105/* we're not using priv _yet_ */
3163void 3106void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 3108{
3166 unsigned int i, j; 3109 unsigned int i, j;
3167 int state; 3110 int state;
3168 static const struct 3111 static const struct
3169 { 3112 {
… …
3212 for (i = 0; i < nargs; i++) 3155 for (i = 0; i < nargs; i++)
3213 { 3156 {
3214 state = -1; 3157 state = -1;
3215 3158
3216 /* basic handling */ 3159 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3160 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3161 if (argtopriv[j].argval == arg[i])
3219 { 3162 {
3220 state = privcases (mode, argtopriv[j].bit); 3163 state = privcases (mode, argtopriv[j].bit);
3221 break; 3164 break;
3222 } 3165 }
… …
3230 scr_cursor (RESTORE); 3173 scr_cursor (RESTORE);
3231 else if (mode == 1) 3174 else if (mode == 1)
3232 scr_cursor (SAVE); 3175 scr_cursor (SAVE);
3233 /* FALLTHROUGH */ 3176 /* FALLTHROUGH */
3234 default: 3177 default:
3235 continue; /* for(;i;) */ 3178 continue; /* for (;i;) */
3236 } 3179 }
3237 3180
3238 /* extra handling for values with valid 0 or 1 state */ 3181 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i]) 3182 switch (arg[i])
3240 { 3183 {
… …
3242 case 2: /* VT52 mode */ 3185 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset 3186 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from 3187 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode 3188 * within VT52 mode
3246 */ 3189 */
3247 PrivMode(1, PrivMode_vt52); 3190 PrivMode (1, PrivMode_vt52);
3248 break; 3191 break;
3249 case 3: /* 80/132 */ 3192 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3193 if (PrivateModes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3252 (unsigned int)TermWin.height);
3253 break; 3195 break;
3254 case 4: /* smooth scrolling */ 3196 case 4: /* smooth scrolling */
3255 if (state) 3197 if (state)
3256 Options &= ~Opt_jumpScroll; 3198 Options &= ~Opt_jumpScroll;
3257 else 3199 else
… …
3267 scr_autowrap (state); 3209 scr_autowrap (state);
3268 break; 3210 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3211 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3212 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3213 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3214 PrivateModes &= ~ (PrivMode_MouseX11);
3273 break; 3215 break;
3274#ifdef menuBar_esc 3216#ifdef menuBar_esc
3275 case menuBar_esc: 3217 case menuBar_esc:
3276#ifdef MENUBAR 3218#ifdef MENUBAR
3277 map_menuBar (state); 3219 map_menuBar (state);
… …
3297 break; 3239 break;
3298 /* case 66: - application key pad */ 3240 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3241 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3242 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3243 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3244 PrivateModes &= ~ (PrivMode_MouseX10);
3303 break; 3245 break;
3304#if 0 3246#if 0
3305 case 1001: 3247 case 1001:
3306 break; /* X11 mouse highlighting */ 3248 break; /* X11 mouse highlighting */
3307#endif 3249#endif
… …
3377 break; 3319 break;
3378 } 3320 }
3379 if (rendset != -1) 3321 if (rendset != -1)
3380 { 3322 {
3381 scr_rendition (rendset, rendstyle); 3323 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3324 continue; /* for (;i;) */
3383 } 3325 }
3384 3326
3385 switch (arg[i]) 3327 switch (arg[i])
3386 { 3328 {
3387 case 30: 3329 case 30:
… …
3390 case 33: 3332 case 33:
3391 case 34: 3333 case 34:
3392 case 35: 3334 case 35:
3393 case 36: 3335 case 36:
3394 case 37: 3336 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3396 Color_fg); 3338 Color_fg);
3397 break; 3339 break;
3398#ifdef TTY_256COLOR 3340#ifdef TTY_256COLOR
3399 case 38: 3341 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3342 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3343 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3403 Color_fg); 3345 Color_fg);
3404 i += 2; 3346 i += 2;
3405 } 3347 }
3406 break; 3348 break;
3407#endif 3349#endif
… …
3415 case 43: 3357 case 43:
3416 case 44: 3358 case 44:
3417 case 45: 3359 case 45:
3418 case 46: 3360 case 46:
3419 case 47: 3361 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3421 Color_bg); 3363 Color_bg);
3422 break; 3364 break;
3423#ifdef TTY_256COLOR 3365#ifdef TTY_256COLOR
3424 case 48: 3366 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3367 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3368 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3428 Color_bg); 3370 Color_bg);
3429 i += 2; 3371 i += 2;
3430 } 3372 }
3431 break; 3373 break;
3432#endif 3374#endif
… …
3441 case 93: 3383 case 93:
3442 case 94: 3384 case 94:
3443 case 95: 3385 case 95:
3444 case 96: 3386 case 96:
3445 case 97: 3387 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3447 Color_fg); 3389 Color_fg);
3448 break; 3390 break;
3449 case 100: 3391 case 100:
3450 case 101: /* set bright bg color */ 3392 case 101: /* set bright bg color */
3451 case 102: 3393 case 102:
3452 case 103: 3394 case 103:
3453 case 104: 3395 case 104:
3454 case 105: 3396 case 105:
3455 case 106: 3397 case 106:
3456 case 107: 3398 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3458 Color_bg); 3400 Color_bg);
3459 break; 3401 break;
3460#endif 3402#endif
3461 3403
3462 } 3404 }
… …
3468void 3410void
3469rxvt_term::process_graphics () 3411rxvt_term::process_graphics ()
3470{ 3412{
3471 unsigned char ch, cmd = cmd_getc (); 3413 unsigned char ch, cmd = cmd_getc ();
3472 3414
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3415 if (cmd == 'Q')
3475 { /* query graphics */ 3416 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3417 tt_printf ("\033G0\n"); /* no graphics */
3477 return; 3418 return;
3478 } 3419 }
3479 /* swallow other graphics sequences until terminating ':' */ 3420 /* swallow other graphics sequences until terminating ':' */
3480 do 3421 do
3481 ch = cmd_getc (); 3422 ch = cmd_getc ();
3482 while (ch != ':'); 3423 while (ch != ':');
3483#else
3484 unsigned int nargs;
3485 int args[NGRX_PTS];
3486 unsigned char *text = NULL;
3487
3488 if (cmd == 'Q')
3489 { /* query graphics */
3490 tt_printf("\033G1\n"); /* yes, graphics (color) */
3491 return;
3492 }
3493 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3494 {
3495 int neg;
3496
3497 ch = cmd_getc ();
3498 neg = (ch == '-');
3499 if (neg || ch == '+')
3500 ch = cmd_getc ();
3501
3502 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3503 args[nargs] = args[nargs] * 10 + (ch - '0');
3504 if (neg)
3505 args[nargs] = -args[nargs];
3506
3507 nargs++;
3508 args[nargs] = 0;
3509 if (ch != ';')
3510 break;
3511 }
3512
3513 if ((cmd == 'T') && (nargs >= 5))
3514 {
3515 int i, len = args[4];
3516
3517 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3518
3519 if (text != NULL)
3520 {
3521 for (i = 0; i < len; i++)
3522 text[i] = cmd_getc ();
3523 text[len] = '\0';
3524 }
3525 }
3526 Gr_do_graphics (cmd, nargs, args, text);
3527#endif
3528} 3424}
3529/*}}} */ 3425/*}}} */
3530 3426
3531/* ------------------------------------------------------------------------- */ 3427/* ------------------------------------------------------------------------- */
3532 3428
3533/* 3429/*
3534 * Send printf() formatted output to the command. 3430 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3431 * Only use for small amounts of data.
3536 */ 3432 */
3537void 3433void
3538rxvt_term::tt_printf (const char *fmt,...) 3434rxvt_term::tt_printf (const char *fmt,...)
3539{ 3435{

Diff Legend

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