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.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.17 2003/12/18 00:29:29 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * 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>
31 * 31 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */
57void 58void
58rxvt_lookup_key(pR_ 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 = R->kbuf; 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 & R->ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!R->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 (R->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
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
93 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
95#else 97 else
98#endif
99 {
96 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
97 101
102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]);
98 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
99 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
100 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale);
101 111
102 if (status_return == XLookupChars 112 if (status_return == XLookupChars
103 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
104 { 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 {
105 wkbuf[len] = 0; 123 wkbuf[len] = 0;
106 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
125 if (len < 0)
126 len = 0;
127 }
107 } 128 }
108 else 129 else
109 len = 0; 130 len = 0;
110#endif 131 }
132
111 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
112 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
113 } 135 }
114 else 136 else
115#endif 137#endif
116 { 138 {
117 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
118 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
119 } 141 }
120 142
121 if (valid_keysym) 143 if (valid_keysym)
122 { 144 {
123/* for some backwards compatibility */ 145 /* for some backwards compatibility */
124#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
125# ifdef HOTKEY_CTRL 147# ifdef HOTKEY_CTRL
126 if (ctrl) 148 if (ctrl)
127# else 149# else
128 if (meta) 150 if (meta)
129# endif 151# endif
130 { 152 {
131 if (keysym == R->ks_bigfont) 153 if (keysym == ks_bigfont)
132 { 154 {
133 rxvt_change_font(aR_ 0, FONT_UP); 155 change_font (FONT_UP);
134 return; 156 return;
135 } 157 }
136 else if (keysym == R->ks_smallfont) 158 else if (keysym == ks_smallfont)
137 { 159 {
138 rxvt_change_font(aR_ 0, FONT_DN); 160 change_font (FONT_DN);
139 return; 161 return;
162 }
140 } 163 }
141 }
142#endif 164#endif
143 165
144 if (R->TermWin.saveLines) { 166 if (TermWin.saveLines)
167 {
145#ifdef UNSHIFTED_SCROLLKEYS 168#ifdef UNSHIFTED_SCROLLKEYS
146 if (!ctrl && !meta) { 169 if (!ctrl && !meta)
170 {
147#else 171#else
148 if (IS_SCROLL_MOD) { 172 if (IS_SCROLL_MOD)
173 {
149#endif 174#endif
150 int lnsppg; 175 int lnsppg;
151 176
152#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
153 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
154#else 179#else
155 lnsppg = R->TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
156#endif 181#endif
157 if (keysym == XK_Prior) { 182 if (keysym == XK_Prior)
158 rxvt_scr_page(aR_ UP, lnsppg); 183 {
159 return; 184 scr_page (UP, lnsppg);
185 return;
186 }
160 } else if (keysym == XK_Next) { 187 else if (keysym == XK_Next)
161 rxvt_scr_page(aR_ DN, lnsppg); 188 {
162 return; 189 scr_page (DN, lnsppg);
163 } 190 return;
164 } 191 }
192 }
165#ifdef SCROLL_ON_UPDOWN_KEYS 193#ifdef SCROLL_ON_UPDOWN_KEYS
166 if (IS_SCROLL_MOD) { 194 if (IS_SCROLL_MOD)
167 if (keysym == XK_Up) { 195 {
168 rxvt_scr_page(aR_ UP, 1); 196 if (keysym == XK_Up)
169 return; 197 {
198 scr_page (UP, 1);
199 return;
200 }
170 } else if (keysym == XK_Down) { 201 else if (keysym == XK_Down)
171 rxvt_scr_page(aR_ DN, 1); 202 {
172 return; 203 scr_page (DN, 1);
173 } 204 return;
174 } 205 }
206 }
175#endif 207#endif
176#ifdef SCROLL_ON_HOMEEND_KEYS 208#ifdef SCROLL_ON_HOMEEND_KEYS
177 if (IS_SCROLL_MOD) { 209 if (IS_SCROLL_MOD)
178 if (keysym == XK_Home) { 210 {
179 rxvt_scr_move_to(aR_ 0, 1); 211 if (keysym == XK_Home)
180 return; 212 {
213 scr_move_to (0, 1);
214 return;
215 }
181 } else if (keysym == XK_End) { 216 else if (keysym == XK_End)
182 rxvt_scr_move_to(aR_ 1, 0); 217 {
183 return; 218 scr_move_to (1, 0);
184 } 219 return;
185 } 220 }
221 }
186#endif 222#endif
187 } 223 }
188 224
189 if (shft) { 225 if (shft)
226 {
190 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
191 if (keysym >= XK_F1 && keysym <= XK_F10) { 228 if (keysym >= XK_F1 && keysym <= XK_F10)
229 {
192 keysym += (XK_F11 - XK_F1); 230 keysym += (XK_F11 - XK_F1);
193 shft = 0; /* turn off Shift */ 231 shft = 0; /* turn off Shift */
232 }
194 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
195 switch (keysym) { 234 {
196 /* normal XTerm key bindings */ 235 switch (keysym)
236 {
237 /* normal XTerm key bindings */
197 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
198 rxvt_selection_request(aR_ ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
199 return; 240 return;
200 /* rxvt extras */ 241 /* rxvt extras */
201 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
202 rxvt_change_font(aR_ 0, FONT_UP); 243 change_font (FONT_UP);
203 return; 244 return;
204 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
205 rxvt_change_font(aR_ 0, FONT_DN); 246 change_font (FONT_DN);
206 return; 247 return;
207 } 248 }
208 } 249 }
209 } 250 }
210#ifdef PRINTPIPE 251#ifdef PRINTPIPE
211 if (keysym == XK_Print) { 252 if (keysym == XK_Print)
212 rxvt_scr_printscreen(aR_ ctrl | shft); 253 {
254 scr_printscreen (ctrl | shft);
213 return; 255 return;
214 } 256 }
215#endif 257#endif
216#ifdef GREEK_SUPPORT
217 if (keysym == R->ks_greekmodeswith) {
218 R->greek_mode = !R->greek_mode;
219 if (R->greek_mode) {
220 rxvt_xterm_seq(aR_ XTerm_title,
221 (greek_getmode() == GREEK_ELOT928
222 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
223 greek_reset();
224 } else
225 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
226 return;
227 }
228#endif
229 258
230 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
260 {
231#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
232 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
233 unsigned int l; 263 {
264 unsigned int l;
234 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
235 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
236 267
237 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 268 kbuf0 = (Keysym_map[keysym & 0xFF]);
238 l = (unsigned int)*kbuf0++; 269 l = (unsigned int)*kbuf0++;
239 270
240 /* escape prefix */ 271 /* escape prefix */
241 if (meta) 272 if (meta)
242# ifdef META8_OPTION 273# ifdef META8_OPTION
243 if (R->meta_char == C0_ESC) 274 if (meta_char == C0_ESC)
244# endif 275# endif
245 R->tt_write (&ch, 1); 276 tt_write (&ch, 1);
246 R->tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
247 return; 278 return;
248 } else 279 }
280 else
249#endif 281#endif
250 { 282 {
251 newlen = 1; 283 newlen = 1;
252 switch (keysym) { 284 switch (keysym)
285 {
253#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
254 case XK_BackSpace: 287 case XK_BackSpace:
255 if (R->PrivateModes & PrivMode_HaveBackSpace) { 288 if (PrivateModes & PrivMode_HaveBackSpace)
289 {
256 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
257 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
258 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
259 } else 293 }
260 STRCPY(kbuf, R->key_backspace); 294 else
261# ifdef MULTICHAR_SET 295 STRCPY (kbuf, key_backspace);
262 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 296 break;
263 int col, row;
264
265 newlen = STRLEN(kbuf);
266 col = R->screen.cur.col - 1;
267 row = R->screen.cur.row + R->TermWin.saveLines;
268 if (IS_MULTI2(R->screen.rend[row][col]))
269 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
270 }
271# endif
272 break;
273#endif 297#endif
274#ifndef NO_DELETE_KEY 298#ifndef NO_DELETE_KEY
275 case XK_Delete: 299 case XK_Delete:
276 STRCPY(kbuf, R->key_delete); 300 STRCPY (kbuf, key_delete);
277# ifdef MULTICHAR_SET 301 break;
278 if (R->Options & Opt_mc_hack) {
279 int col, row;
280
281 newlen = STRLEN(kbuf);
282 col = R->screen.cur.col;
283 row = R->screen.cur.row + R->TermWin.saveLines;
284 if (IS_MULTI1(R->screen.rend[row][col]))
285 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
286 }
287# endif 302#endif
288 break; 303 case XK_Tab:
289#endif 304 if (shft)
290 case XK_Tab: 305 STRCPY (kbuf, "\033[Z");
291 if (shft) 306 else
292 STRCPY(kbuf, "\033[Z"); 307 {
293 else {
294#ifdef CTRL_TAB_MAKES_META 308#ifdef CTRL_TAB_MAKES_META
295 if (ctrl) 309 if (ctrl)
296 meta = 1; 310 meta = 1;
297#endif 311#endif
298#ifdef MOD4_TAB_MAKES_META 312#ifdef MOD4_TAB_MAKES_META
299 if (ev->state & Mod4Mask) 313 if (ev.state & Mod4Mask)
300 meta = 1; 314 meta = 1;
301#endif 315#endif
302 newlen = 0; 316 newlen = 0;
303 } 317 }
304 break; 318 break;
305
306 319
307#ifdef XK_KP_Left 320#ifdef XK_KP_Left
308 case XK_KP_Up: /* \033Ox or standard */ 321 case XK_KP_Up: /* \033Ox or standard */
309 case XK_KP_Down: /* \033Or or standard */ 322 case XK_KP_Down: /* \033Or or standard */
310 case XK_KP_Right: /* \033Ov or standard */ 323 case XK_KP_Right: /* \033Ov or standard */
311 case XK_KP_Left: /* \033Ot or standard */ 324 case XK_KP_Left: /* \033Ot or standard */
312 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
313 STRCPY(kbuf, "\033OZ"); 326 {
314 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 327 STRCPY (kbuf, "\033OZ");
315 break; 328 kbuf[2] = "txvr"[keysym - XK_KP_Left];
316 } else 329 break;
330 }
331 else
317 /* translate to std. cursor key */ 332 /* translate to std. cursor key */
318 keysym = XK_Left + (keysym - XK_KP_Left); 333 keysym = XK_Left + (keysym - XK_KP_Left);
319 /* FALLTHROUGH */ 334 /* FALLTHROUGH */
320#endif 335#endif
321 case XK_Up: /* "\033[A" */ 336 case XK_Up: /* "\033[A" */
322 case XK_Down: /* "\033[B" */ 337 case XK_Down: /* "\033[B" */
323 case XK_Right: /* "\033[C" */ 338 case XK_Right: /* "\033[C" */
324 case XK_Left: /* "\033[D" */ 339 case XK_Left: /* "\033[D" */
325 STRCPY(kbuf, "\033[Z"); 340 STRCPY (kbuf, "\033[Z");
326 kbuf[2] = ("DACB"[keysym - XK_Left]); 341 kbuf[2] = "DACB"[keysym - XK_Left];
327 /* do Shift first */ 342 /* do Shift first */
328 if (shft) 343 if (shft)
329 kbuf[2] = ("dacb"[keysym - XK_Left]); 344 kbuf[2] = "dacb"[keysym - XK_Left];
330 else if (ctrl) { 345 else if (ctrl)
331 kbuf[1] = 'O';
332 kbuf[2] = ("dacb"[keysym - XK_Left]);
333 } else if (R->PrivateModes & PrivMode_aplCUR)
334 kbuf[1] = 'O';
335#ifdef MULTICHAR_SET
336 //TODO: ?? 346 {
337 if (R->Options & Opt_mc_hack) { 347 kbuf[1] = 'O';
338 int col, row, m; 348 kbuf[2] = "dacb"[keysym - XK_Left];
339 349 }
340 col = R->screen.cur.col; 350 else if (PrivateModes & PrivMode_aplCUR)
341 row = R->screen.cur.row + R->TermWin.saveLines; 351 kbuf[1] = 'O';
342 m = 0; 352 break;
343 if (keysym == XK_Right
344 && IS_MULTI1(R->screen.rend[row][col]))
345 m = 1;
346 else if (keysym == XK_Left) {
347 if (col > 0) {
348 if (IS_MULTI2(R->screen.rend[row][col - 1]))
349 m = 1;
350 } else if (R->screen.cur.row > 0) {
351 col = R->screen.tlen[--row];
352 if (col == -1)
353 col = R->TermWin.ncol - 1;
354 else
355 col--;
356 if (col > 0
357 && IS_MULTI2(R->screen.rend[row][col]))
358 m = 1;
359 }
360 }
361 if (m)
362 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
363 }
364#endif
365 break;
366 353
367#ifndef UNSHIFTED_SCROLLKEYS 354#ifndef UNSHIFTED_SCROLLKEYS
368# ifdef XK_KP_Prior 355# ifdef XK_KP_Prior
369 case XK_KP_Prior: 356 case XK_KP_Prior:
370 /* allow shift to override */ 357 /* allow shift to override */
371 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 358 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
372 STRCPY(kbuf, "\033Oy"); 359 {
373 break; 360 STRCPY (kbuf, "\033Oy");
374 } 361 break;
375 /* FALLTHROUGH */ 362 }
363 /* FALLTHROUGH */
376# endif 364# endif
377 case XK_Prior: 365 case XK_Prior:
378 STRCPY(kbuf, "\033[5~"); 366 STRCPY (kbuf, "\033[5~");
379 break; 367 break;
380# ifdef XK_KP_Next 368# ifdef XK_KP_Next
381 case XK_KP_Next: 369 case XK_KP_Next:
382 /* allow shift to override */ 370 /* allow shift to override */
383 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 371 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033Os"); 372 {
385 break; 373 STRCPY (kbuf, "\033Os");
386 } 374 break;
387 /* FALLTHROUGH */ 375 }
376 /* FALLTHROUGH */
388# endif 377# endif
389 case XK_Next: 378 case XK_Next:
390 STRCPY(kbuf, "\033[6~"); 379 STRCPY (kbuf, "\033[6~");
391 break; 380 break;
392#endif 381#endif
393 case XK_KP_Enter: 382 case XK_KP_Enter:
394 /* allow shift to override */ 383 /* allow shift to override */
395 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
396 STRCPY(kbuf, "\033OM"); 385 {
397 } else { 386 STRCPY (kbuf, "\033OM");
398 kbuf[0] = '\r'; 387 }
399 kbuf[1] = '\0'; 388 else
400 } 389 {
401 break; 390 kbuf[0] = '\r';
391 kbuf[1] = '\0';
392 }
393 break;
402 394
403#ifdef XK_KP_Begin 395#ifdef XK_KP_Begin
404 case XK_KP_Begin: 396 case XK_KP_Begin:
405 STRCPY(kbuf, "\033Ou"); 397 STRCPY (kbuf, "\033Ou");
406 break; 398 break;
407 399
408 case XK_KP_Insert: 400 case XK_KP_Insert:
409 STRCPY(kbuf, "\033Op"); 401 STRCPY (kbuf, "\033Op");
410 break; 402 break;
411 403
412 case XK_KP_Delete: 404 case XK_KP_Delete:
413 STRCPY(kbuf, "\033On"); 405 STRCPY (kbuf, "\033On");
414 break; 406 break;
415#endif 407#endif
416 case XK_KP_F1: /* "\033OP" */ 408 case XK_KP_F1: /* "\033OP" */
417 case XK_KP_F2: /* "\033OQ" */ 409 case XK_KP_F2: /* "\033OQ" */
418 case XK_KP_F3: /* "\033OR" */ 410 case XK_KP_F3: /* "\033OR" */
419 case XK_KP_F4: /* "\033OS" */ 411 case XK_KP_F4: /* "\033OS" */
420 STRCPY(kbuf, "\033OP"); 412 STRCPY (kbuf, "\033OP");
421 kbuf[2] += (keysym - XK_KP_F1); 413 kbuf[2] += (keysym - XK_KP_F1);
422 break; 414 break;
423 415
424 case XK_KP_Multiply: /* "\033Oj" : "*" */ 416 case XK_KP_Multiply: /* "\033Oj" : "*" */
425 case XK_KP_Add: /* "\033Ok" : "+" */ 417 case XK_KP_Add: /* "\033Ok" : "+" */
426 case XK_KP_Separator: /* "\033Ol" : "," */ 418 case XK_KP_Separator: /* "\033Ol" : "," */
427 case XK_KP_Subtract: /* "\033Om" : "-" */ 419 case XK_KP_Subtract: /* "\033Om" : "-" */
428 case XK_KP_Decimal: /* "\033On" : "." */ 420 case XK_KP_Decimal: /* "\033On" : "." */
429 case XK_KP_Divide: /* "\033Oo" : "/" */ 421 case XK_KP_Divide: /* "\033Oo" : "/" */
430 case XK_KP_0: /* "\033Op" : "0" */ 422 case XK_KP_0: /* "\033Op" : "0" */
431 case XK_KP_1: /* "\033Oq" : "1" */ 423 case XK_KP_1: /* "\033Oq" : "1" */
432 case XK_KP_2: /* "\033Or" : "2" */ 424 case XK_KP_2: /* "\033Or" : "2" */
433 case XK_KP_3: /* "\033Os" : "3" */ 425 case XK_KP_3: /* "\033Os" : "3" */
434 case XK_KP_4: /* "\033Ot" : "4" */ 426 case XK_KP_4: /* "\033Ot" : "4" */
435 case XK_KP_5: /* "\033Ou" : "5" */ 427 case XK_KP_5: /* "\033Ou" : "5" */
436 case XK_KP_6: /* "\033Ov" : "6" */ 428 case XK_KP_6: /* "\033Ov" : "6" */
437 case XK_KP_7: /* "\033Ow" : "7" */ 429 case XK_KP_7: /* "\033Ow" : "7" */
438 case XK_KP_8: /* "\033Ox" : "8" */ 430 case XK_KP_8: /* "\033Ox" : "8" */
439 case XK_KP_9: /* "\033Oy" : "9" */ 431 case XK_KP_9: /* "\033Oy" : "9" */
440 /* allow shift to override */ 432 /* allow shift to override */
441 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 433 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 STRCPY(kbuf, "\033Oj"); 434 {
443 kbuf[2] += (keysym - XK_KP_Multiply); 435 STRCPY (kbuf, "\033Oj");
444 } else { 436 kbuf[2] += (keysym - XK_KP_Multiply);
437 }
438 else
439 {
445 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 440 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
446 kbuf[1] = '\0'; 441 kbuf[1] = '\0';
447 } 442 }
448 break; 443 break;
449 444
450 case XK_Find: 445 case XK_Find:
451 STRCPY(kbuf, "\033[1~"); 446 STRCPY (kbuf, "\033[1~");
452 break; 447 break;
453 case XK_Insert: 448 case XK_Insert:
454 STRCPY(kbuf, "\033[2~"); 449 STRCPY (kbuf, "\033[2~");
455 break; 450 break;
456#ifdef DXK_Remove /* support for DEC remove like key */ 451#ifdef DXK_Remove /* support for DEC remove like key */
457 case DXK_Remove: 452 case DXK_Remove:
458 /* FALLTHROUGH */ 453 /* FALLTHROUGH */
459#endif 454#endif
460 case XK_Execute: 455 case XK_Execute:
461 STRCPY(kbuf, "\033[3~"); 456 STRCPY (kbuf, "\033[3~");
462 break; 457 break;
463 case XK_Select: 458 case XK_Select:
464 STRCPY(kbuf, "\033[4~"); 459 STRCPY (kbuf, "\033[4~");
465 break; 460 break;
466#ifdef XK_KP_End 461#ifdef XK_KP_End
467 case XK_KP_End: 462 case XK_KP_End:
468 /* allow shift to override */ 463 /* allow shift to override */
469 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 464 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
470 STRCPY(kbuf, "\033Oq"); 465 {
471 break; 466 STRCPY (kbuf, "\033Oq");
472 } 467 break;
473 /* FALLTHROUGH */ 468 }
469 /* FALLTHROUGH */
474#endif 470#endif
475 case XK_End: 471 case XK_End:
476 STRCPY(kbuf, KS_END); 472 STRCPY (kbuf, KS_END);
477 break; 473 break;
478#ifdef XK_KP_Home 474#ifdef XK_KP_Home
479 case XK_KP_Home: 475 case XK_KP_Home:
480 /* allow shift to override */ 476 /* allow shift to override */
481 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 477 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
482 STRCPY(kbuf, "\033Ow"); 478 {
483 break; 479 STRCPY (kbuf, "\033Ow");
484 } 480 break;
485 /* FALLTHROUGH */ 481 }
482 /* FALLTHROUGH */
486#endif 483#endif
487 case XK_Home: 484 case XK_Home:
488 STRCPY(kbuf, KS_HOME); 485 STRCPY (kbuf, KS_HOME);
489 break; 486 break;
490 487
491#define FKEY(n, fkey) \ 488#define FKEY(n, fkey) \
492 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 489 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
493 490
494 case XK_F1: /* "\033[11~" */ 491 case XK_F1: /* "\033[11~" */
495 case XK_F2: /* "\033[12~" */ 492 case XK_F2: /* "\033[12~" */
496 case XK_F3: /* "\033[13~" */ 493 case XK_F3: /* "\033[13~" */
497 case XK_F4: /* "\033[14~" */ 494 case XK_F4: /* "\033[14~" */
498 case XK_F5: /* "\033[15~" */ 495 case XK_F5: /* "\033[15~" */
499 FKEY(11, XK_F1); 496 FKEY (11, XK_F1);
500 break; 497 break;
501 case XK_F6: /* "\033[17~" */ 498 case XK_F6: /* "\033[17~" */
502 case XK_F7: /* "\033[18~" */ 499 case XK_F7: /* "\033[18~" */
503 case XK_F8: /* "\033[19~" */ 500 case XK_F8: /* "\033[19~" */
504 case XK_F9: /* "\033[20~" */ 501 case XK_F9: /* "\033[20~" */
505 case XK_F10: /* "\033[21~" */ 502 case XK_F10: /* "\033[21~" */
506 FKEY(17, XK_F6); 503 FKEY (17, XK_F6);
507 break; 504 break;
508 case XK_F11: /* "\033[23~" */ 505 case XK_F11: /* "\033[23~" */
509 case XK_F12: /* "\033[24~" */ 506 case XK_F12: /* "\033[24~" */
510 case XK_F13: /* "\033[25~" */ 507 case XK_F13: /* "\033[25~" */
511 case XK_F14: /* "\033[26~" */ 508 case XK_F14: /* "\033[26~" */
512 FKEY(23, XK_F11); 509 FKEY (23, XK_F11);
513 break; 510 break;
514 case XK_F15: /* "\033[28~" */ 511 case XK_F15: /* "\033[28~" */
515 case XK_F16: /* "\033[29~" */ 512 case XK_F16: /* "\033[29~" */
516 FKEY(28, XK_F15); 513 FKEY (28, XK_F15);
517 break; 514 break;
518 case XK_Help: /* "\033[28~" */ 515 case XK_Help: /* "\033[28~" */
519 FKEY(28, XK_Help); 516 FKEY (28, XK_Help);
520 break; 517 break;
521 case XK_Menu: /* "\033[29~" */ 518 case XK_Menu: /* "\033[29~" */
522 FKEY(29, XK_Menu); 519 FKEY (29, XK_Menu);
523 break; 520 break;
524 case XK_F17: /* "\033[31~" */ 521 case XK_F17: /* "\033[31~" */
525 case XK_F18: /* "\033[32~" */ 522 case XK_F18: /* "\033[32~" */
526 case XK_F19: /* "\033[33~" */ 523 case XK_F19: /* "\033[33~" */
527 case XK_F20: /* "\033[34~" */ 524 case XK_F20: /* "\033[34~" */
528 case XK_F21: /* "\033[35~" */ 525 case XK_F21: /* "\033[35~" */
529 case XK_F22: /* "\033[36~" */ 526 case XK_F22: /* "\033[36~" */
530 case XK_F23: /* "\033[37~" */ 527 case XK_F23: /* "\033[37~" */
531 case XK_F24: /* "\033[38~" */ 528 case XK_F24: /* "\033[38~" */
532 case XK_F25: /* "\033[39~" */ 529 case XK_F25: /* "\033[39~" */
533 case XK_F26: /* "\033[40~" */ 530 case XK_F26: /* "\033[40~" */
534 case XK_F27: /* "\033[41~" */ 531 case XK_F27: /* "\033[41~" */
535 case XK_F28: /* "\033[42~" */ 532 case XK_F28: /* "\033[42~" */
536 case XK_F29: /* "\033[43~" */ 533 case XK_F29: /* "\033[43~" */
537 case XK_F30: /* "\033[44~" */ 534 case XK_F30: /* "\033[44~" */
538 case XK_F31: /* "\033[45~" */ 535 case XK_F31: /* "\033[45~" */
539 case XK_F32: /* "\033[46~" */ 536 case XK_F32: /* "\033[46~" */
540 case XK_F33: /* "\033[47~" */ 537 case XK_F33: /* "\033[47~" */
541 case XK_F34: /* "\033[48~" */ 538 case XK_F34: /* "\033[48~" */
542 case XK_F35: /* "\033[49~" */ 539 case XK_F35: /* "\033[49~" */
543 FKEY(31, XK_F17); 540 FKEY (31, XK_F17);
544 break; 541 break;
545#undef FKEY 542#undef FKEY
546 default: 543 default:
547 newlen = 0; 544 newlen = 0;
548 break; 545 break;
549 } 546 }
550 if (newlen) 547 if (newlen)
551 len = STRLEN(kbuf); 548 len = STRLEN (kbuf);
552 } 549 }
553 /* 550 /*
554 * Pass meta for all function keys, if 'meta' option set 551 * Pass meta for all function keys, if 'meta' option set
555 */ 552 */
556#ifdef META8_OPTION 553#ifdef META8_OPTION
557 if (meta && (R->meta_char == 0x80) && len > 0) 554 if (meta && (meta_char == 0x80) && len > 0)
558 kbuf[len - 1] |= 0x80; 555 kbuf[len - 1] |= 0x80;
559#endif 556#endif
557
558 }
560 } else if (ctrl && keysym == XK_minus) { 559 else if (ctrl && keysym == XK_minus)
560 {
561 len = 1; 561 len = 1;
562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
563 } else { 563 }
564 else
565 {
564#ifdef META8_OPTION 566#ifdef META8_OPTION
565 /* set 8-bit on */ 567 /* set 8-bit on */
566 if (meta && (R->meta_char == 0x80)) { 568 if (meta && (meta_char == 0x80))
567 unsigned char *ch; 569 {
570 unsigned char *ch;
568 571
569 for (ch = kbuf; ch < kbuf + len; ch++) 572 for (ch = kbuf; ch < kbuf + len; ch++)
570 *ch |= 0x80; 573 *ch |= 0x80;
571 meta = 0; 574 meta = 0;
575 }
576#endif
577 /* nil */ ;
578 }
572 } 579 }
573#endif 580
574#ifdef GREEK_SUPPORT 581 if (len <= 0)
575 if (R->greek_mode) 582 return; /* not mapped */
576 len = greek_xlat(kbuf, len); 583
577#endif 584 if (Options & Opt_scrollTtyKeypress)
578 /* nil */ ; 585 if (TermWin.view_start)
579 } 586 {
587 TermWin.view_start = 0;
588 want_refresh = 1;
580 } 589 }
581 590
582 if (len <= 0) 591 /*
583 return; /* not mapped */
584
585 if (R->Options & Opt_scrollTtyKeypress)
586 if (R->TermWin.view_start) {
587 R->TermWin.view_start = 0;
588 R->want_refresh = 1;
589 }
590
591/*
592 * these modifications only affect the static keybuffer 592 * these modifications only affect the static keybuffer
593 * pass Shift/Control indicators for function keys ending with `~' 593 * pass Shift/Control indicators for function keys ending with `~'
594 * 594 *
595 * eg, 595 * eg,
596 * Prior = "ESC[5~" 596 * Prior = "ESC[5~"
597 * Shift+Prior = "ESC[5$" 597 * Shift+Prior = "ESC[5$"
598 * Ctrl+Prior = "ESC[5^" 598 * Ctrl+Prior = "ESC[5^"
599 * Ctrl+Shift+Prior = "ESC[5@" 599 * Ctrl+Shift+Prior = "ESC[5@"
600 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 600 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
601 */ 601 */
602 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 602 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
604 604
605/* escape prefix */ 605 /* escape prefix */
606 if (meta 606 if (meta
607#ifdef META8_OPTION 607#ifdef META8_OPTION
608 && (R->meta_char == C0_ESC) 608 && meta_char == C0_ESC
609#endif 609#endif
610 ) { 610 )
611 {
611 const unsigned char ch = C0_ESC; 612 const unsigned char ch = C0_ESC;
612
613 R->tt_write(&ch, 1); 613 tt_write (&ch, 1);
614 } 614 }
615
615#ifdef DEBUG_CMD 616#if defined(DEBUG_CMD)
616 if (debug_key) { /* Display keyboard buffer contents */ 617 /* Display keyboard buffer contents */
617 char *p; 618 unsigned char *p;
618 int i; 619 int i;
619 620
620 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 621 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
621 for (i = 0, p = kbuf; i < len; i++, p++) 622 for (i = 0, p = kbuf; i < len; i++, p++)
622 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 623 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
623 fprintf(stderr, "'\n"); 624 fprintf (stderr, "'\n");
624 }
625#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
626 R->tt_write(kbuf, (unsigned int)len); 626 tt_write (kbuf, (unsigned int)len);
627} 627}
628/*}}} */ 628/*}}} */
629 629
630#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
631/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
632/* attempt to `write' count to the input buffer */ 632/* attempt to `write' count to the input buffer */
633/* EXTPROTO */
634unsigned int 633unsigned int
635rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 634rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
636{ 635{
637 unsigned int n, s; 636 unsigned int n, s;
638 unsigned char *cmdbuf_base = R->cmdbuf_base,
639 *cmdbuf_endp = R->cmdbuf_endp,
640 *cmdbuf_ptr = R->cmdbuf_ptr;
641 637
642 n = cmdbuf_ptr - cmdbuf_base; 638 n = cmdbuf_ptr - cmdbuf_base;
643 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
640
644 if (n > 0 && s < count) { 641 if (n > 0 && s < count)
642 {
645 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 643 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
646 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
647 cmdbuf_ptr = cmdbuf_base; 645 cmdbuf_ptr = cmdbuf_base;
648 cmdbuf_endp -= n; 646 cmdbuf_endp -= n;
649 s += n; 647 s += n;
650 } 648 }
649
651 if (count > s) { 650 if (count > s)
651 {
652 rxvt_print_error("data loss: cmd_write too large"); 652 rxvt_print_error ("data loss: cmd_write too large");
653 count = s; 653 count = s;
654 } 654 }
655
655 for (; count--;) 656 for (; count--;)
656 *cmdbuf_endp++ = *str++; 657 *cmdbuf_endp++ = *str++;
657 R->cmdbuf_ptr = cmdbuf_ptr; 658
658 R->cmdbuf_endp = cmdbuf_endp; 659 cmd_parse ();
660
659 return 0; 661 return 0;
660} 662}
661#endif /* MENUBAR_MAX */ 663#endif /* MENUBAR_MAX */
662 664
663void 665void
664rxvt_term::flush () 666rxvt_term::flush ()
665{ 667{
666#ifdef TRANSPARENT 668#ifdef TRANSPARENT
667 if (want_full_refresh) 669 if (want_full_refresh)
668 { 670 {
669 want_full_refresh = 0; 671 want_full_refresh = 0;
670 rxvt_scr_clear (this); 672 scr_clear ();
671 rxvt_scr_touch (this, False); 673 scr_touch (false);
672 want_refresh = 1; 674 want_refresh = 1;
673 } 675 }
674#endif 676#endif
675 677
676 if (want_refresh) 678 if (want_refresh)
677 { 679 {
678 rxvt_scr_refresh (this, refresh_type); 680 scr_refresh (refresh_type);
679 rxvt_scrollbar_show (this, 1); 681 scrollbar_show (1);
680#ifdef USE_XIM 682#ifdef USE_XIM
681 rxvt_IMSendSpot (this); 683 IMSendSpot ();
682#endif 684#endif
683 }
684 685
685 XFlush (Xdisplay); 686 }
686#if 0 687
687 if (XPending (Xdisplay)) process_x_events (); 688 display->flush ();
688 if (XPending (Xdisplay)) process_x_events ();
689#endif
690} 689}
691 690
692void 691void
693rxvt_term::check_cb (check_watcher &w) 692rxvt_term::check_cb (check_watcher &w)
694{ 693{
695 SET_R (this); 694 SET_R (this);
695 SET_LOCALE (locale);
696 696
697 flush (); 697 flush ();
698} 698}
699 699
700#ifdef CURSOR_BLINK
700void 701void
701rxvt_term::process_x_events ()
702{
703 do
704 {
705 XEvent xev;
706
707 XNextEvent (Xdisplay, &xev);
708
709#if defined(CURSOR_BLINK)
710 if ((Options & Opt_cursorBlink)
711 && xev.type == KeyPress)
712 {
713 if (hidden_cursor)
714 {
715 hidden_cursor = 0;
716 want_refresh = 1;
717 }
718
719 blink_ev.start (NOW + BLINK_INTERVAL);
720 }
721#endif
722
723#if defined(POINTER_BLANK)
724 if ((Options & Opt_pointerBlank)
725 && (pointerBlankDelay > 0))
726 {
727 if (xev.type == MotionNotify
728 || xev.type == ButtonPress
729 || xev.type == ButtonRelease)
730 if (hidden_pointer)
731 pointer_unblank ();
732
733 if (xev.type == KeyPress && hidden_pointer == 0)
734 pointer_blank ();
735 }
736#endif
737
738#ifdef USE_XIM
739 if (!XFilterEvent (&xev, xev.xany.window))
740#endif
741 rxvt_process_x_event (this, &xev);
742 }
743 while (XPending (Xdisplay));
744}
745
746void
747rxvt_term::blink_cb (time_watcher &w) 702rxvt_term::cursor_blink_cb (time_watcher &w)
748{ 703{
749 SET_R (this);
750
751 w.at += BLINK_INTERVAL;
752 hidden_cursor = !hidden_cursor; 704 hidden_cursor = !hidden_cursor;
753 want_refresh = 1; 705 want_refresh = 1;
754}
755 706
707 w.start (w.at + BLINK_INTERVAL);
708}
709#endif
710
711#ifdef TEXT_BLINK
756void 712void
757rxvt_term::x_cb (io_watcher &w, short revents) 713rxvt_term::text_blink_cb (time_watcher &w)
758{ 714{
759 SET_R (this); 715 if (scr_refresh_rend (RS_Blink, RS_Blink))
760 716 {
761 process_x_events (); 717 hidden_text = !hidden_text;
718 want_refresh = 1;
719 w.start (w.at + TEXT_BLINK_INTERVAL);
720 }
762} 721}
722#endif
763 723
764bool 724bool
765rxvt_term::pty_fill () 725rxvt_term::pty_fill ()
766{ 726{
767 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 727 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
768 728
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 729 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 730 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 731 cmdbuf_endp = cmdbuf_ptr + n;
772 732
773 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
774 734
775 if (n > 0) 735 if (n > 0)
776 { 736 {
777 cmdbuf_endp += n; 737 cmdbuf_endp += n;
778 return true; 738 return true;
779 } 739 }
780 else if (n < 0 && errno != EAGAIN) 740 else if (n < 0 && errno != EAGAIN)
781 destroy (); 741 destroy ();
782 742
783 return false; 743 return false;
784} 744}
785 745
786void 746void
787rxvt_term::pty_cb (io_watcher &w, short revents) 747rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 748{
789 SET_R (this); 749 SET_R (this);
750 SET_LOCALE (locale);
790 751
791 if (revents & EVENT_WRITE) 752 if (revents & EVENT_WRITE)
792 tt_write (0, 0); 753 tt_write (0, 0);
793 else if (revents & EVENT_READ) 754 else if (revents & EVENT_READ)
794 { 755 {
… …
803 seen_input = 1; 764 seen_input = 1;
804 /* once we know the shell is running, send the screen size. Again! */ 765 /* once we know the shell is running, send the screen size. Again! */
805 tt_winch (); 766 tt_winch ();
806 } 767 }
807 768
769 if (cmd_parse ())
770 break;
771 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
808 uint32_t ch = NOCHAR; 779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
809 798
810 for (;;) 799 for (;;)
811 { 800 {
812 if (ch == NOCHAR)
813 ch = next_char (); 801 ch = next_char ();
814 802
815 if (ch == NOCHAR) // TODO: improve 803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
816 break; 804 break;
817 805 else
818 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
819 { 806 {
820 /* Read a text string from the input buffer */
821 uint32_t buf[BUFSIZ];
822 bool refreshnow = false;
823 int nlines = 0;
824 uint32_t *str = buf;
825
826 *str++ = ch; 807 *str++ = ch;
827 808
828 for (;;) 809 if (ch == '\n')
829 { 810 {
830 ch = next_char ();
831
832 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
833 break;
834 else 811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
835 { 816 {
836 *str++ = ch;
837
838 if (ch == '\n')
839 {
840 nlines++;
841 refresh_count++;
842
843 if (!(Options & Opt_jumpScroll)
844 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
845 {
846 refreshnow = true; 817 refreshnow = true;
847 flag = false; 818 flag = false;
848 ch = NOCHAR;
849 break;
850 }
851 }
852
853 if (str >= buf + BUFSIZ)
854 {
855 ch = NOCHAR; 819 ch = NOCHAR;
856 break; 820 break;
857 } 821 }
822
823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
824 if (nlines >= TermWin.nrow - 1)
825 {
826 scr_add_lines (buf, nlines, str - buf);
827 nlines = 0;
828 str = buf;
858 } 829 }
859 } 830 }
860 831
861 rxvt_scr_add_lines (this, buf, nlines, str - buf); 832 if (str >= buf + BUFSIZ)
862
863 /*
864 * If there have been a lot of new lines, then update the screen
865 * What the heck I'll cheat and only refresh less than every page-full.
866 * the number of pages between refreshes is refresh_limit, which
867 * is incremented here because we must be doing flat-out scrolling.
868 *
869 * refreshing should be correct for small scrolls, because of the
870 * time-out
871 */
872 if (refreshnow)
873 { 833 {
874 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 834 ch = NOCHAR;
875 refresh_limit++; 835 break;
876
877 rxvt_scr_refresh (this, refresh_type);
878 } 836 }
879
880 }
881 else
882 {
883 switch (ch)
884 {
885 default:
886 rxvt_process_nonprinting (this, ch);
887 break;
888 case C0_ESC: /* escape char */
889 rxvt_process_escape_seq (this);
890 break;
891 /*case 0x9b: */ /* CSI */
892 /* rxvt_process_csi_seq (this); */
893 }
894
895 ch = NOCHAR;
896 } 837 }
897 } 838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
898 } 861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
899 } 876 }
877
878 return flag;
900} 879}
901 880
902// read the next character, currently handles UTF-8 881// read the next character, currently handles UTF-8
903// will probably handle all sorts of other stuff in the future 882// will probably handle all sorts of other stuff in the future
904uint32_t 883uint32_t
905rxvt_term::next_char () 884rxvt_term::next_char ()
906{ 885{
907 struct mbstate &s = mbstate;
908
909 while (cmdbuf_ptr < cmdbuf_endp) 886 while (cmdbuf_ptr < cmdbuf_endp)
910 { 887 {
911 uint8_t ch = *cmdbuf_ptr; 888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
912 889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
913 if (s.cnt)
914 {
915 if ((ch & 0xc0) == 0x80)
916 {
917 cmdbuf_ptr++; 890 || !*cmdbuf_ptr)
891 return *cmdbuf_ptr++;
918 892
919 /* continuation */ 893 wchar_t wc;
920 s.reg = (s.reg << 6) | (ch & 0x7f); 894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
921 895
922 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ 896 if (len == (size_t)-2)
923 return s.reg;
924
925 continue;
926 }
927 else
928 {
929 s.cnt = 0;
930 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
931 }
932 } 897 {
933 898 // the mbstate stores incomplete sequences. didn't know this :/
934 if ((ch & 0xc0) == 0xc0) 899 cmdbuf_ptr = cmdbuf_endp;
900 break;
935 { 901 }
902
903 if (len == (size_t)-1)
904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
905
906 // assume wchar == unicode
936 cmdbuf_ptr++; 907 cmdbuf_ptr += len;
937
938 /* first byte */
939 s.orig = ch; /* for broken encodings */
940 s.reg = ch;
941 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
942 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
943 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
944 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
945 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
946 }
947 else
948 {
949 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
950 return ch; 908 return wc;
951 }
952 } 909 }
953 910
954 return NOCHAR; 911 return NOCHAR;
955} 912}
956 913
957/* rxvt_cmd_getc() - Return next input character */ 914/* rxvt_cmd_getc () - Return next input character */
958/* 915/*
959 * Return the next input character after first passing any keyboard input 916 * Return the next input character after first passing any keyboard input
960 * to the command. 917 * to the command.
961 */ 918 */
962/* INTPROTO */
963uint32_t 919uint32_t
964rxvt_cmd_getc(pR) 920rxvt_term::cmd_getc ()
965{ 921{
966 for (;;) 922 for (;;)
967 { 923 {
968 uint32_t c = R->next_char (); 924 uint32_t c = next_char ();
969 if (c != NOCHAR) 925 if (c != NOCHAR)
970 return c; 926 return c;
971 927
972 // incomplete sequences should occur rarely, still, a better solution 928 // incomplete sequences should occur rarely, still, a better solution
973 // would be preferred. either setjmp/longjmp or better design. 929 // would be preferred. either setjmp/longjmp or better design.
974 fcntl (R->cmd_fd, F_SETFL, 0); 930 fcntl (cmd_fd, F_SETFL, 0);
975 R->pty_fill (); 931 pty_fill ();
976 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
977 }
978
979#if 0
980#define TIMEOUT_USEC 5000
981 fd_set readfds;
982 int quick_timeout, select_res;
983 int want_motion_time, want_keypress_time;
984 struct timeval value;
985#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
986 struct timeval tp;
987#endif
988
989 for (;;) {
990 /* loop until we can return something */
991
992 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
993 R->tt_write(NULL, 0);
994
995#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
996 if (R->mouse_slip_wheel_speed) {
997 quick_timeout = 1;
998 if (!R->mouse_slip_wheel_delay--
999 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
1000 abs(R->mouse_slip_wheel_speed))) {
1001 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1002 R->refresh_type |= SMOOTH_REFRESH;
1003 R->want_refresh = 1;
1004 } 933 }
1005 }
1006#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
1007#ifdef SELECTION_SCROLLING
1008 if (R->pending_scroll_selection) {
1009 quick_timeout = 1;
1010 if (!R->scroll_selection_delay--
1011 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1012 R->scroll_selection_lines)) {
1013 rxvt_selection_extend(aR_ R->selection_save_x,
1014 R->selection_save_y, R->selection_save_state);
1015 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 R->refresh_type |= SMOOTH_REFRESH;
1017 R->want_refresh = 1;
1018 }
1019 }
1020#endif
1021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1022 if (scrollbar_isUp() || scrollbar_isDn()) {
1023 quick_timeout = 1;
1024 if (!R->scroll_arrow_delay--
1025 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1026 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1027 R->refresh_type |= SMOOTH_REFRESH;
1028 R->want_refresh = 1;
1029 }
1030 }
1031#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1032
1033#ifdef TRANSPARENT
1034 quick_timeout |= R->want_full_refresh;
1035#endif
1036#endif
1037} 934}
1038 935
936#ifdef POINTER_BLANK
1039void 937void
1040rxvt_term::pointer_unblank () 938rxvt_term::pointer_unblank ()
1041{ 939{
1042 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 940 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1043 rxvt_recolour_cursor (this); 941 recolour_cursor ();
1044 942
1045#ifdef POINTER_BLANK
1046 hidden_pointer = 0; 943 hidden_pointer = 0;
1047 944
1048 if (Options & Opt_pointerBlank) 945 if (Options & Opt_pointerBlank)
1049 pointer_ev.start (NOW + pointerBlankDelay); 946 pointer_ev.start (NOW + pointerBlankDelay);
1050#endif
1051} 947}
1052 948
1053#ifdef POINTER_BLANK
1054void 949void
1055rxvt_term::pointer_blank () 950rxvt_term::pointer_blank ()
1056{ 951{
1057 pointer_ev.stop ();
1058
1059 if (!(Options & Opt_pointerBlank)) 952 if (! (Options & Opt_pointerBlank))
1060 return; 953 return;
1061 954
1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 955 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1063 XFlush (Xdisplay); 956 XFlush (display->display);
1064 957
1065 hidden_pointer = 1; 958 hidden_pointer = 1;
1066} 959}
1067 960
1068void 961void
1069rxvt_term::pointer_cb (time_watcher &w) 962rxvt_term::pointer_cb (time_watcher &w)
1070{ 963{
1071 SET_R (this); 964 SET_R (this);
965 SET_LOCALE (locale);
1072 966
1073 pointer_blank (); 967 pointer_blank ();
1074} 968}
1075#endif 969#endif
1076 970
1077/* INTPROTO */
1078void 971void
1079rxvt_mouse_report(pR_ const XButtonEvent *ev) 972rxvt_term::mouse_report (XButtonEvent &ev)
1080{ 973{
1081 int button_number, key_state = 0; 974 int button_number, key_state = 0;
1082 int x, y; 975 int x, y;
1083 976
1084 x = ev->x; 977 x = ev.x;
1085 y = ev->y; 978 y = ev.y;
1086 rxvt_pixel_position(aR_ &x, &y); 979 pixel_position (&x, &y);
1087 980
1088 if (R->MEvent.button == AnyButton) { 981 if (MEvent.button == AnyButton)
982 {
1089 button_number = 3; 983 button_number = 3;
1090 } else { 984 }
985 else
986 {
1091 button_number = R->MEvent.button - Button1; 987 button_number = MEvent.button - Button1;
1092 /* add 0x3D for wheel events, like xterm does */ 988 /* add 0x3D for wheel events, like xterm does */
1093 if (button_number >= 3) 989 if (button_number >= 3)
1094 button_number += (64 - 3); 990 button_number += (64 - 3);
1095 } 991 }
1096 992
1097 if (R->PrivateModes & PrivMode_MouseX10) { 993 if (PrivateModes & PrivMode_MouseX10)
994 {
1098 /* 995 /*
1099 * do not report ButtonRelease 996 * do not report ButtonRelease
1100 * no state info allowed 997 * no state info allowed
1101 */ 998 */
1102 key_state = 0; 999 key_state = 0;
1103 if (button_number == 3) 1000 if (button_number == 3)
1104 return; 1001 return;
1105 } else { 1002 }
1003 else
1004 {
1106 /* XTerm mouse reporting needs these values: 1005 /* XTerm mouse reporting needs these values:
1107 * 4 = Shift 1006 * 4 = Shift
1108 * 8 = Meta 1007 * 8 = Meta
1109 * 16 = Control 1008 * 16 = Control
1110 * plus will add in our own Double-Click reporting 1009 * plus will add in our own Double-Click reporting
1111 * 32 = Double Click 1010 * 32 = Double Click
1112 */ 1011 */
1113 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1012 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1114 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1013 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1115 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1014 + ((MEvent.state & ControlMask) ? 16 : 0);
1116#ifdef MOUSE_REPORT_DOUBLECLICK 1015#ifdef MOUSE_REPORT_DOUBLECLICK
1117 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1016 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1118#endif 1017#endif
1018
1119 } 1019 }
1120 1020
1121#ifdef DEBUG_MOUSEREPORT 1021#ifdef DEBUG_MOUSEREPORT
1122 fprintf(stderr, "Mouse ["); 1022 fprintf (stderr, "Mouse [");
1123 if (key_state & 16) 1023 if (key_state & 16)
1124 fputc('C', stderr); 1024 fputc ('C', stderr);
1125 if (key_state & 4) 1025 if (key_state & 4)
1126 fputc('S', stderr); 1026 fputc ('S', stderr);
1127 if (key_state & 8) 1027 if (key_state & 8)
1128 fputc('A', stderr); 1028 fputc ('A', stderr);
1129 if (key_state & 32) 1029 if (key_state & 32)
1130 fputc('2', stderr); 1030 fputc ('2', stderr);
1131 fprintf(stderr, "]: <%d>, %d/%d\n", 1031 fprintf (stderr, "]: <%d>, %d/%d\n",
1132 button_number, 1032 button_number,
1133 x + 1, 1033 x + 1,
1134 y + 1); 1034 y + 1);
1135#else 1035#else
1136 R->tt_printf("\033[M%c%c%c", 1036 tt_printf ("\033[M%c%c%c",
1137 (32 + button_number + key_state), 1037 (32 + button_number + key_state),
1138 (32 + x + 1), 1038 (32 + x + 1),
1139 (32 + y + 1)); 1039 (32 + y + 1));
1140#endif 1040#endif
1141} 1041}
1142 1042
1143#ifdef USING_W11LIB 1043#ifdef USING_W11LIB
1144/* EXTPROTO */
1145void 1044void
1146rxvt_W11_process_x_event(XEvent *ev) 1045rxvt_W11_process_x_event (XEvent *ev)
1147{ 1046{
1148 rxvt_t *r = rxvt_get_r(); 1047 rxvt_t *r = rxvt_get_r ();
1149 1048
1150 rxvt_process_x_event(aR_ ev); 1049 x_cb (*ev);
1151} 1050}
1152#endif 1051#endif
1153 1052
1154/*{{{ process an X event */ 1053/*{{{ process an X event */
1155/* INTPROTO */
1156void 1054void
1157rxvt_process_x_event(pR_ XEvent *ev) 1055rxvt_term::x_cb (XEvent &ev)
1158{ 1056{
1159 int i, want_timeout; 1057 SET_R (this);
1058 SET_LOCALE (locale);
1059
1060#if defined(CURSOR_BLINK)
1061 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1062 {
1063 if (hidden_cursor)
1064 {
1065 hidden_cursor = 0;
1066 want_refresh = 1;
1067 }
1068
1069 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1070 }
1071#endif
1072
1073#if defined(POINTER_BLANK)
1074 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1075 {
1076 if (ev.type == MotionNotify
1077 || ev.type == ButtonPress
1078 || ev.type == ButtonRelease)
1079 if (hidden_pointer)
1080 pointer_unblank ();
1081
1082 if (ev.type == KeyPress && hidden_pointer == 0)
1083 pointer_blank ();
1084 }
1085#endif
1086
1087#ifdef USE_XIM
1088 if (XFilterEvent (&ev, None))
1089 return;
1090#endif
1091
1160 Window unused_root, unused_child; 1092 Window unused_root, unused_child;
1161 int unused_root_x, unused_root_y; 1093 int unused_root_x, unused_root_y;
1162 unsigned int unused_mask; 1094 unsigned int unused_mask;
1163 1095
1164#ifdef DEBUG_X 1096#ifdef DEBUG_X
1165 const char *const eventnames[] = 1097 const char *const eventnames[] =
1166 { /* mason - this matches my system */ 1098 { /* mason - this matches my system */
1167 "", 1099 "",
1168 "", 1100 "",
1169 "KeyPress", 1101 "KeyPress",
1170 "KeyRelease", 1102 "KeyRelease",
1171 "ButtonPress", 1103 "ButtonPress",
1172 "ButtonRelease", 1104 "ButtonRelease",
1173 "MotionNotify", 1105 "MotionNotify",
1174 "EnterNotify", 1106 "EnterNotify",
1175 "LeaveNotify", 1107 "LeaveNotify",
1176 "FocusIn", 1108 "FocusIn",
1177 "FocusOut", 1109 "FocusOut",
1178 "KeymapNotify", 1110 "KeymapNotify",
1179 "Expose", 1111 "Expose",
1180 "GraphicsExpose", 1112 "GraphicsExpose",
1181 "NoExpose", 1113 "NoExpose",
1182 "VisibilityNotify", 1114 "VisibilityNotify",
1183 "CreateNotify", 1115 "CreateNotify",
1184 "DestroyNotify", 1116 "DestroyNotify",
1185 "UnmapNotify", 1117 "UnmapNotify",
1186 "MapNotify", 1118 "MapNotify",
1187 "MapRequest", 1119 "MapRequest",
1188 "ReparentNotify", 1120 "ReparentNotify",
1189 "ConfigureNotify", 1121 "ConfigureNotify",
1190 "ConfigureRequest", 1122 "ConfigureRequest",
1191 "GravityNotify", 1123 "GravityNotify",
1192 "ResizeRequest", 1124 "ResizeRequest",
1193 "CirculateNotify", 1125 "CirculateNotify",
1194 "CirculateRequest", 1126 "CirculateRequest",
1195 "PropertyNotify", 1127 "PropertyNotify",
1196 "SelectionClear", 1128 "SelectionClear",
1197 "SelectionRequest", 1129 "SelectionRequest",
1198 "SelectionNotify", 1130 "SelectionNotify",
1199 "ColormapNotify", 1131 "ColormapNotify",
1200 "ClientMessage", 1132 "ClientMessage",
1201 "MappingNotify" 1133 "MappingNotify"
1202 }; 1134 };
1203#endif 1135#endif
1204 1136
1205#ifdef DEBUG_X 1137#ifdef DEBUG_X
1206 struct timeval tp; 1138 struct timeval tp;
1207 struct tm *ltt; 1139 struct tm *ltt;
1208 (void)gettimeofday(&tp, NULL); 1140 (void)gettimeofday (&tp, NULL);
1209 ltt = localtime(&(tp.tv_sec)); 1141 ltt = localtime (& (tp.tv_sec));
1210 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1142 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));
1211#endif 1143#endif
1212 1144
1213 switch (ev->type) { 1145 switch (ev.type)
1146 {
1214 case KeyPress: 1147 case KeyPress:
1215 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1148 lookup_key (ev.xkey);
1216 break; 1149 break;
1217 1150
1218#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1219 case KeyRelease: 1152 case KeyRelease:
1220 { 1153 {
1221 if (!(ev->xkey.state & ControlMask)) 1154 if (! (ev.xkey.state & ControlMask))
1222 R->mouse_slip_wheel_speed = 0; 1155 mouse_slip_wheel_speed = 0;
1223 else { 1156 else
1224 KeySym ks; 1157 {
1225 1158 KeySym ks;
1159
1226 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1227 if (ks == XK_Control_L || ks == XK_Control_R) 1161 if (ks == XK_Control_L || ks == XK_Control_R)
1228 R->mouse_slip_wheel_speed = 0; 1162 mouse_slip_wheel_speed = 0;
1229 } 1163 }
1230 break; 1164 break;
1231 } 1165 }
1232#endif 1166#endif
1233 1167
1234 case ButtonPress: 1168 case ButtonPress:
1235 rxvt_button_press(aR_ (XButtonEvent *)ev); 1169 button_press (ev.xbutton);
1236 break; 1170 break;
1237 1171
1238 case ButtonRelease: 1172 case ButtonRelease:
1239 rxvt_button_release(aR_ (XButtonEvent *)ev); 1173 button_release (ev.xbutton);
1240 break; 1174 break;
1241 1175
1242 case ClientMessage: 1176 case ClientMessage:
1243 if (ev->xclient.format == 32 1177 if (ev.xclient.format == 32
1244 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1178 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1245 R->destroy (); 1179 destroy ();
1246#ifdef OFFIX_DND 1180#ifdef OFFIX_DND
1247 /* OffiX Dnd (drag 'n' drop) protocol */ 1181 /* OffiX Dnd (drag 'n' drop) protocol */
1248 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1182 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1249 && (ev->xclient.data.l[0] == DndFile 1183 && (ev.xclient.data.l[0] == DndFile
1250 || ev->xclient.data.l[0] == DndDir 1184 || ev.xclient.data.l[0] == DndDir
1251 || ev->xclient.data.l[0] == DndLink)) { 1185 || ev.xclient.data.l[0] == DndLink))
1252 /* Get Dnd data */ 1186 {
1187 /* Get Dnd data */
1253 Atom ActualType; 1188 Atom ActualType;
1254 int ActualFormat; 1189 int ActualFormat;
1255 unsigned char *data; 1190 unsigned char *data;
1256 unsigned long Size, RemainingBytes; 1191 unsigned long Size, RemainingBytes;
1257 1192
1258 XGetWindowProperty(R->Xdisplay, Xroot, 1193 XGetWindowProperty (display->display, display->root,
1259 R->xa[XA_DNDSELECTION], 1194 xa[XA_DNDSELECTION],
1260 0L, 1000000L, 1195 0L, 1000000L,
1261 False, AnyPropertyType, 1196 False, AnyPropertyType,
1262 &ActualType, &ActualFormat, 1197 &ActualType, &ActualFormat,
1263 &Size, &RemainingBytes, 1198 &Size, &RemainingBytes,
1264 &data); 1199 &data);
1265 XChangeProperty(R->Xdisplay, Xroot, 1200 XChangeProperty (display->display, display->root,
1266 XA_CUT_BUFFER0, XA_STRING, 1201 XA_CUT_BUFFER0, XA_STRING,
1267 8, PropModeReplace, 1202 8, PropModeReplace,
1268 data, STRLEN(data)); 1203 data, STRLEN (data));
1269 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1204 selection_paste (display->root, XA_CUT_BUFFER0, True);
1270 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1271 } 1206 }
1272#endif /* OFFIX_DND */ 1207#endif /* OFFIX_DND */
1273 break; 1208 break;
1274 1209
1275 case MappingNotify: 1210 case MappingNotify:
1276 XRefreshKeyboardMapping(&(ev->xmapping)); 1211 XRefreshKeyboardMapping (& (ev.xmapping));
1277 break; 1212 break;
1278 1213
1279 /* 1214 /*
1280 * XXX: this is not the _current_ arrangement 1215 * XXX: this is not the _current_ arrangement
1281 * Here's my conclusion: 1216 * Here's my conclusion:
1282 * If the window is completely unobscured, use bitblt's 1217 * If the window is completely unobscured, use bitblt's
1283 * to scroll. Even then, they're only used when doing partial 1218 * to scroll. Even then, they're only used when doing partial
1284 * screen scrolling. When partially obscured, we have to fill 1219 * screen scrolling. When partially obscured, we have to fill
1285 * in the GraphicsExpose parts, which means that after each refresh, 1220 * in the GraphicsExpose parts, which means that after each refresh,
1286 * we need to wait for the graphics expose or Noexpose events, 1221 * we need to wait for the graphics expose or Noexpose events,
1287 * which ought to make things real slow! 1222 * which ought to make things real slow!
1288 */ 1223 */
1289 case VisibilityNotify: 1224 case VisibilityNotify:
1290 switch (ev->xvisibility.state) 1225 switch (ev.xvisibility.state)
1291 { 1226 {
1292 case VisibilityUnobscured: 1227 case VisibilityUnobscured:
1293 R->refresh_type = FAST_REFRESH; 1228 refresh_type = FAST_REFRESH;
1294 break; 1229 break;
1295 case VisibilityPartiallyObscured: 1230 case VisibilityPartiallyObscured:
1296 R->refresh_type = SLOW_REFRESH; 1231 refresh_type = SLOW_REFRESH;
1297 break; 1232 break;
1298 default: 1233 default:
1299 R->refresh_type = NO_REFRESH; 1234 refresh_type = NO_REFRESH;
1300 break; 1235 break;
1301 } 1236 }
1302 break; 1237 break;
1303 1238
1304 case FocusIn: 1239 case FocusIn:
1305 if (!R->TermWin.focus) { 1240 if (!TermWin.focus)
1306 R->TermWin.focus = 1; 1241 {
1307 R->want_refresh = 1; 1242 TermWin.focus = 1;
1243 want_refresh = 1;
1308#ifdef USE_XIM 1244#ifdef USE_XIM
1309 if (R->Input_Context != NULL) 1245 if (Input_Context != NULL)
1310 XSetICFocus(R->Input_Context); 1246 XSetICFocus (Input_Context);
1311#endif 1247#endif
1312#ifdef CURSOR_BLINK 1248#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink) 1249 if (Options & Opt_cursorBlink)
1314 R->blink_ev.start (NOW + BLINK_INTERVAL); 1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif 1251#endif
1316 }
1317 break;
1318 1252
1253 }
1254 break;
1255
1319 case FocusOut: 1256 case FocusOut:
1320 if (R->TermWin.focus) { 1257 if (TermWin.focus)
1321 R->TermWin.focus = 0; 1258 {
1322 R->want_refresh = 1; 1259 TermWin.focus = 0;
1260 want_refresh = 1;
1323#ifdef USE_XIM 1261#ifdef USE_XIM
1324 if (R->Input_Context != NULL) 1262 if (Input_Context != NULL)
1325 XUnsetICFocus(R->Input_Context); 1263 XUnsetICFocus (Input_Context);
1326#endif 1264#endif
1327#ifdef CURSOR_BLINK 1265#ifdef CURSOR_BLINK
1328 if (R->Options & Opt_cursorBlink) 1266 if (Options & Opt_cursorBlink)
1329 R->blink_ev.stop (); 1267 cursor_blink_ev.stop ();
1330 R->hidden_cursor = 0; 1268 hidden_cursor = 0;
1331#endif 1269#endif
1332 }
1333 break;
1334 1270
1271 }
1272 break;
1273
1335 case ConfigureNotify: 1274 case ConfigureNotify:
1336 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1275 if (ev.xconfigure.window == TermWin.parent[0])
1337 int height, width; 1276 {
1277 int height, width;
1338 1278
1279 do
1339 do { /* Wrap lots of configures into one */ 1280 { /* Wrap lots of configures into one */
1340 width = ev->xconfigure.width; 1281 width = ev.xconfigure.width;
1341 height = ev->xconfigure.height; 1282 height = ev.xconfigure.height;
1342 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1343 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1284 }
1344 ConfigureNotify, ev)); 1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286
1345 if (R->szHint.width != width || R->szHint.height != height) { 1287 if (szHint.width != width || szHint.height != height)
1288 {
1346 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1347 rxvt_resize_all_windows(aR_ (unsigned int)width, 1290 resize_all_windows (width, height, 1);
1348 (unsigned int)height, 1); 1291 }
1349 }
1350#ifdef DEBUG_SIZE 1292#ifdef DEBUG_SIZE
1351 else { 1293 else
1294 {
1352 D_SIZE((stderr, "Size: Not resizing")); 1295 D_SIZE ((stderr, "Size: Not resizing"));
1353 } 1296 }
1354#endif 1297#endif
1355#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1356 if (R->Options & Opt_transparent) { 1299 if (Options & Opt_transparent)
1357 rxvt_check_our_parents(aR); 1300 {
1358 if (R->am_transparent) 1301 check_our_parents ();
1359 R->want_full_refresh = 1; 1302 if (am_transparent)
1360 } 1303 want_full_refresh = 1;
1304 }
1361#endif 1305#endif
1362 }
1363 break;
1364 1306
1307 }
1308 break;
1309
1365 case SelectionClear: 1310 case SelectionClear:
1366 rxvt_selection_clear(aR); 1311 display->set_selection_owner (0);
1367 break; 1312 break;
1368 1313
1369 case SelectionNotify: 1314 case SelectionNotify:
1370 if (R->selection_wait == Sel_normal) 1315 if (selection_wait == Sel_normal)
1371 rxvt_selection_paste(aR_ ev->xselection.requestor, 1316 selection_paste (ev.xselection.requestor,
1372 ev->xselection.property, True); 1317 ev.xselection.property, True);
1373 break; 1318 break;
1374 1319
1375 case SelectionRequest: 1320 case SelectionRequest:
1376 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1321 selection_send (ev.xselectionrequest);
1377 break; 1322 break;
1378 1323
1379 case UnmapNotify: 1324 case UnmapNotify:
1380 R->TermWin.mapped = 0; 1325 TermWin.mapped = 0;
1381 break; 1326#ifdef TEXT_BLINK
1327 text_blink_ev.stop ();
1328#endif
1329 break;
1382 1330
1383 case MapNotify: 1331 case MapNotify:
1384 R->TermWin.mapped = 1; 1332 TermWin.mapped = 1;
1385 break; 1333#ifdef TEXT_BLINK
1386 1334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1387 case PropertyNotify: 1335#endif
1388 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1389 if (ev->xproperty.state == PropertyNewValue)
1390 rxvt_selection_property(aR_ ev->xproperty.window,
1391 ev->xproperty.atom);
1392 break; 1336 break;
1393 } 1337
1394#ifdef TRANSPARENT 1338#ifdef TRANSPARENT
1395 /*
1396 * if user used some Esetroot compatible prog to set the root bg,
1397 * use the property to determine the pixmap. We use it later on.
1398 */
1399 if (R->xa[XA_XROOTPMAPID] == 0)
1400 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1401 "_XROOTPMAP_ID", False);
1402 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1403 break;
1404 /* FALLTHROUGH */
1405 case ReparentNotify: 1339 case ReparentNotify:
1406 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1340 rootwin_cb (ev);
1407 if (R->am_transparent) 1341 break;
1408 R->want_full_refresh = 1;
1409 }
1410#endif /* TRANSPARENT */ 1342#endif /* TRANSPARENT */
1411 break;
1412 1343
1413 case GraphicsExpose: 1344 case GraphicsExpose:
1414 case Expose: 1345 case Expose:
1415 if (ev->xany.window == R->TermWin.vt) { 1346 if (ev.xany.window == TermWin.vt)
1347 {
1416#ifdef NO_SLOW_LINK_SUPPORT 1348#ifdef NO_SLOW_LINK_SUPPORT
1417 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1349 scr_expose (ev.xexpose.x, ev.xexpose.y,
1418 ev->xexpose.width, ev->xexpose.height, False); 1350 ev.xexpose.width, ev.xexpose.height, False);
1419#else 1351#else
1420 // don't understand this, so commented it out 1352 // don't understand this, so commented it out
1421 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1353 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev->xexpose.width, ev->xexpose.height, False); 1354 ev.xexpose.width, ev.xexpose.height, False);
1423 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1355 //scr_expose (ev.xexpose.x, 0,
1424 // ev->xexpose.width, R->TermWin.height, False); 1356 // ev.xexpose.width, TermWin.height, False);
1425#endif 1357#endif
1426 R->want_refresh = 1; 1358 want_refresh = 1;
1427 } else { 1359 }
1428 XEvent unused_xevent; 1360 else
1361 {
1362 XEvent unused_event;
1429 1363
1430 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1431 Expose, 1365 Expose,
1432 &unused_xevent)) ; 1366 &unused_event)) ;
1433 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1434 GraphicsExpose, 1368 GraphicsExpose,
1435 &unused_xevent)) ; 1369 &unused_event)) ;
1436 if (isScrollbarWindow(ev->xany.window)) { 1370 if (isScrollbarWindow (ev.xany.window))
1437 scrollbar_setIdle(); 1371 {
1438 rxvt_scrollbar_show(aR_ 0); 1372 scrollBar.setIdle ();
1439 } 1373 scrollbar_show (0);
1374 }
1440#ifdef MENUBAR 1375#ifdef MENUBAR
1441 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1442 rxvt_menubar_expose(aR); 1377 menubar_expose ();
1443#endif 1378#endif
1444#ifdef RXVT_GRAPHICS 1379 }
1445 rxvt_Gr_expose(aR_ ev->xany.window); 1380 break;
1446#endif
1447 }
1448 break;
1449 1381
1450 case MotionNotify: 1382 case MotionNotify:
1451#ifdef POINTER_BLANK 1383#ifdef POINTER_BLANK
1452 if (R->hidden_pointer) 1384 if (hidden_pointer)
1453 R->pointer_unblank (); 1385 pointer_unblank ();
1454#endif 1386#endif
1455#if MENUBAR 1387#if MENUBAR
1456 if (isMenuBarWindow(ev->xany.window)) { 1388 if (isMenuBarWindow (ev.xany.window))
1457 rxvt_menubar_control(aR_ &(ev->xbutton)); 1389 {
1458 break; 1390 menubar_control (ev.xbutton);
1459 } 1391 break;
1392 }
1460#endif 1393#endif
1461 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1462 break; 1395 break;
1463 1396
1464 if (ev->xany.window == R->TermWin.vt) { 1397 if (ev.xany.window == TermWin.vt)
1398 {
1465 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1466 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1400 {
1467 MotionNotify, ev)) ; 1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1468 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1402 ;
1469 &unused_root, &unused_child, 1403
1470 &unused_root_x, &unused_root_y, 1404 XQueryPointer (display->display, TermWin.vt,
1471 &(ev->xbutton.x), &(ev->xbutton.y), 1405 &unused_root, &unused_child,
1472 &unused_mask); 1406 &unused_root_x, &unused_root_y,
1407 & (ev.xbutton.x), & (ev.xbutton.y),
1408 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1409#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1410 /* deal with a `jumpy' mouse */
1475 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1412 {
1476#endif 1413#endif
1477 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1478 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1415 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1479#ifdef SELECTION_SCROLLING 1416#ifdef SELECTION_SCROLLING
1480 if (ev->xbutton.y<R->TermWin.int_bwidth || 1417 if (ev.xbutton.y < TermWin.int_bwidth
1481 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1482 int dist; 1419 {
1483 1420 int dist;
1484 R->pending_scroll_selection=1; 1421
1485 1422 pending_scroll_selection=1;
1423
1486 /* don't clobber the current delay if we are 1424 /* don't clobber the current delay if we are
1487 * already in the middle of scrolling. 1425 * already in the middle of scrolling.
1488 */ 1426 */
1489 if (R->scroll_selection_delay<=0) 1427 if (scroll_selection_delay<=0)
1490 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1491 1429
1492 /* save the event params so we can highlight 1430 /* save the event params so we can highlight
1493 * the selection in the pending-scroll loop 1431 * the selection in the pending-scroll loop
1494 */ 1432 */
1495 R->selection_save_x=ev->xbutton.x; 1433 selection_save_x=ev.xbutton.x;
1496 R->selection_save_y=ev->xbutton.y; 1434 selection_save_y=ev.xbutton.y;
1497 R->selection_save_state= 1435 selection_save_state=
1498 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1436 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1499 1437
1500 /* calc number of lines to scroll */ 1438 /* calc number of lines to scroll */
1501 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1439 if (ev.xbutton.y<TermWin.int_bwidth)
1502 R->scroll_selection_dir = UP; 1440 {
1503 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1441 scroll_selection_dir = UP;
1504 } 1442 dist = TermWin.int_bwidth - ev.xbutton.y;
1505 else { 1443 }
1506 R->scroll_selection_dir = DN; 1444 else
1507 dist = ev->xbutton.y - 1445 {
1508 (R->TermWin.int_bwidth + R->TermWin.height); 1446 scroll_selection_dir = DN;
1509 } 1447 dist = ev.xbutton.y -
1510 R->scroll_selection_lines=(Pixel2Height(dist)/ 1448 (TermWin.int_bwidth + TermWin.height);
1511 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1449 }
1512 MIN_IT(R->scroll_selection_lines, 1450 scroll_selection_lines= (Pixel2Height (dist)/
1513 SELECTION_SCROLL_MAX_LINES); 1451 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1514 } 1452 MIN_IT (scroll_selection_lines,
1515 else { 1453 SELECTION_SCROLL_MAX_LINES);
1454 }
1455 else
1456 {
1516 /* we are within the text window, so we 1457 /* we are within the text window, so we
1517 * shouldn't be scrolling 1458 * shouldn't be scrolling
1518 */ 1459 */
1519 R->pending_scroll_selection = 0; 1460 pending_scroll_selection = 0;
1520 } 1461 }
1521#endif 1462#endif
1522#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1523 } 1464
1465 }
1524#endif 1466#endif
1467
1468 }
1469 }
1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1471 {
1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1473 MotionNotify, &ev)) ;
1474 XQueryPointer (display->display, scrollBar.win,
1475 &unused_root, &unused_child,
1476 &unused_root_x, &unused_root_y,
1477 & (ev.xbutton.x), & (ev.xbutton.y),
1478 &unused_mask);
1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1480 scrollbar_size ());
1481 scr_refresh (refresh_type);
1482 refresh_limit = 0;
1483 scrollbar_show (1);
1484 }
1485 break;
1525 } 1486 }
1526 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1527 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1528 MotionNotify, ev)) ;
1529 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1530 &unused_root, &unused_child,
1531 &unused_root_x, &unused_root_y,
1532 &(ev->xbutton.x), &(ev->xbutton.y),
1533 &unused_mask);
1534 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1535 scrollbar_size());
1536 rxvt_scr_refresh(aR_ R->refresh_type);
1537 R->refresh_limit = 0;
1538 rxvt_scrollbar_show(aR_ 1);
1539 }
1540 break;
1541 }
1542} 1487}
1543 1488
1544/* INTPROTO */
1545void 1489void
1546rxvt_button_press(pR_ XButtonEvent *ev) 1490rxvt_term::rootwin_cb (XEvent &ev)
1547{ 1491{
1548 int reportmode = 0, clickintime; 1492 SET_R (this);
1493 SET_LOCALE (locale);
1549 1494
1550 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1495 switch (ev.type)
1551 if (!R->bypass_keystate)
1552 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1553/*
1554 * VT window processing of button press
1555 */
1556 if (ev->window == R->TermWin.vt)
1557 { 1496 {
1558#if RXVT_GRAPHICS 1497 case PropertyNotify:
1559 if (ev->subwindow != None) 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1560 rxvt_Gr_ButtonPress(ev->x, ev->y);
1561 else
1562#endif
1563 { 1499 {
1500 if (ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 break;
1503 }
1504#ifdef TRANSPARENT
1505 else
1506 {
1507 /*
1508 * if user used some Esetroot compatible prog to set the root bg,
1509 * use the property to determine the pixmap. We use it later on.
1510 */
1511 if (xa[XA_XROOTPMAPID] == 0)
1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1513
1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1515 return;
1516 }
1517
1518 /* FALLTHROUGH */
1519 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ())
1521 if (am_transparent)
1522 want_full_refresh = 1;
1523 break;
1524#endif
1525 }
1526}
1527
1528void
1529rxvt_term::button_press (XButtonEvent &ev)
1530{
1531 int reportmode = 0, clickintime;
1532
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1534 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1536 /*
1537 * VT window processing of button press
1538 */
1539 if (ev.window == TermWin.vt)
1540 {
1564 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1565 if (reportmode) 1542 if (reportmode)
1566 { 1543 {
1567 /* mouse report from vt window */ 1544 /* mouse report from vt window */
1568 /* save the xbutton state (for ButtonRelease) */ 1545 /* save the xbutton state (for ButtonRelease) */
1569 R->MEvent.state = ev->state; 1546 MEvent.state = ev.state;
1570#ifdef MOUSE_REPORT_DOUBLECLICK 1547#ifdef MOUSE_REPORT_DOUBLECLICK
1571 if (ev->button == R->MEvent.button && clickintime) 1548 if (ev.button == MEvent.button && clickintime)
1549 {
1550 /* same button, within alloted time */
1551 MEvent.clicks++;
1552 if (MEvent.clicks > 1)
1553 {
1554 /* only report double clicks */
1555 MEvent.clicks = 2;
1556 mouse_report (ev);
1557
1558 /* don't report the release */
1559 MEvent.clicks = 0;
1560 MEvent.button = AnyButton;
1561 }
1562 }
1563 else
1564 {
1565 /* different button, or time expired */
1566 MEvent.clicks = 1;
1567 MEvent.button = ev.button;
1568 mouse_report (ev);
1569 }
1570#else
1571 MEvent.button = ev.button;
1572 mouse_report (ev);
1573#endif /* MOUSE_REPORT_DOUBLECLICK */
1574
1575 }
1576 else
1577 {
1578 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0;
1580 switch (ev.button)
1581 {
1582 case Button1:
1583 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1572 { 1585 {
1573 /* same button, within alloted time */ 1586 if (MEvent.button == Button1 && clickintime)
1574 R->MEvent.clicks++; 1587 selection_rotate (ev.x, ev.y);
1575 if (R->MEvent.clicks > 1) 1588 else
1589 selection_extend (ev.x, ev.y, 1);
1576 { 1590 }
1577 /* only report double clicks */
1578 R->MEvent.clicks = 2;
1579 rxvt_mouse_report(aR_ ev);
1580
1581 /* don't report the release */
1582 R->MEvent.clicks = 0;
1583 R->MEvent.button = AnyButton;
1584 }
1585 }
1586 else 1591 else
1587 { 1592 {
1588 /* different button, or time expired */ 1593 if (MEvent.button == Button1 && clickintime)
1589 R->MEvent.clicks = 1; 1594 MEvent.clicks++;
1590 R->MEvent.button = ev->button; 1595 else
1591 rxvt_mouse_report(aR_ ev); 1596 MEvent.clicks = 1;
1592 } 1597
1598 selection_click (MEvent.clicks, ev.x, ev.y);
1599 }
1600
1601 MEvent.button = Button1;
1602 break;
1603
1604 case Button3:
1605 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y);
1607 else
1608 selection_extend (ev.x, ev.y, 1);
1609 MEvent.button = Button3;
1610 break;
1611 }
1612 }
1613 MEvent.time = ev.time;
1614 return;
1615 }
1616
1617 /*
1618 * Scrollbar window processing of button press
1619 */
1620 if (isScrollbarWindow (ev.window))
1621 {
1622 scrollBar.setIdle ();
1623 /*
1624 * Rxvt-style scrollbar:
1625 * move up if mouse is above slider
1626 * move dn if mouse is below slider
1627 *
1628 * XTerm-style scrollbar:
1629 * Move display proportional to pointer location
1630 * pointer near top -> scroll one line
1631 * pointer near bot -> scroll full page
1632 */
1633#ifndef NO_SCROLLBAR_REPORT
1634 if (reportmode)
1635 {
1636 /*
1637 * Mouse report disabled scrollbar:
1638 * arrow buttons - send up/down
1639 * click on scrollbar - send pageup/down
1640 */
1641 if ((scrollBar.style == R_SB_NEXT
1642 && scrollbarnext_upButton (ev.y))
1643 || (scrollBar.style == R_SB_RXVT
1644 && scrollbarrxvt_upButton (ev.y)))
1645 tt_printf ("\033[A");
1646 else if ((scrollBar.style == R_SB_NEXT
1647 && scrollbarnext_dnButton (ev.y))
1648 || (scrollBar.style == R_SB_RXVT
1649 && scrollbarrxvt_dnButton (ev.y)))
1650 tt_printf ("\033[B");
1651 else
1652 switch (ev.button)
1653 {
1654 case Button2:
1655 tt_printf ("\014");
1656 break;
1657 case Button1:
1658 tt_printf ("\033[6~");
1659 break;
1660 case Button3:
1661 tt_printf ("\033[5~");
1662 break;
1663 }
1664 }
1665 else
1666#endif /* NO_SCROLLBAR_REPORT */
1667
1668 {
1669 char upordown = 0;
1670
1671 if (scrollBar.style == R_SB_NEXT)
1672 {
1673 if (scrollbarnext_upButton (ev.y))
1674 upordown = -1; /* up */
1675 else if (scrollbarnext_dnButton (ev.y))
1676 upordown = 1; /* down */
1677 }
1678 else if (scrollBar.style == R_SB_RXVT)
1679 {
1680 if (scrollbarrxvt_upButton (ev.y))
1681 upordown = -1; /* up */
1682 else if (scrollbarrxvt_dnButton (ev.y))
1683 upordown = 1; /* down */
1684 }
1685 if (upordown)
1686 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1689#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 }
1698 else
1699 switch (ev.button)
1700 {
1701 case Button2:
1702 switch (scrollbar_align)
1703 {
1704 case R_SB_ALIGN_TOP:
1705 csrO = 0;
1706 break;
1707 case R_SB_ALIGN_CENTRE:
1708 csrO = (scrollBar.bot - scrollBar.top) / 2;
1709 break;
1710 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top;
1712 break;
1713 }
1714 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO,
1718 scrollbar_size ());
1719 scrollBar.setMotion ();
1720 break;
1721
1722 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1724 csrO = ev.y - scrollBar.top;
1725 /* FALLTHROUGH */
1726
1727 case Button3:
1728 if (scrollBar.style != R_SB_XTERM)
1729 {
1730 if (scrollbar_above_slider (ev.y))
1731# ifdef RXVT_SCROLL_FULL
1732 scr_page (UP, TermWin.nrow - 1);
1593#else 1733# else
1594 R->MEvent.button = ev->button; 1734 scr_page (UP, TermWin.nrow / 4);
1595 rxvt_mouse_report(aR_ ev); 1735# endif
1736 else if (scrollbar_below_slider (ev.y))
1737# ifdef RXVT_SCROLL_FULL
1738 scr_page (DN, TermWin.nrow - 1);
1739# else
1740 scr_page (DN, TermWin.nrow / 4);
1741# endif
1742 else
1743 scrollBar.setMotion ();
1744 }
1745 else
1746 {
1747 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow
1749 * scrollbar_position (ev.y)
1750 / scrollbar_size ()));
1751 }
1752 break;
1753 }
1754 }
1755 return;
1756 }
1757#if MENUBAR
1758 /*
1759 * Menubar window processing of button press
1760 */
1761 if (isMenuBarWindow (ev.window))
1762 menubar_control (ev);
1763#endif
1764}
1765
1766void
1767rxvt_term::button_release (XButtonEvent &ev)
1768{
1769 int reportmode = 0;
1770
1771 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1774
1775 if (scrollbar_isUpDn ())
1776 {
1777 scrollBar.setIdle ();
1778 scrollbar_show (0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 refresh_type &= ~SMOOTH_REFRESH;
1781#endif
1782
1783 }
1784#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0;
1786#endif
1787 if (ev.window == TermWin.vt)
1788 {
1789 if (reportmode)
1790 {
1791 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4)
1794 return;
1795#ifdef MOUSE_REPORT_DOUBLECLICK
1796 /* only report the release of 'slow' single clicks */
1797 if (MEvent.button != AnyButton
1798 && (ev.button != MEvent.button
1799 || (ev.time - MEvent.time
1800 > MULTICLICK_TIME / 2)))
1801 {
1802 MEvent.clicks = 0;
1803 MEvent.button = AnyButton;
1804 mouse_report (ev);
1805 }
1806#else /* MOUSE_REPORT_DOUBLECLICK */
1807 MEvent.button = AnyButton;
1808 mouse_report (ev);
1596#endif /* MOUSE_REPORT_DOUBLECLICK */ 1809#endif /* MOUSE_REPORT_DOUBLECLICK */
1597 }
1598 else
1599 {
1600 if (ev->button != R->MEvent.button)
1601 R->MEvent.clicks = 0;
1602 switch (ev->button)
1603 {
1604 case Button1:
1605 if (R->MEvent.button == Button1 && clickintime)
1606 R->MEvent.clicks++;
1607 else
1608 R->MEvent.clicks = 1;
1609 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1610 R->MEvent.button = Button1;
1611 break;
1612
1613 case Button3:
1614 if (R->MEvent.button == Button3 && clickintime)
1615 rxvt_selection_rotate(aR_ ev->x, ev->y);
1616 else
1617 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1618 R->MEvent.button = Button3;
1619 break;
1620 }
1621 }
1622 R->MEvent.time = ev->time;
1623 return; 1810 return;
1624 }
1625 } 1811 }
1626
1627/*
1628 * Scrollbar window processing of button press
1629 */
1630 if (isScrollbarWindow(ev->window))
1631 {
1632 scrollbar_setIdle();
1633 /*
1634 * Rxvt-style scrollbar:
1635 * move up if mouse is above slider
1636 * move dn if mouse is below slider
1637 *
1638 * XTerm-style scrollbar:
1639 * Move display proportional to pointer location
1640 * pointer near top -> scroll one line
1641 * pointer near bot -> scroll full page
1642 */
1643#ifndef NO_SCROLLBAR_REPORT
1644 if (reportmode) {
1645 /*
1646 * Mouse report disabled scrollbar:
1647 * arrow buttons - send up/down
1648 * click on scrollbar - send pageup/down
1649 */
1650 if ((R->scrollBar.style == R_SB_NEXT
1651 && scrollbarnext_upButton(ev->y))
1652 || (R->scrollBar.style == R_SB_RXVT
1653 && scrollbarrxvt_upButton(ev->y)))
1654 R->tt_printf("\033[A");
1655 else if ((R->scrollBar.style == R_SB_NEXT
1656 && scrollbarnext_dnButton(ev->y))
1657 || (R->scrollBar.style == R_SB_RXVT
1658 && scrollbarrxvt_dnButton(ev->y)))
1659 R->tt_printf("\033[B");
1660 else
1661 switch (ev->button) {
1662 case Button2:
1663 R->tt_printf("\014");
1664 break;
1665 case Button1:
1666 R->tt_printf("\033[6~");
1667 break;
1668 case Button3:
1669 R->tt_printf("\033[5~");
1670 break;
1671 }
1672 }
1673 else
1674#endif /* NO_SCROLLBAR_REPORT */
1675 {
1676 char upordown = 0;
1677
1678 if (R->scrollBar.style == R_SB_NEXT) {
1679 if (scrollbarnext_upButton(ev->y))
1680 upordown = -1; /* up */
1681 else if (scrollbarnext_dnButton(ev->y))
1682 upordown = 1; /* down */
1683 } else if (R->scrollBar.style == R_SB_RXVT) {
1684 if (scrollbarrxvt_upButton(ev->y))
1685 upordown = -1; /* up */
1686 else if (scrollbarrxvt_dnButton(ev->y))
1687 upordown = 1; /* down */
1688 }
1689 if (upordown) {
1690#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1691 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1692#endif
1693 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1694 if (upordown < 0)
1695 scrollbar_setUp();
1696 else
1697 scrollbar_setDn();
1698 }
1699 } else
1700 switch (ev->button) {
1701 case Button2:
1702 switch (R->scrollbar_align) {
1703 case R_SB_ALIGN_TOP:
1704 R->csrO = 0;
1705 break;
1706 case R_SB_ALIGN_CENTRE:
1707 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1708 break;
1709 case R_SB_ALIGN_BOTTOM:
1710 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1711 break;
1712 }
1713 if (R->scrollBar.style == R_SB_XTERM
1714 || scrollbar_above_slider(ev->y)
1715 || scrollbar_below_slider(ev->y))
1716 rxvt_scr_move_to(aR_
1717 scrollbar_position(ev->y) - R->csrO,
1718 scrollbar_size());
1719 scrollbar_setMotion();
1720 break;
1721
1722 case Button1:
1723 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1724 R->csrO = ev->y - R->scrollBar.top;
1725 /* FALLTHROUGH */
1726
1727 case Button3:
1728 if (R->scrollBar.style != R_SB_XTERM) {
1729 if (scrollbar_above_slider(ev->y))
1730# ifdef RXVT_SCROLL_FULL
1731 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1732# else
1733 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1734# endif
1735 else if (scrollbar_below_slider(ev->y))
1736# ifdef RXVT_SCROLL_FULL
1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1738# else
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1740# endif
1741 else
1742 scrollbar_setMotion();
1743 } else {
1744 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1745 (R->TermWin.nrow
1746 * scrollbar_position(ev->y)
1747 / scrollbar_size()));
1748 }
1749 break;
1750 }
1751 }
1752 return;
1753 }
1754#if MENUBAR
1755 /* 1812 /*
1756 * Menubar window processing of button press
1757 */
1758 if (isMenuBarWindow(ev->window))
1759 rxvt_menubar_control(aR_ ev);
1760#endif
1761}
1762
1763/* INTPROTO */
1764void
1765rxvt_button_release(pR_ XButtonEvent *ev)
1766{
1767 int reportmode = 0;
1768
1769 R->csrO = 0; /* reset csr Offset */
1770 if (!R->bypass_keystate)
1771 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1772
1773 if (scrollbar_isUpDn()) {
1774 scrollbar_setIdle();
1775 rxvt_scrollbar_show(aR_ 0);
1776#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1777 R->refresh_type &= ~SMOOTH_REFRESH;
1778#endif
1779 }
1780#ifdef SELECTION_SCROLLING
1781 R->pending_scroll_selection=0;
1782#endif
1783 if (ev->window == R->TermWin.vt)
1784 {
1785#ifdef RXVT_GRAPHICS
1786 if (ev->subwindow != None)
1787 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1788 else
1789#endif
1790 {
1791 if (reportmode)
1792 {
1793 /* mouse report from vt window */
1794 /* don't report release of wheel "buttons" */
1795 if (ev->button >= 4)
1796 return;
1797#ifdef MOUSE_REPORT_DOUBLECLICK
1798 /* only report the release of 'slow' single clicks */
1799 if (R->MEvent.button != AnyButton
1800 && (ev->button != R->MEvent.button
1801 || (ev->time - R->MEvent.time
1802 > MULTICLICK_TIME / 2)))
1803 {
1804 R->MEvent.clicks = 0;
1805 R->MEvent.button = AnyButton;
1806 rxvt_mouse_report(aR_ ev);
1807 }
1808#else /* MOUSE_REPORT_DOUBLECLICK */
1809 R->MEvent.button = AnyButton;
1810 rxvt_mouse_report(aR_ ev);
1811#endif /* MOUSE_REPORT_DOUBLECLICK */
1812 return;
1813 }
1814 /*
1815 * dumb hack to compensate for the failure of click-and-drag 1813 * dumb hack to compensate for the failure of click-and-drag
1816 * when overriding mouse reporting 1814 * when overriding mouse reporting
1817 */ 1815 */
1818 if (R->PrivateModes & PrivMode_mouse_report 1816 if (PrivateModes & PrivMode_mouse_report
1819 && R->bypass_keystate 1817 && bypass_keystate
1820 && ev->button == Button1 && R->MEvent.clicks <= 1) 1818 && ev.button == Button1 && MEvent.clicks <= 1)
1821 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1819 selection_extend (ev.x, ev.y, 0);
1822 1820
1823 switch (ev->button) { 1821 switch (ev.button)
1822 {
1824 case Button1: 1823 case Button1:
1825 case Button3: 1824 case Button3:
1826 rxvt_selection_make(aR_ ev->time); 1825 selection_make (ev.time);
1827 break; 1826 break;
1828 case Button2: 1827 case Button2:
1829 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1828 selection_request (ev.time, ev.x, ev.y);
1830 break; 1829 break;
1831#ifdef MOUSE_WHEEL 1830#ifdef MOUSE_WHEEL
1832 case Button4: 1831 case Button4:
1833 case Button5: 1832 case Button5:
1834 { 1833 {
1835 int i, v; 1834 int i;
1835 page_dirn v;
1836 1836
1837 v = (ev->button == Button4) ? UP : DN; 1837 v = (ev.button == Button4) ? UP : DN;
1838 if (ev->state & ShiftMask) 1838 if (ev.state & ShiftMask)
1839 i = 1; 1839 i = 1;
1840 else if ((R->Options & Opt_mouseWheelScrollPage)) 1840 else if ((Options & Opt_mouseWheelScrollPage))
1841 i = R->TermWin.nrow - 1; 1841 i = TermWin.nrow - 1;
1842 else 1842 else
1843 i = 5; 1843 i = 5;
1844# ifdef MOUSE_SLIP_WHEELING 1844# ifdef MOUSE_SLIP_WHEELING
1845 if (ev->state & ControlMask) 1845 if (ev.state & ControlMask)
1846 { 1846 {
1847 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1847 mouse_slip_wheel_speed += (v ? -1 : 1);
1848 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1849 } 1849 }
1850# endif 1850# endif
1851# ifdef JUMP_MOUSE_WHEEL 1851# ifdef JUMP_MOUSE_WHEEL
1852 rxvt_scr_page(aR_ v, i); 1852 scr_page (v, i);
1853 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1853 scr_refresh (SMOOTH_REFRESH);
1854 rxvt_scrollbar_show(aR_ 1); 1854 scrollbar_show (1);
1855# else 1855# else
1856 for (; i--;) 1856 while (i--)
1857 { 1857 {
1858 rxvt_scr_page(aR_ v, 1); 1858 scr_page (v, 1);
1859 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1859 scr_refresh (SMOOTH_REFRESH);
1860 rxvt_scrollbar_show(aR_ 1); 1860 scrollbar_show (1);
1861 } 1861 }
1862# endif 1862# endif
1863 } 1863
1864 break; 1864 }
1865 break;
1865#endif 1866#endif
1866 } 1867
1867 }
1868 } 1868 }
1869 }
1869#ifdef MENUBAR 1870#ifdef MENUBAR
1870 else if (isMenuBarWindow(ev->window)) 1871 else if (isMenuBarWindow (ev.window))
1871 rxvt_menubar_control(aR_ ev); 1872 menubar_control (ev);
1872#endif 1873#endif
1873} 1874}
1874 1875
1875 1876
1876#ifdef TRANSPARENT 1877#ifdef TRANSPARENT
1877/* 1878/*
1878 * Check our parents are still who we think they are. 1879 * Check our parents are still who we think they are.
1879 * Do transparency updates if required 1880 * Do transparency updates if required
1880 */ 1881 */
1881/* EXTPROTO */
1882int 1882int
1883rxvt_check_our_parents(pR) 1883rxvt_term::check_our_parents ()
1884{ 1884{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 1885 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 1886 unsigned long nitems, bytes_after;
1887 Atom atype; 1887 Atom atype;
1888 unsigned char *prop = NULL; 1888 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 1889 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 1890 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 1891 XWindowAttributes wattr, wrootattr;
1892 1892
1893 pchanged = 0; 1893 pchanged = 0;
1894 1894
1895 if (!(R->Options & Opt_transparent)) 1895 if (! (Options & Opt_transparent))
1896 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1897 1897
1898 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1898 XGetWindowAttributes (display->display, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 1899 rootdepth = wrootattr.depth;
1900 1900
1901 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1902 if (rootdepth != wattr.depth) { 1902 if (rootdepth != wattr.depth)
1903 {
1903 if (R->am_transparent) { 1904 if (am_transparent)
1905 {
1904 pchanged = 1; 1906 pchanged = 1;
1905 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1907 XSetWindowBackground (display->display, TermWin.vt,
1906 R->PixColors[Color_bg]); 1908 PixColors[Color_bg]);
1907 R->am_transparent = R->am_pixmap_trans = 0; 1909 am_transparent = am_pixmap_trans = 0;
1908 } 1910 }
1909 return pchanged; /* Don't try any more */ 1911 return pchanged; /* Don't try any more */
1910 } 1912 }
1911 1913
1912/* Get all X ops out of the queue so that our information is up-to-date. */ 1914 /* Get all X ops out of the queue so that our information is up-to-date. */
1913 XSync(R->Xdisplay, False); 1915 XSync (display->display, False);
1914 1916
1915/* 1917 /*
1916 * Make the frame window set by the window manager have 1918 * Make the frame window set by the window manager have
1917 * the root background. Some window managers put multiple nested frame 1919 * the root background. Some window managers put multiple nested frame
1918 * windows for each client, so we have to take care about that. 1920 * windows for each client, so we have to take care about that.
1919 */ 1921 */
1920 i = (R->xa[XA_XROOTPMAPID] != 0 1922 i = (xa[XA_XROOTPMAPID] != 0
1921 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1922 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1923 &nitems, &bytes_after, &prop) == Success)); 1925 &nitems, &bytes_after, &prop) == Success));
1924 if (!i || prop == NULL) 1926 if (!i || prop == NULL)
1925 have_pixmap = 0; 1927 have_pixmap = 0;
1926 else { 1928 else
1929 {
1927 have_pixmap = 1; 1930 have_pixmap = 1;
1928 rootpixmap = *((Pixmap *)prop); 1931 rootpixmap = * ((Pixmap *)prop);
1929 XFree(prop); 1932 XFree (prop);
1930 } 1933 }
1931 if (have_pixmap) { 1934 if (have_pixmap)
1932/* 1935 {
1936 /*
1933 * Copy Xroot pixmap transparency 1937 * Copy display->root pixmap transparency
1934 */ 1938 */
1935 int sx, sy, nx, ny; 1939 int sx, sy, nx, ny;
1936 unsigned int nw, nh; 1940 unsigned int nw, nh;
1937 Window cr; 1941 Window cr;
1938 XImage *image; 1942 XImage *image;
1939 GC gc; 1943 GC gc;
1940 XGCValues gcvalue; 1944 XGCValues gcvalue;
1941 1945
1942 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1943 0, 0, &sx, &sy, &cr); 1947 0, 0, &sx, &sy, &cr);
1944 nw = (unsigned int)R->szHint.width; 1948 nw = (unsigned int)szHint.width;
1945 nh = (unsigned int)R->szHint.height; 1949 nh = (unsigned int)szHint.height;
1946 nx = ny = 0; 1950 nx = ny = 0;
1947 if (sx < 0) { 1951 if (sx < 0)
1952 {
1948 nw += sx; 1953 nw += sx;
1949 nx = -sx; 1954 nx = -sx;
1950 sx = 0; 1955 sx = 0;
1951 } 1956 }
1952 if (sy < 0) { 1957 if (sy < 0)
1958 {
1953 nh += sy; 1959 nh += sy;
1954 ny = -sy; 1960 ny = -sy;
1955 sy = 0; 1961 sy = 0;
1956 } 1962 }
1957 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1958 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1959 R->allowedxerror = -1; 1965 allowedxerror = -1;
1960 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1961 ZPixmap); 1967 ZPixmap);
1962 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1963 /* XXX: may need a delay here? */ 1969 /* XXX: may need a delay here? */
1964 R->allowedxerror = 0; 1970 allowedxerror = 0;
1965 if (image == NULL) { 1971 if (image == NULL)
1972 {
1966 if (R->am_transparent && R->am_pixmap_trans) { 1973 if (am_transparent && am_pixmap_trans)
1967 pchanged = 1; 1974 {
1975 pchanged = 1;
1976 if (TermWin.pixmap != None)
1977 {
1978 XFreePixmap (display->display, TermWin.pixmap);
1979 TermWin.pixmap = None;
1980 }
1981 }
1982 am_pixmap_trans = 0;
1983 }
1984 else
1985 {
1968 if (R->TermWin.pixmap != None) { 1986 if (TermWin.pixmap != None)
1969 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1987 XFreePixmap (display->display, TermWin.pixmap);
1970 R->TermWin.pixmap = None; 1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1971 } 1989 (unsigned int)szHint.width,
1990 (unsigned int)szHint.height,
1991 (unsigned int)image->depth);
1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1994 nx, ny, (unsigned int)image->width,
1995 (unsigned int)image->height);
1996 XFreeGC (display->display, gc);
1997 XDestroyImage (image);
1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1999 TermWin.pixmap);
2000 if (!am_transparent || !am_pixmap_trans)
2001 pchanged = 1;
2002 am_transparent = am_pixmap_trans = 1;
2003 }
1972 } 2004 }
1973 R->am_pixmap_trans = 0;
1974 } else {
1975 if (R->TermWin.pixmap != None)
1976 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1977 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1978 (unsigned int)R->szHint.width,
1979 (unsigned int)R->szHint.height,
1980 (unsigned int)image->depth);
1981 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1982 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1983 nx, ny, (unsigned int)image->width,
1984 (unsigned int)image->height);
1985 XFreeGC(R->Xdisplay, gc);
1986 XDestroyImage(image);
1987 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1988 R->TermWin.pixmap);
1989 if (!R->am_transparent || !R->am_pixmap_trans)
1990 pchanged = 1;
1991 R->am_transparent = R->am_pixmap_trans = 1;
1992 }
1993 }
1994 if (!R->am_pixmap_trans) { 2005 if (!am_pixmap_trans)
2006 {
1995 unsigned int n; 2007 unsigned int n;
1996/* 2008 /*
1997 * InheritPixmap transparency 2009 * InheritPixmap transparency
1998 */ 2010 */
1999 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2000 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2001 i++) { 2013 i++)
2014 {
2002 oldp = R->TermWin.parent[i]; 2015 oldp = TermWin.parent[i];
2003 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2016 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2004 &R->TermWin.parent[i], &list, &n); 2017 &TermWin.parent[i], &list, &n);
2005 XFree(list); 2018 XFree (list);
2006 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2007 if (R->TermWin.parent[i] == Xroot) { 2020 if (TermWin.parent[i] == display->root)
2008 if (oldp != None) 2021 {
2009 pchanged = 1; 2022 if (oldp != None)
2010 break; 2023 pchanged = 1;
2011 } 2024 break;
2025 }
2012 if (oldp != R->TermWin.parent[i]) 2026 if (oldp != TermWin.parent[i])
2013 pchanged = 1; 2027 pchanged = 1;
2014 } 2028 }
2015 n = 0; 2029 n = 0;
2016 if (pchanged) { 2030 if (pchanged)
2031 {
2017 for (; n < (unsigned int)i; n++) { 2032 for (; n < (unsigned int)i; n++)
2033 {
2018 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2019 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2035 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2020 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2036 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2037 {
2021 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2022 break; 2039 break;
2023 } 2040 }
2024 } 2041 }
2025 } 2042 }
2026 if (n > (int)(sizeof(R->TermWin.parent) 2043 if (n > (int) (sizeof (TermWin.parent)
2027 / sizeof(R->TermWin.parent[0]))) { 2044 / sizeof (TermWin.parent[0])))
2045 {
2028 D_X((stderr, "InheritPixmap Turning off")); 2046 D_X ((stderr, "InheritPixmap Turning off"));
2029 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2047 XSetWindowBackground (display->display, TermWin.parent[0],
2030 R->PixColors[Color_fg]); 2048 PixColors[Color_fg]);
2031 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2049 XSetWindowBackground (display->display, TermWin.vt,
2032 R->PixColors[Color_bg]); 2050 PixColors[Color_bg]);
2033 R->am_transparent = 0; 2051 am_transparent = 0;
2034 /* XXX: also turn off Opt_transparent? */ 2052 /* XXX: also turn off Opt_transparent? */
2035 } else { 2053 }
2054 else
2055 {
2036 /* wait (an arbitrary period) for the WM to do its thing 2056 /* wait (an arbitrary period) for the WM to do its thing
2037 * needed for fvwm2.2.2 (and before?) */ 2057 * needed for fvwm2.2.2 (and before?) */
2038# ifdef HAVE_NANOSLEEP 2058# ifdef HAVE_NANOSLEEP
2039 struct timespec rqt; 2059 struct timespec rqt;
2040 2060
2041 rqt.tv_sec = 1; 2061 rqt.tv_sec = 1;
2042 rqt.tv_nsec = 0; 2062 rqt.tv_nsec = 0;
2043 nanosleep(&rqt, NULL); 2063 nanosleep (&rqt, NULL);
2044# else 2064# else
2045 sleep(1); 2065 sleep (1);
2046# endif 2066# endif
2047 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2048 for (n = 0; n < (unsigned int)i; n++) 2068 for (n = 0; n < (unsigned int)i; n++)
2049 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2050 ParentRelative); 2070 ParentRelative);
2051 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2052 ParentRelative); 2072 ParentRelative);
2053 R->am_transparent = 1; 2073 am_transparent = 1;
2054 } 2074 }
2055 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2056 R->TermWin.parent[i] = None; 2076 TermWin.parent[i] = None;
2057 } 2077 }
2058 return pchanged; 2078 return pchanged;
2059} 2079}
2060#endif 2080#endif
2061 2081
2062/*}}} */ 2082/*}}} */
2063 2083
2064/*{{{ print pipe */ 2084/*{{{ print pipe */
2065/*----------------------------------------------------------------------*/ 2085/*----------------------------------------------------------------------*/
2066#ifdef PRINTPIPE 2086#ifdef PRINTPIPE
2067/* EXTPROTO */ 2087FILE *
2068FILE *
2069rxvt_popen_printer(pR) 2088rxvt_term::popen_printer ()
2070{ 2089{
2071 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2090 FILE *stream = popen (rs[Rs_print_pipe], "w");
2072 2091
2073 if (stream == NULL) 2092 if (stream == NULL)
2074 rxvt_print_error("can't open printer pipe"); 2093 rxvt_print_error ("can't open printer pipe");
2075 return stream; 2094 return stream;
2076} 2095}
2077 2096
2078/* EXTPROTO */
2079int 2097int
2080rxvt_pclose_printer (FILE *stream) 2098rxvt_term::pclose_printer (FILE *stream)
2081{ 2099{
2082 fflush (stream); 2100 fflush (stream);
2083/* pclose() reported not to work on SunOS 4.1.3 */ 2101 /* pclose () reported not to work on SunOS 4.1.3 */
2084# if defined (__sun__) /* TODO: RESOLVE THIS */ 2102# if defined (__sun__) /* TODO: RESOLVE THIS */
2085/* pclose works provided SIGCHLD handler uses waitpid */ 2103 /* pclose works provided SIGCHLD handler uses waitpid */
2086 return pclose (stream); /* return fclose (stream); */ 2104 return pclose (stream); /* return fclose (stream); */
2087# else 2105# else
2088 return pclose (stream); 2106 return pclose (stream);
2089# endif 2107# endif
2090} 2108}
2091 2109
2092/* 2110/*
2093 * simulate attached vt100 printer 2111 * simulate attached vt100 printer
2094 */ 2112 */
2095/* INTPROTO */
2096void 2113void
2097rxvt_process_print_pipe(pR) 2114rxvt_term::process_print_pipe ()
2098{ 2115{
2099 int done; 2116 int done;
2100 FILE *fd; 2117 FILE *fd;
2101 2118
2102 if ((fd = rxvt_popen_printer(aR)) == NULL) 2119 if ((fd = popen_printer ()) == NULL)
2103 return; 2120 return;
2104 2121
2105/* 2122 /*
2106 * Send all input to the printer until either ESC[4i or ESC[?4i 2123 * Send all input to the printer until either ESC[4i or ESC[?4i
2107 * is received. 2124 * is received.
2108 */ 2125 */
2109 for (done = 0; !done;) { 2126 for (done = 0; !done;)
2127 {
2110 unsigned char buf[8]; 2128 unsigned char buf[8];
2111 unsigned char ch; 2129 unsigned char ch;
2112 unsigned int i, len; 2130 unsigned int i, len;
2113 2131
2114 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2132 if ((ch = cmd_getc ()) != C0_ESC)
2133 {
2115 if (putc(ch, fd) == EOF) 2134 if (putc (ch, fd) == EOF)
2116 break; /* done = 1 */ 2135 break; /* done = 1 */
2117 } else { 2136 }
2137 else
2138 {
2118 len = 0; 2139 len = 0;
2119 buf[len++] = ch; 2140 buf[len++] = ch;
2120 2141
2121 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2142 if ((buf[len++] = cmd_getc ()) == '[')
2122 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2143 {
2123 buf[len++] = '?'; 2144 if ((ch = cmd_getc ()) == '?')
2124 ch = rxvt_cmd_getc(aR); 2145 {
2125 } 2146 buf[len++] = '?';
2147 ch = cmd_getc ();
2148 }
2126 if ((buf[len++] = ch) == '4') { 2149 if ((buf[len++] = ch) == '4')
2150 {
2127 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2151 if ((buf[len++] = cmd_getc ()) == 'i')
2128 break; /* done = 1 */ 2152 break; /* done = 1 */
2129 } 2153 }
2154 }
2155 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF)
2157 {
2158 done = 1;
2159 break;
2160 }
2161 }
2130 } 2162 }
2131 for (i = 0; i < len; i++)
2132 if (putc(buf[i], fd) == EOF) {
2133 done = 1;
2134 break;
2135 }
2136 }
2137 }
2138 rxvt_pclose_printer(fd); 2163 pclose_printer (fd);
2139} 2164}
2140#endif /* PRINTPIPE */ 2165#endif /* PRINTPIPE */
2141/*}}} */ 2166/*}}} */
2142 2167
2143/* *INDENT-OFF* */ 2168/* *INDENT-OFF* */
2144enum { 2169enum {
2145 C1_40 = 0x40, 2170 C1_40 = 0x40,
2146 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2147 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2172 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2148 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2173 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2149 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2174 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2150}; 2175};
2151/* *INDENT-ON* */ 2176/* *INDENT-ON* */
2152 2177
2153/*{{{ process non-printing single characters */ 2178/*{{{ process non-printing single characters */
2154/* INTPROTO */
2155void 2179void
2156rxvt_process_nonprinting(pR_ unsigned char ch) 2180rxvt_term::process_nonprinting (unsigned char ch)
2157{ 2181{
2158 switch (ch) { 2182 switch (ch)
2183 {
2159 case C0_ENQ: /* terminal Status */ 2184 case C0_ENQ: /* terminal Status */
2160 if (R->rs[Rs_answerbackstring]) 2185 if (rs[Rs_answerbackstring])
2161 R->tt_write( 2186 tt_write (
2162 (const unsigned char *)R->rs[Rs_answerbackstring], 2187 (const unsigned char *)rs[Rs_answerbackstring],
2163 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2188 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2164 else 2189 else
2165 R->tt_write((unsigned char *)VT100_ANS, 2190 tt_write ((unsigned char *)VT100_ANS,
2166 (unsigned int)STRLEN(VT100_ANS)); 2191 (unsigned int)STRLEN (VT100_ANS));
2167 break; 2192 break;
2168 case C0_BEL: /* bell */ 2193 case C0_BEL: /* bell */
2169 rxvt_scr_bell(aR); 2194 scr_bell ();
2170 break; 2195 break;
2171 case C0_BS: /* backspace */ 2196 case C0_BS: /* backspace */
2172 rxvt_scr_backspace(aR); 2197 scr_backspace ();
2173 break; 2198 break;
2174 case C0_HT: /* tab */ 2199 case C0_HT: /* tab */
2175 rxvt_scr_tab(aR_ 1); 2200 scr_tab (1);
2176 break; 2201 break;
2177 case C0_CR: /* carriage return */ 2202 case C0_CR: /* carriage return */
2178 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2203 scr_gotorc (0, 0, R_RELATIVE);
2179 break; 2204 break;
2180 case C0_VT: /* vertical tab, form feed */ 2205 case C0_VT: /* vertical tab, form feed */
2181 case C0_FF: 2206 case C0_FF:
2182 case C0_LF: /* line feed */ 2207 case C0_LF: /* line feed */
2183 rxvt_scr_index(aR_ UP); 2208 scr_index (UP);
2184 break; 2209 break;
2185 case C0_SO: /* shift out - acs */ 2210 case C0_SO: /* shift out - acs */
2186 rxvt_scr_charset_choose(aR_ 1); 2211 scr_charset_choose (1);
2187 break; 2212 break;
2188 case C0_SI: /* shift in - acs */ 2213 case C0_SI: /* shift in - acs */
2189 rxvt_scr_charset_choose(aR_ 0); 2214 scr_charset_choose (0);
2190 break; 2215 break;
2191 } 2216 }
2192} 2217}
2193/*}}} */ 2218/*}}} */
2194 2219
2195 2220
2196/*{{{ process VT52 escape sequences */ 2221/*{{{ process VT52 escape sequences */
2197/* INTPROTO */
2198void 2222void
2199rxvt_process_escape_vt52(pR_ unsigned char ch) 2223rxvt_term::process_escape_vt52 (unsigned char ch)
2200{ 2224{
2201 int row, col; 2225 int row, col;
2226
2227 switch (ch)
2202 2228 {
2203 switch (ch) {
2204 case 'A': /* cursor up */ 2229 case 'A': /* cursor up */
2205 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2230 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2206 break; 2231 break;
2207 case 'B': /* cursor down */ 2232 case 'B': /* cursor down */
2208 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2233 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2209 break; 2234 break;
2210 case 'C': /* cursor right */ 2235 case 'C': /* cursor right */
2211 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2236 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2212 break; 2237 break;
2213 case 'D': /* cursor left */ 2238 case 'D': /* cursor left */
2214 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2239 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2215 break; 2240 break;
2216 case 'H': /* cursor home */ 2241 case 'H': /* cursor home */
2217 rxvt_scr_gotorc(aR_ 0, 0, 0); 2242 scr_gotorc (0, 0, 0);
2218 break; 2243 break;
2219 case 'I': /* cursor up and scroll down if needed */ 2244 case 'I': /* cursor up and scroll down if needed */
2220 rxvt_scr_index(aR_ DN); 2245 scr_index (DN);
2221 break; 2246 break;
2222 case 'J': /* erase to end of screen */ 2247 case 'J': /* erase to end of screen */
2223 rxvt_scr_erase_screen(aR_ 0); 2248 scr_erase_screen (0);
2224 break; 2249 break;
2225 case 'K': /* erase to end of line */ 2250 case 'K': /* erase to end of line */
2226 rxvt_scr_erase_line(aR_ 0); 2251 scr_erase_line (0);
2227 break; 2252 break;
2228 case 'Y': /* move to specified row and col */ 2253 case 'Y': /* move to specified row and col */
2229 /* full command is 'ESC Y row col' where row and col 2254 /* full command is 'ESC Y row col' where row and col
2230 * are encoded by adding 32 and sending the ascii 2255 * are encoded by adding 32 and sending the ascii
2231 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2256 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2232 * etc. */ 2257 * etc. */
2233 row = rxvt_cmd_getc(aR) - ' '; 2258 row = cmd_getc () - ' ';
2234 col = rxvt_cmd_getc(aR) - ' '; 2259 col = cmd_getc () - ' ';
2235 rxvt_scr_gotorc(aR_ row, col, 0); 2260 scr_gotorc (row, col, 0);
2236 break; 2261 break;
2237 case 'Z': /* identify the terminal type */ 2262 case 'Z': /* identify the terminal type */
2238 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2263 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2239 break; 2264 break;
2240 case '<': /* turn off VT52 mode */ 2265 case '<': /* turn off VT52 mode */
2241 PrivMode(0, PrivMode_vt52); 2266 PrivMode (0, PrivMode_vt52);
2242 break; 2267 break;
2243 case 'F': /* use special graphics character set */ 2268 case 'F': /* use special graphics character set */
2244 case 'G': /* use regular character set */ 2269 case 'G': /* use regular character set */
2245 /* unimplemented */ 2270 /* unimplemented */
2246 break; 2271 break;
2247 case '=': /* use alternate keypad mode */ 2272 case '=': /* use alternate keypad mode */
2248 case '>': /* use regular keypad mode */ 2273 case '>': /* use regular keypad mode */
2249 /* unimplemented */ 2274 /* unimplemented */
2250 break; 2275 break;
2251 } 2276 }
2252} 2277}
2253/*}}} */ 2278/*}}} */
2254 2279
2255 2280
2256/*{{{ process escape sequences */ 2281/*{{{ process escape sequences */
2257/* INTPROTO */
2258void 2282void
2259rxvt_process_escape_seq(pR) 2283rxvt_term::process_escape_seq ()
2260{ 2284{
2261 unsigned char ch = rxvt_cmd_getc(aR); 2285 unsigned char ch = cmd_getc ();
2262 2286
2263 if (R->PrivateModes & PrivMode_vt52) { 2287 if (PrivateModes & PrivMode_vt52)
2264 rxvt_process_escape_vt52(aR_ ch);
2265 return;
2266 }
2267 2288 {
2289 process_escape_vt52 (ch);
2290 return;
2291 }
2292
2268 switch (ch) { 2293 switch (ch)
2294 {
2269 /* case 1: do_tek_mode (); break; */ 2295 /* case 1: do_tek_mode (); break; */
2270 case '#': 2296 case '#':
2271 if (rxvt_cmd_getc(aR) == '8') 2297 if (cmd_getc () == '8')
2272 rxvt_scr_E(aR); 2298 scr_E ();
2273 break; 2299 break;
2274 case '(': 2300 case '(':
2275 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2301 scr_charset_set (0, (unsigned int)cmd_getc ());
2276 break; 2302 break;
2277 case ')': 2303 case ')':
2278 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2304 scr_charset_set (1, (unsigned int)cmd_getc ());
2279 break; 2305 break;
2280 case '*': 2306 case '*':
2281 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2307 scr_charset_set (2, (unsigned int)cmd_getc ());
2282 break; 2308 break;
2283 case '+': 2309 case '+':
2284 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2310 scr_charset_set (3, (unsigned int)cmd_getc ());
2285 break; 2311 break;
2286#ifdef MULTICHAR_SET
2287 case '$':
2288 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR));
2289 break;
2290#endif
2291#ifndef NO_FRILLS 2312#ifndef NO_FRILLS
2292 case '6': 2313 case '6':
2293 rxvt_scr_backindex(aR); 2314 scr_backindex ();
2294 break; 2315 break;
2295#endif 2316#endif
2296 case '7': 2317 case '7':
2297 rxvt_scr_cursor(aR_ SAVE); 2318 scr_cursor (SAVE);
2298 break; 2319 break;
2299 case '8': 2320 case '8':
2300 rxvt_scr_cursor(aR_ RESTORE); 2321 scr_cursor (RESTORE);
2301 break; 2322 break;
2302#ifndef NO_FRILLS 2323#ifndef NO_FRILLS
2303 case '9': 2324 case '9':
2304 rxvt_scr_forwardindex(aR); 2325 scr_forwardindex ();
2305 break; 2326 break;
2306#endif 2327#endif
2307 case '=': 2328 case '=':
2308 case '>': 2329 case '>':
2309 PrivMode((ch == '='), PrivMode_aplKP); 2330 PrivMode ((ch == '='), PrivMode_aplKP);
2310 break; 2331 break;
2311 2332
2312 case C1_40: 2333 case C1_40:
2313 rxvt_cmd_getc(aR); 2334 cmd_getc ();
2314 break; 2335 break;
2315 case C1_44: 2336 case C1_44:
2316 rxvt_scr_index(aR_ UP); 2337 scr_index (UP);
2317 break; 2338 break;
2318 2339
2319 /* 8.3.87: NEXT LINE */ 2340 /* 8.3.87: NEXT LINE */
2320 case C1_NEL: /* ESC E */ 2341 case C1_NEL: /* ESC E */
2321 { 2342 {
2322 uint32_t nlcr[] = { '\n', '\r' }; 2343 uint32_t nlcr[] = { '\n', '\r' };
2323 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2344 scr_add_lines (nlcr, 1, 2);
2324 } 2345 }
2325 break; 2346 break;
2326 2347
2327 /* kidnapped escape sequence: Should be 8.3.48 */ 2348 /* kidnapped escape sequence: Should be 8.3.48 */
2328 case C1_ESA: /* ESC G */ 2349 case C1_ESA: /* ESC G */
2329 rxvt_process_graphics(aR); 2350 process_graphics ();
2330 break; 2351 break;
2331 2352
2332 /* 8.3.63: CHARACTER TABULATION SET */ 2353 /* 8.3.63: CHARACTER TABULATION SET */
2333 case C1_HTS: /* ESC H */ 2354 case C1_HTS: /* ESC H */
2334 rxvt_scr_set_tab(aR_ 1); 2355 scr_set_tab (1);
2335 break; 2356 break;
2336 2357
2337 /* 8.3.105: REVERSE LINE FEED */ 2358 /* 8.3.105: REVERSE LINE FEED */
2338 case C1_RI: /* ESC M */ 2359 case C1_RI: /* ESC M */
2339 rxvt_scr_index(aR_ DN); 2360 scr_index (DN);
2340 break; 2361 break;
2341 2362
2342 /* 8.3.142: SINGLE-SHIFT TWO */ 2363 /* 8.3.142: SINGLE-SHIFT TWO */
2343 /*case C1_SS2: scr_single_shift (2); break; */ 2364 /*case C1_SS2: scr_single_shift (2); break; */
2344 2365
2345 /* 8.3.143: SINGLE-SHIFT THREE */ 2366 /* 8.3.143: SINGLE-SHIFT THREE */
2346 /*case C1_SS3: scr_single_shift (3); break; */ 2367 /*case C1_SS3: scr_single_shift (3); break; */
2347 2368
2348 /* 8.3.27: DEVICE CONTROL STRING */ 2369 /* 8.3.27: DEVICE CONTROL STRING */
2349 case C1_DCS: /* ESC P */ 2370 case C1_DCS: /* ESC P */
2350 rxvt_process_dcs_seq(aR); 2371 process_dcs_seq ();
2351 break; 2372 break;
2352 2373
2353 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2374 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2354 case C1_SCI: /* ESC Z */ 2375 case C1_SCI: /* ESC Z */
2355 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2376 tt_write ((const unsigned char *)ESCZ_ANSWER,
2356 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2377 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2357 break; /* steal obsolete ESC [ c */ 2378 break; /* steal obsolete ESC [ c */
2358 2379
2359 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2380 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2360 case C1_CSI: /* ESC [ */ 2381 case C1_CSI: /* ESC [ */
2361 rxvt_process_csi_seq(aR); 2382 process_csi_seq ();
2362 break; 2383 break;
2363 2384
2364 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2385 /* 8.3.90: OPERATING SYSTEM COMMAND */
2365 case C1_OSC: /* ESC ] */ 2386 case C1_OSC: /* ESC ] */
2366 rxvt_process_osc_seq(aR); 2387 process_osc_seq ();
2367 break; 2388 break;
2368 2389
2369 /* 8.3.106: RESET TO INITIAL STATE */ 2390 /* 8.3.106: RESET TO INITIAL STATE */
2370 case 'c': 2391 case 'c':
2371 rxvt_scr_poweron(aR); 2392 scr_poweron ();
2372 rxvt_scrollbar_show(aR_ 1); 2393 scrollbar_show (1);
2373 break; 2394 break;
2374 2395
2375 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2376 case 'n': 2397 case 'n':
2377 rxvt_scr_charset_choose(aR_ 2); 2398 scr_charset_choose (2);
2378 break; 2399 break;
2379 2400
2380 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2401 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2381 case 'o': 2402 case 'o':
2382 rxvt_scr_charset_choose(aR_ 3); 2403 scr_charset_choose (3);
2383 break; 2404 break;
2384 } 2405 }
2385} 2406}
2386/*}}} */ 2407/*}}} */
2387 2408
2388/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2409/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2389/* *INDENT-OFF* */ 2410/* *INDENT-OFF* */
2390enum { 2411enum {
2391 CSI_ICH = 0x40, 2412 CSI_ICH = 0x40,
2392 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2413 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2393 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2414 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2394 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2415 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2395 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2416 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2396 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2417 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2397 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2418 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2398 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2419 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2399 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2420 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2400}; 2421};
2401 2422
2402#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2423#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2403 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2424 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2404 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2425 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2405#define get_byte_array_bit(array, bit) \ 2426#define get_byte_array_bit(array, bit) \
2406 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2427 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2407 2428
2408const unsigned char csi_defaults[] = { 2429const unsigned char csi_defaults[] =
2430 {
2409 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2431 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2410 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2432 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2411 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2433 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2412 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2434 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2413 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2435 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2414 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2436 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2415 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2437 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2416 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2438 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2417}; 2439 };
2418/* *INDENT-ON* */ 2440/* *INDENT-ON* */
2419 2441
2420/* INTPROTO */
2421void 2442void
2422rxvt_process_csi_seq(pR) 2443rxvt_term::process_csi_seq ()
2423{ 2444{
2424 unsigned char ch, priv, i; 2445 unsigned char ch, priv, i;
2425 unsigned int nargs, p; 2446 unsigned int nargs, p;
2426 int n, ndef; 2447 int n, ndef;
2427 int arg[ESC_ARGS]; 2448 int arg[ESC_ARGS];
2428 2449
2429 for (nargs = ESC_ARGS; nargs > 0;) 2450 for (nargs = ESC_ARGS; nargs > 0;)
2430 arg[--nargs] = 0; 2451 arg[--nargs] = 0;
2431 2452
2432 priv = 0; 2453 priv = 0;
2454 ch = cmd_getc ();
2455 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */
2457 priv = ch;
2433 ch = rxvt_cmd_getc(aR); 2458 ch = cmd_getc ();
2434 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2435 priv = ch;
2436 ch = rxvt_cmd_getc(aR);
2437 } 2459 }
2438/* read any numerical arguments */ 2460 /* read any numerical arguments */
2439 for (n = -1; ch < CSI_ICH; ) { 2461 for (n = -1; ch < CSI_ICH; )
2462 {
2440 if (isdigit(ch)) { 2463 if (isdigit (ch))
2464 {
2441 if (n < 0) 2465 if (n < 0)
2442 n = ch - '0'; 2466 n = ch - '0';
2443 else 2467 else
2444 n = n * 10 + ch - '0'; 2468 n = n * 10 + ch - '0';
2469 }
2445 } else if (ch == ';') { 2470 else if (ch == ';')
2471 {
2446 if (nargs < ESC_ARGS) 2472 if (nargs < ESC_ARGS)
2447 arg[nargs++] = n; 2473 arg[nargs++] = n;
2448 n = -1; 2474 n = -1;
2475 }
2449 } else if (ch == '\b') { 2476 else if (ch == '\b')
2450 rxvt_scr_backspace(aR); 2477 {
2478 scr_backspace ();
2479 }
2451 } else if (ch == C0_ESC) { 2480 else if (ch == C0_ESC)
2452 rxvt_process_escape_seq(aR); 2481 {
2482 process_escape_seq ();
2483 return;
2484 }
2485 else if (ch < ' ')
2486 {
2487 process_nonprinting (ch);
2488 }
2489 ch = cmd_getc ();
2490 }
2491
2492 if (ch > CSI_7F)
2453 return; 2493 return;
2454 } else if (ch < ' ') {
2455 rxvt_process_nonprinting(aR_ ch);
2456 }
2457 ch = rxvt_cmd_getc(aR);
2458 }
2459 2494
2460 if (ch > CSI_7F)
2461 return;
2462
2463 if (nargs < ESC_ARGS) 2495 if (nargs < ESC_ARGS)
2464 arg[nargs++] = n; 2496 arg[nargs++] = n;
2465 2497
2466 i = ch - CSI_ICH; 2498 i = ch - CSI_ICH;
2467 ndef = get_byte_array_bit(csi_defaults, i); 2499 ndef = get_byte_array_bit (csi_defaults, i);
2468 for (p = 0; p < nargs; p++) 2500 for (p = 0; p < nargs; p++)
2469 if (arg[p] == -1) 2501 if (arg[p] == -1)
2470 arg[p] = ndef; 2502 arg[p] = ndef;
2471 2503
2472#ifdef DEBUG_CMD 2504#ifdef DEBUG_CMD
2473 fprintf(stderr, "CSI "); 2505 fprintf (stderr, "CSI ");
2474 for (p = 0; p < nargs; p++) 2506 for (p = 0; p < nargs; p++)
2475 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2507 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2476 fprintf(stderr, "%c\n", ch); 2508 fprintf (stderr, "%c\n", ch);
2477#endif 2509#endif
2478 2510
2479/* 2511 /*
2480 * private mode handling 2512 * private mode handling
2481 */ 2513 */
2482 if (priv) { 2514 if (priv)
2483 switch (priv) { 2515 {
2484 case '>': 2516 switch (priv)
2517 {
2518 case '>':
2485 if (ch == CSI_DA) /* secondary device attributes */ 2519 if (ch == CSI_DA) /* secondary device attributes */
2486 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2520 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2487 break; 2521 break;
2488 case '?': 2522 case '?':
2489 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2523 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2490 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2524 process_terminal_mode (ch, priv, nargs, arg);
2491 break; 2525 break;
2492 } 2526 }
2493 return; 2527 return;
2494 } 2528 }
2495 2529
2496 switch (ch) { 2530 switch (ch)
2497/* 2531 {
2532 /*
2498 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2533 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2499 */ 2534 */
2500#ifdef PRINTPIPE 2535#ifdef PRINTPIPE
2501 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2536 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2502 switch (arg[0]) { 2537 switch (arg[0])
2538 {
2503 case 0: /* initiate transfer to primary aux device */ 2539 case 0: /* initiate transfer to primary aux device */
2504 rxvt_scr_printscreen(aR_ 0); 2540 scr_printscreen (0);
2505 break; 2541 break;
2506 case 5: /* start relay to primary aux device */ 2542 case 5: /* start relay to primary aux device */
2507 rxvt_process_print_pipe(aR); 2543 process_print_pipe ();
2544 break;
2545 }
2508 break; 2546 break;
2509 }
2510 break;
2511#endif 2547#endif
2512 2548
2513 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2549 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2514 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2550 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2515 arg[0] = -arg[0]; 2551 arg[0] = -arg[0];
2516 /* FALLTHROUGH */ 2552 /* FALLTHROUGH */
2517 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2553 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2518 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2554 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2519 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2555 scr_gotorc (arg[0], 0, RELATIVE);
2520 break; 2556 break;
2521 2557
2522 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2558 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2523 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2559 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2524#ifdef ISO6429 2560#ifdef ISO6429
2525 arg[0] = -arg[0]; 2561 arg[0] = -arg[0];
2526#else /* emulate common DEC VTs */ 2562#else /* emulate common DEC VTs */
2527 arg[0] = arg[0] ? -arg[0] : -1; 2563 arg[0] = arg[0] ? -arg[0] : -1;
2528#endif 2564#endif
2529 /* FALLTHROUGH */ 2565 /* FALLTHROUGH */
2530 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2566 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2531 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2567 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2532#ifdef ISO6429 2568#ifdef ISO6429
2533 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2569 scr_gotorc (0, arg[0], RELATIVE);
2534#else /* emulate common DEC VTs */ 2570#else /* emulate common DEC VTs */
2535 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2571 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2536#endif 2572#endif
2537 break; 2573 break;
2538 2574
2539 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2575 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2540 arg[0] = -arg[0]; 2576 arg[0] = -arg[0];
2541 /* FALLTHROUGH */ 2577 /* FALLTHROUGH */
2542 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2578 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2543 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2579 scr_gotorc (arg[0], 0, R_RELATIVE);
2544 break; 2580 break;
2545 2581
2546 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2582 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2547 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2583 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2548 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2584 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2549 break; 2585 break;
2550 2586
2551 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2587 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2552 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2588 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2553 break; 2589 break;
2554 2590
2555 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2591 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2556 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2592 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2557 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2593 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2558 break; 2594 break;
2559 2595
2560 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2596 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2561 arg[0] = -arg[0]; 2597 arg[0] = -arg[0];
2562 /* FALLTHROUGH */ 2598 /* FALLTHROUGH */
2563 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2599 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2564 rxvt_scr_tab(aR_ arg[0]); 2600 scr_tab (arg[0]);
2565 break; 2601 break;
2566 2602
2567 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2603 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2568 rxvt_scr_erase_screen(aR_ arg[0]); 2604 scr_erase_screen (arg[0]);
2569 break; 2605 break;
2570 2606
2571 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2607 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2572 rxvt_scr_erase_line(aR_ arg[0]); 2608 scr_erase_line (arg[0]);
2573 break; 2609 break;
2574 2610
2575 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2611 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2576 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2612 scr_insdel_chars (arg[0], INSERT);
2577 break; 2613 break;
2578 2614
2579 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2615 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2580 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2616 scr_insdel_lines (arg[0], INSERT);
2581 break; 2617 break;
2582 2618
2583 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2619 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2584 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2620 scr_insdel_lines (arg[0], DELETE);
2585 break; 2621 break;
2586 2622
2587 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2623 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2588 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2624 scr_insdel_chars (arg[0], ERASE);
2589 break; 2625 break;
2590 2626
2591 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2627 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2592 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2628 scr_insdel_chars (arg[0], DELETE);
2593 break; 2629 break;
2594 2630
2595 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2631 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2596 arg[0] = -arg[0]; 2632 arg[0] = -arg[0];
2597 /* FALLTHROUGH */ 2633 /* FALLTHROUGH */
2598 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2634 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2599 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2635 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2600 break; 2636 break;
2601 2637
2602 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2638 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2603 R->tt_write((const unsigned char *)VT100_ANS, 2639 tt_write ((const unsigned char *)VT100_ANS,
2604 (unsigned int)(sizeof(VT100_ANS) - 1)); 2640 (unsigned int) (sizeof (VT100_ANS) - 1));
2605 break; 2641 break;
2606 2642
2607 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2643 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2608 rxvt_process_sgr_mode(aR_ nargs, arg); 2644 process_sgr_mode (nargs, arg);
2609 break; 2645 break;
2610 2646
2611 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2647 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2612 switch (arg[0]) { 2648 switch (arg[0])
2649 {
2613 case 5: /* DSR requested */ 2650 case 5: /* DSR requested */
2614 R->tt_printf("\033[0n"); 2651 tt_printf ("\033[0n");
2615 break; 2652 break;
2616 case 6: /* CPR requested */ 2653 case 6: /* CPR requested */
2617 rxvt_scr_report_position(aR); 2654 scr_report_position ();
2618 break; 2655 break;
2619#if defined (ENABLE_DISPLAY_ANSWER) 2656#if defined (ENABLE_DISPLAY_ANSWER)
2620 case 7: /* unofficial extension */ 2657 case 7: /* unofficial extension */
2621 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2658 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2622 break; 2659 break;
2623#endif 2660#endif
2624 case 8: /* unofficial extension */ 2661 case 8: /* unofficial extension */
2625 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break;
2664 }
2626 break; 2665 break;
2627 }
2628 break;
2629 2666
2630 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2631 switch (arg[0]) { 2668 switch (arg[0])
2669 {
2632 case 0: /* char tab stop cleared at active position */ 2670 case 0: /* char tab stop cleared at active position */
2633 rxvt_scr_set_tab(aR_ 0); 2671 scr_set_tab (0);
2634 break; 2672 break;
2635 /* case 1: */ /* line tab stop cleared in active line */ 2673 /* case 1: */ /* line tab stop cleared in active line */
2636 /* case 2: */ /* char tab stops cleared in active line */ 2674 /* case 2: */ /* char tab stops cleared in active line */
2637 case 3: /* all char tab stops are cleared */ 2675 case 3: /* all char tab stops are cleared */
2638 /* case 4: */ /* all line tab stops are cleared */ 2676 /* case 4: */ /* all line tab stops are cleared */
2639 case 5: /* all tab stops are cleared */ 2677 case 5: /* all tab stops are cleared */
2640 rxvt_scr_set_tab(aR_ -1); 2678 scr_set_tab (-1);
2679 break;
2680 }
2641 break; 2681 break;
2642 }
2643 break;
2644 2682
2645 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2683 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2646 switch (arg[0]) { 2684 switch (arg[0])
2685 {
2647 case 0: /* char tab stop set at active position */ 2686 case 0: /* char tab stop set at active position */
2648 rxvt_scr_set_tab(aR_ 1); 2687 scr_set_tab (1);
2649 break; /* = ESC H */ 2688 break; /* = ESC H */
2650 /* case 1: */ /* line tab stop set at active line */ 2689 /* case 1: */ /* line tab stop set at active line */
2651 case 2: /* char tab stop cleared at active position */ 2690 case 2: /* char tab stop cleared at active position */
2652 rxvt_scr_set_tab(aR_ 0); 2691 scr_set_tab (0);
2653 break; /* = ESC [ 0 g */ 2692 break; /* = ESC [ 0 g */
2654 /* case 3: */ /* line tab stop cleared at active line */ 2693 /* case 3: */ /* line tab stop cleared at active line */
2655 /* case 4: */ /* char tab stops cleared at active line */ 2694 /* case 4: */ /* char tab stops cleared at active line */
2656 case 5: /* all char tab stops are cleared */ 2695 case 5: /* all char tab stops are cleared */
2657 rxvt_scr_set_tab(aR_ -1); 2696 scr_set_tab (-1);
2658 break; /* = ESC [ 3 g */ 2697 break; /* = ESC [ 3 g */
2659 /* case 6: */ /* all line tab stops are cleared */ 2698 /* case 6: */ /* all line tab stops are cleared */
2660 } 2699 }
2661 break; 2700 break;
2662 2701
2663 case CSI_RM: /* 8.3.107: RESET MODE */ 2702 case CSI_RM: /* 8.3.107: RESET MODE */
2664 if (arg[0] == 4) 2703 if (arg[0] == 4)
2665 rxvt_scr_insert_mode(aR_ 0); 2704 scr_insert_mode (0);
2666 break; 2705 break;
2667 2706
2668 case CSI_SM: /* 8.3.126: SET MODE */ 2707 case CSI_SM: /* 8.3.126: SET MODE */
2669 if (arg[0] == 4) 2708 if (arg[0] == 4)
2670 rxvt_scr_insert_mode(aR_ 1); 2709 scr_insert_mode (1);
2671 break; 2710 break;
2672 2711
2673/* 2712 /*
2674 * PRIVATE USE beyond this point. All CSI_7? sequences here 2713 * PRIVATE USE beyond this point. All CSI_7? sequences here
2675 */ 2714 */
2676 case CSI_72: /* DECSTBM: set top and bottom margins */ 2715 case CSI_72: /* DECSTBM: set top and bottom margins */
2677 if (nargs == 1) 2716 if (nargs == 1)
2678 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2717 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2679 else if (nargs == 0 || arg[0] >= arg[1]) 2718 else if (nargs == 0 || arg[0] >= arg[1])
2680 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2719 scr_scroll_region (0, MAX_ROWS - 1);
2681 else 2720 else
2682 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2721 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2683 break; 2722 break;
2684 2723
2685 case CSI_73: 2724 case CSI_73:
2686 rxvt_scr_cursor(aR_ SAVE); 2725 scr_cursor (SAVE);
2687 break; 2726 break;
2688 case CSI_75: 2727 case CSI_75:
2689 rxvt_scr_cursor(aR_ RESTORE); 2728 scr_cursor (RESTORE);
2690 break; 2729 break;
2691 2730
2692#ifndef NO_FRILLS 2731#ifndef NO_FRILLS
2693 case CSI_74: 2732 case CSI_74:
2694 rxvt_process_window_ops(aR_ arg, nargs); 2733 process_window_ops (arg, nargs);
2695 break; 2734 break;
2696#endif 2735#endif
2697 2736
2698 case CSI_78: /* DECREQTPARM */ 2737 case CSI_78: /* DECREQTPARM */
2699 if (arg[0] == 0 || arg[0] == 1) 2738 if (arg[0] == 0 || arg[0] == 1)
2700 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2701 /* FALLTHROUGH */ 2740 /* FALLTHROUGH */
2702 2741
2703 default: 2742 default:
2704 break; 2743 break;
2705 } 2744 }
2706} 2745}
2707/*}}} */ 2746/*}}} */
2708 2747
2709#ifndef NO_FRILLS 2748#ifndef NO_FRILLS
2710/* ARGSUSED */ 2749/* ARGSUSED */
2711/* INTPROTO */
2712void 2750void
2713rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2751rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2714{ 2752{
2715 int x, y; 2753 int x, y;
2716#if 0 2754#if 0
2717 char *s; 2755 char *s;
2718#endif 2756#endif
2719 XWindowAttributes wattr; 2757 XWindowAttributes wattr;
2720 Window wdummy; 2758 Window wdummy;
2721 2759
2722 if (nargs == 0) 2760 if (nargs == 0)
2723 return; 2761 return;
2724 switch (args[0]) { 2762 switch (args[0])
2763 {
2725 /* 2764 /*
2726 * commands 2765 * commands
2727 */ 2766 */
2728 case 1: /* deiconify window */ 2767 case 1: /* deiconify window */
2729 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2768 XMapWindow (display->display, TermWin.parent[0]);
2730 break; 2769 break;
2731 case 2: /* iconify window */ 2770 case 2: /* iconify window */
2732 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2771 XIconifyWindow (display->display, TermWin.parent[0],
2733 DefaultScreen(R->Xdisplay)); 2772 DefaultScreen (display->display));
2734 break; 2773 break;
2735 case 3: /* set position (pixels) */ 2774 case 3: /* set position (pixels) */
2736 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2775 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2737 break; 2776 break;
2738 case 4: /* set size (pixels) */ 2777 case 4: /* set size (pixels) */
2739 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2778 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2740 break; 2779 break;
2741 case 5: /* raise window */ 2780 case 5: /* raise window */
2742 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2781 XRaiseWindow (display->display, TermWin.parent[0]);
2743 break; 2782 break;
2744 case 6: /* lower window */ 2783 case 6: /* lower window */
2745 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2784 XLowerWindow (display->display, TermWin.parent[0]);
2746 break; 2785 break;
2747 case 7: /* refresh window */ 2786 case 7: /* refresh window */
2748 rxvt_scr_touch(aR_ True); 2787 scr_touch (true);
2749 break; 2788 break;
2750 case 8: /* set size (chars) */ 2789 case 8: /* set size (chars) */
2751 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2752 (unsigned int)(args[1] * R->TermWin.fheight)); 2791 (unsigned int) (args[1] * TermWin.fheight));
2753 break; 2792 break;
2754 default: 2793 default:
2755 if (args[0] >= 24) /* set height (chars) */ 2794 if (args[0] >= 24) /* set height (chars) */
2756 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2795 set_widthheight ((unsigned int)TermWin.width,
2757 (unsigned int)(args[1] * R->TermWin.fheight)); 2796 (unsigned int) (args[1] * TermWin.fheight));
2758 break; 2797 break;
2759 /* 2798 /*
2760 * reports - some output format copied from XTerm 2799 * reports - some output format copied from XTerm
2761 */ 2800 */
2762 case 11: /* report window state */ 2801 case 11: /* report window state */
2763 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2764 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2765 break; 2804 break;
2766 case 13: /* report window position */ 2805 case 13: /* report window position */
2767 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2768 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2769 -wattr.border_width, -wattr.border_width, 2808 -wattr.border_width, -wattr.border_width,
2770 &x, &y, &wdummy); 2809 &x, &y, &wdummy);
2771 R->tt_printf("\033[3;%d;%dt", x, y); 2810 tt_printf ("\033[3;%d;%dt", x, y);
2772 break; 2811 break;
2773 case 14: /* report window size (pixels) */ 2812 case 14: /* report window size (pixels) */
2774 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2775 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2776 break; 2815 break;
2777 case 18: /* report window size (chars) */ 2816 case 18: /* report window size (chars) */
2778 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2779 break; 2818 break;
2780#if 0 /* XXX: currently disabled due to security concerns */ 2819#if 0 /* XXX: currently disabled due to security concerns */
2781 case 20: /* report icon label */ 2820 case 20: /* report icon label */
2782 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2821 XGetIconName (display->display, TermWin.parent[0], &s);
2783 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2784 break; 2823 break;
2785 case 21: /* report window title */ 2824 case 21: /* report window title */
2786 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2825 XFetchName (display->display, TermWin.parent[0], &s);
2787 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2788 break; 2827 break;
2789#endif 2828#endif
2829
2790 } 2830 }
2791} 2831}
2792#endif 2832#endif
2793 2833
2794/*----------------------------------------------------------------------*/ 2834/*----------------------------------------------------------------------*/
2795/* 2835/*
2796 * get input up until STRING TERMINATOR (or BEL) 2836 * get input up until STRING TERMINATOR (or BEL)
2797 * ends_how is terminator used. returned input must be free()d 2837 * ends_how is terminator used. returned input must be free ()d
2798 */ 2838 */
2799/* INTPROTO */
2800unsigned char * 2839unsigned char *
2801rxvt_get_to_st(pR_ unsigned char *ends_how) 2840rxvt_term::get_to_st (unsigned char *ends_how)
2802{ 2841{
2803 int seen_esc = 0; /* seen escape? */ 2842 int seen_esc = 0; /* seen escape? */
2804 unsigned int n = 0; 2843 unsigned int n = 0;
2805 unsigned char *s; 2844 unsigned char *s;
2806 unsigned char ch, string[STRING_MAX]; 2845 unsigned char ch, string[STRING_MAX];
2807 2846
2808 for (; (ch = rxvt_cmd_getc(aR));) { 2847 for (; (ch = cmd_getc ());)
2848 {
2809 if (ch == C0_BEL 2849 if (ch == C0_BEL
2810 || ch == CHAR_ST 2850 || ch == CHAR_ST
2811 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2812 break; 2852 break;
2813 if (ch == C0_ESC) { 2853 if (ch == C0_ESC)
2854 {
2814 seen_esc = 1; 2855 seen_esc = 1;
2815 continue; 2856 continue;
2857 }
2816 } else if (ch == '\t') 2858 else if (ch == '\t')
2817 ch = ' '; /* translate '\t' to space */ 2859 ch = ' '; /* translate '\t' to space */
2818 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2819 return NULL; /* other control character - exit */ 2861 return NULL; /* other control character - exit */
2820 if (n < sizeof(string) - 1) 2862 if (n < sizeof (string) - 1)
2821 string[n++] = ch; 2863 string[n++] = ch;
2822 seen_esc = 0; 2864 seen_esc = 0;
2823 } 2865 }
2824 string[n++] = '\0'; 2866 string[n++] = '\0';
2825 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2826 return NULL; 2868 return NULL;
2827 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2869 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2828 STRNCPY(s, string, n); 2870 STRNCPY (s, string, n);
2829 return s; 2871 return s;
2830} 2872}
2831 2873
2832/*----------------------------------------------------------------------*/ 2874/*----------------------------------------------------------------------*/
2833/* 2875/*
2834 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2835 */ 2877 */
2836/* INTPROTO */
2837void 2878void
2838rxvt_process_dcs_seq(pR) 2879rxvt_term::process_dcs_seq ()
2839{ 2880{
2840 unsigned char eh, *s; 2881 unsigned char eh, *s;
2841/* 2882 /*
2842 * Not handled yet 2883 * Not handled yet
2843 */ 2884 */
2844 s = rxvt_get_to_st(aR_ &eh); 2885 s = get_to_st (&eh);
2845 if (s) 2886 if (s)
2846 free(s); 2887 free (s);
2847 return; 2888 return;
2848} 2889}
2849 2890
2850/*----------------------------------------------------------------------*/ 2891/*----------------------------------------------------------------------*/
2851/* 2892/*
2852 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2853 */ 2894 */
2854/* INTPROTO */
2855void 2895void
2856rxvt_process_osc_seq(pR) 2896rxvt_term::process_osc_seq ()
2857{ 2897{
2858 unsigned char ch, eh, *s; 2898 unsigned char ch, eh, *s;
2859 int arg; 2899 int arg;
2860 2900
2861 ch = rxvt_cmd_getc(aR); 2901 ch = cmd_getc ();
2862 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2902 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2863 arg = arg * 10 + (ch - '0'); 2903 arg = arg * 10 + (ch - '0');
2864 2904
2865 if (ch == ';') { 2905 if (ch == ';')
2866 s = rxvt_get_to_st(aR_ &eh); 2906 {
2867 if (s) { 2907 s = get_to_st (&eh);
2868 /* 2908 if (s)
2909 {
2910 /*
2869 * rxvt_menubar_dispatch() violates the constness of the string, 2911 * rxvt_menubar_dispatch () violates the constness of the string,
2870 * so do it here 2912 * so do it here
2871 */ 2913 */
2872 if (arg == XTerm_Menu) 2914 if (arg == XTerm_Menu)
2873#if 0 /* XXX: currently disabled due to security concerns */ 2915#if 0 /* XXX: currently disabled due to security concerns */
2874 rxvt_menubar_dispatch(aR_ (char *)s); 2916 menubar_dispatch ((char *)s);
2875#else 2917#else
2876 0; 2918 (void)0;
2877#endif 2919#endif
2878 else 2920 else
2879 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2921 xterm_seq (arg, (char *)s, eh);
2880 free(s); 2922 free (s);
2881 } 2923 }
2882 } 2924 }
2883} 2925}
2884/* 2926/*
2885 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2886 * 0 = change iconName/title 2928 * 0 = change iconName/title
… …
2894 * 19 = change underlined character color 2936 * 19 = change underlined character color
2895 * 46 = change logfile (not implemented) 2937 * 46 = change logfile (not implemented)
2896 * 50 = change font 2938 * 50 = change font
2897 * 2939 *
2898 * rxvt extensions: 2940 * rxvt extensions:
2941 * 9 = change locale (NYI)
2899 * 10 = menu (may change in future) 2942 * 10 = menu (may change in future)
2900 * 20 = bg pixmap 2943 * 20 = bg pixmap
2901 * 39 = change default fg color 2944 * 39 = change default fg color
2902 * 49 = change default bg color 2945 * 49 = change default bg color
2903 * 55 = dump scrollback buffer and all of screen 2946 * 55 = dump scrollback buffer and all of screen
2904 */ 2947 */
2905/* EXTPROTO */
2906void 2948void
2907rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2908{ 2950{
2909 int changed = 0; 2951 int changed = 0;
2910 int color; 2952 int color;
2911 char *buf, *name; 2953 char *buf, *name;
2912 2954
2913 assert(str != NULL); 2955 assert (str != NULL);
2914 switch (op) { 2956 switch (op)
2957 {
2915 case XTerm_name: 2958 case XTerm_name:
2916 rxvt_set_title(aR_ str); 2959 set_title (str);
2917 /* FALLTHROUGH */ 2960 /* FALLTHROUGH */
2918 case XTerm_iconName: 2961 case XTerm_iconName:
2919 rxvt_set_iconName(aR_ str); 2962 set_iconName (str);
2920 break; 2963 break;
2921 case XTerm_title: 2964 case XTerm_title:
2922 rxvt_set_title(aR_ str); 2965 set_title (str);
2923 break; 2966 break;
2924 case XTerm_Color: 2967 case XTerm_Color:
2925 for (buf = (char *)str; buf && *buf;) { 2968 for (buf = (char *)str; buf && *buf;)
2969 {
2926 if ((name = STRCHR(buf, ';')) == NULL) 2970 if ((name = STRCHR (buf, ';')) == NULL)
2927 break; 2971 break;
2928 *name++ = '\0'; 2972 *name++ = '\0';
2929 color = atoi(buf); 2973 color = atoi (buf);
2930 if (color < 0 || color >= TOTAL_COLORS) 2974 if (color < 0 || color >= TOTAL_COLORS)
2931 break; 2975 break;
2932 if ((buf = STRCHR(name, ';')) != NULL) 2976 if ((buf = STRCHR (name, ';')) != NULL)
2933 *buf++ = '\0'; 2977 *buf++ = '\0';
2934 rxvt_set_window_color(aR_ color + minCOLOR, name); 2978 set_window_color (color + minCOLOR, name);
2935 } 2979 }
2936 break; 2980 break;
2937#ifndef NO_CURSORCOLOR 2981#ifndef NO_CURSORCOLOR
2938 case XTerm_Color_cursor: 2982 case XTerm_Color_cursor:
2939 rxvt_set_window_color(aR_ Color_cursor, str); 2983 set_window_color (Color_cursor, str);
2940 break; 2984 break;
2941#endif 2985#endif
2942 case XTerm_Color_pointer: 2986 case XTerm_Color_pointer:
2943 rxvt_set_window_color(aR_ Color_pointer, str); 2987 set_window_color (Color_pointer, str);
2944 break; 2988 break;
2945#ifndef NO_BOLD_UNDERLINE_REVERSE 2989#ifndef NO_BOLD_UNDERLINE_REVERSE
2946 case XTerm_Color_BD: 2990 case XTerm_Color_BD:
2947 rxvt_set_window_color(aR_ Color_BD, str); 2991 set_window_color (Color_BD, str);
2948 break; 2992 break;
2949 case XTerm_Color_UL: 2993 case XTerm_Color_UL:
2950 rxvt_set_window_color(aR_ Color_UL, str); 2994 set_window_color (Color_UL, str);
2951 break; 2995 break;
2952 case XTerm_Color_RV: 2996 case XTerm_Color_RV:
2953 rxvt_set_window_color(aR_ Color_RV, str); 2997 set_window_color (Color_RV, str);
2954 break; 2998 break;
2955#endif 2999#endif
2956 3000
2957 case XTerm_Menu: 3001 case XTerm_Menu:
2958 /* 3002 /*
2959 * rxvt_menubar_dispatch() violates the constness of the string, 3003 * rxvt_menubar_dispatch () violates the constness of the string,
2960 * so DON'T do it here 3004 * so DON'T do it here
2961 */ 3005 */
2962 break; 3006 break;
2963 case XTerm_Pixmap: 3007 case XTerm_Pixmap:
2964 if (*str != ';') { 3008 if (*str != ';')
3009 {
2965#if XPM_BACKGROUND 3010#if XPM_BACKGROUND
2966 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3011 scale_pixmap (""); /* reset to default scaling */
2967 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3012 set_bgPixmap (str); /* change pixmap */
2968#endif 3013#endif
2969 rxvt_scr_touch(aR_ True); 3014 scr_touch (true);
2970 } 3015 }
2971 while ((str = STRCHR(str, ';')) != NULL) { 3016 while ((str = STRCHR (str, ';')) != NULL)
2972 str++; 3017 {
3018 str++;
2973#if XPM_BACKGROUND 3019#if XPM_BACKGROUND
2974 changed += rxvt_scale_pixmap(aR_ str); 3020 changed += scale_pixmap (str);
2975#endif 3021#endif
2976 } 3022
2977 if (changed) { 3023 }
3024 if (changed)
3025 {
2978#ifdef XPM_BACKGROUND 3026#ifdef XPM_BACKGROUND
2979 rxvt_resize_pixmap(aR); 3027 resize_pixmap ();
2980#endif 3028#endif
2981 rxvt_scr_touch(aR_ True); 3029 scr_touch (true);
2982 } 3030 }
2983 break; 3031 break;
2984 3032
2985 case XTerm_restoreFG: 3033 case XTerm_restoreFG:
2986 rxvt_set_window_color(aR_ Color_fg, str); 3034 set_window_color (Color_fg, str);
2987 break; 3035 break;
2988 case XTerm_restoreBG: 3036 case XTerm_restoreBG:
2989 rxvt_set_window_color(aR_ Color_bg, str); 3037 set_window_color (Color_bg, str);
2990 break; 3038 break;
2991 case XTerm_logfile: 3039 case XTerm_logfile:
2992 break; 3040 break;
2993 case XTerm_font: 3041 case XTerm_font:
2994 rxvt_change_font(aR_ 0, str); 3042 change_font (str);
2995 break; 3043 break;
3044#ifndef NO_FRILLS
3045 case XTerm_locale:
3046 if (str[0] == '?' && !str[1])
3047 tt_printf ("%-.250s\n", locale);
3048 else
3049 {
3050 set_locale (str);
3051# ifdef USE_XIM
3052 im_cb ();
3053# endif
3054 // TODO: call selection_make with the right values set
3055 // to re-fresh the selection.
3056 if (display->selection_owner == this)
3057 display->set_selection_owner (0);
3058 }
3059 break;
3060#endif
2996#if 0 3061#if 0
2997 case XTerm_dumpscreen: /* no error notices */ 3062 case XTerm_dumpscreen: /* no error notices */
2998 { 3063 {
2999 int fd; 3064 int fd;
3000 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3001 rxvt_scr_dump(aR_ fd); 3066 {
3002 close(fd); 3067 scr_dump (fd);
3003 } 3068 close (fd);
3004 } 3069 }
3005 break; 3070 }
3071 break;
3006#endif 3072#endif
3073
3007 } 3074 }
3008} 3075}
3009/*----------------------------------------------------------------------*/ 3076/*----------------------------------------------------------------------*/
3010 3077
3011/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3016 * 's' = save 3083 * 's' = save
3017 * 'r' = restore 3084 * 'r' = restore
3018 * 't' = toggle 3085 * 't' = toggle
3019 * so no need for fancy checking 3086 * so no need for fancy checking
3020 */ 3087 */
3021/* INTPROTO */
3022int 3088int
3023rxvt_privcases(pR_ int mode, unsigned long bit) 3089rxvt_term::privcases (int mode, unsigned long bit)
3024{ 3090{
3025 int state; 3091 int state;
3026 3092
3027 if (mode == 's') { 3093 if (mode == 's')
3094 {
3028 R->SavedModes |= (R->PrivateModes & bit); 3095 SavedModes |= (PrivateModes & bit);
3029 return -1; 3096 return -1;
3030 } else { 3097 }
3098 else
3099 {
3031 if (mode == 'r') 3100 if (mode == 'r')
3032 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3033 else 3102 else
3034 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3035 PrivMode(state, bit); 3104 PrivMode (state, bit);
3036 } 3105 }
3037 return state; 3106 return state;
3038} 3107}
3039 3108
3040/* we're not using priv _yet_ */ 3109/* we're not using priv _yet_ */
3041/* INTPROTO */
3042void 3110void
3043rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3044{ 3112{
3045 unsigned int i, j; 3113 unsigned int i, j;
3046 int state; 3114 int state;
3047 static const struct { 3115 static const struct
3116 {
3048 const int argval; 3117 const int argval;
3049 const unsigned long bit; 3118 const unsigned long bit;
3119 }
3050 } argtopriv[] = { 3120 argtopriv[] = {
3051 { 1, PrivMode_aplCUR }, 3121 { 1, PrivMode_aplCUR },
3052 { 2, PrivMode_vt52 }, 3122 { 2, PrivMode_vt52 },
3053 { 3, PrivMode_132 }, 3123 { 3, PrivMode_132 },
3054 { 4, PrivMode_smoothScroll }, 3124 { 4, PrivMode_smoothScroll },
3055 { 5, PrivMode_rVideo }, 3125 { 5, PrivMode_rVideo },
3056 { 6, PrivMode_relOrigin }, 3126 { 6, PrivMode_relOrigin },
3057 { 7, PrivMode_Autowrap }, 3127 { 7, PrivMode_Autowrap },
3058 { 9, PrivMode_MouseX10 }, 3128 { 9, PrivMode_MouseX10 },
3059#ifdef menuBar_esc 3129#ifdef menuBar_esc
3060 { menuBar_esc, PrivMode_menuBar }, 3130 { menuBar_esc, PrivMode_menuBar },
3061#endif 3131#endif
3062#ifdef scrollBar_esc 3132#ifdef scrollBar_esc
3063 { scrollBar_esc, PrivMode_scrollBar }, 3133 { scrollBar_esc, PrivMode_scrollBar },
3064#endif 3134#endif
3065 { 25, PrivMode_VisibleCursor }, 3135 { 25, PrivMode_VisibleCursor },
3066 { 35, PrivMode_ShiftKeys }, 3136 { 35, PrivMode_ShiftKeys },
3067 { 40, PrivMode_132OK }, 3137 { 40, PrivMode_132OK },
3068 { 47, PrivMode_Screen }, 3138 { 47, PrivMode_Screen },
3069 { 66, PrivMode_aplKP }, 3139 { 66, PrivMode_aplKP },
3070#ifndef NO_BACKSPACE_KEY 3140#ifndef NO_BACKSPACE_KEY
3071 { 67, PrivMode_BackSpace }, 3141 { 67, PrivMode_BackSpace },
3072#endif 3142#endif
3073 { 1000, PrivMode_MouseX11 }, 3143 { 1000, PrivMode_MouseX11 },
3074 { 1010, PrivMode_TtyOutputInh }, 3144 { 1010, PrivMode_TtyOutputInh },
3075 { 1011, PrivMode_Keypress }, 3145 { 1011, PrivMode_Keypress },
3076 { 1047, PrivMode_Screen }, 3146 { 1047, PrivMode_Screen },
3077 }; 3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3148 };
3078 3149
3079 if (nargs == 0) 3150 if (nargs == 0)
3080 return; 3151 return;
3081 3152
3082/* make lo/hi boolean */ 3153 /* make lo/hi boolean */
3083 if (mode == 'l') 3154 if (mode == 'l')
3084 mode = 0; /* reset */ 3155 mode = 0; /* reset */
3085 else if (mode == 'h') 3156 else if (mode == 'h')
3086 mode = 1; /* set */ 3157 mode = 1; /* set */
3087 3158
3088 for (i = 0; i < nargs; i++) { 3159 for (i = 0; i < nargs; i++)
3160 {
3089 state = -1; 3161 state = -1;
3090 3162
3091 /* basic handling */ 3163 /* basic handling */
3092 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3164 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3093 if (argtopriv[j].argval == arg[i]) { 3165 if (argtopriv[j].argval == arg[i])
3166 {
3094 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3167 state = privcases (mode, argtopriv[j].bit);
3095 break; 3168 break;
3096 } 3169 }
3097 3170
3098 /* extra handling for values with state unkept */ 3171 /* extra handling for values with state unkept */
3099 if (state == -1) 3172 if (state == -1)
3100 switch (arg[i]) { 3173 switch (arg[i])
3174 {
3101 case 1048: /* alternative cursor save */ 3175 case 1048: /* alternative cursor save */
3102 if (mode == 0) 3176 if (mode == 0)
3103 rxvt_scr_cursor(aR_ RESTORE); 3177 scr_cursor (RESTORE);
3104 else if (mode == 1) 3178 else if (mode == 1)
3105 rxvt_scr_cursor(aR_ SAVE); 3179 scr_cursor (SAVE);
3106 /* FALLTHROUGH */ 3180 /* FALLTHROUGH */
3107 default: 3181 default:
3108 continue; /* for(;i;) */ 3182 continue; /* for (;i;) */
3109 } 3183 }
3110 3184
3111 /* extra handling for values with valid 0 or 1 state */ 3185 /* extra handling for values with valid 0 or 1 state */
3112 switch (arg[i]) { 3186 switch (arg[i])
3187 {
3113 /* case 1: - application cursor keys */ 3188 /* case 1: - application cursor keys */
3114 case 2: /* VT52 mode */ 3189 case 2: /* VT52 mode */
3115 /* oddball mode. should be set regardless of set/reset 3190 /* oddball mode. should be set regardless of set/reset
3116 * parameter. Return from VT52 mode with an ESC < from 3191 * parameter. Return from VT52 mode with an ESC < from
3117 * within VT52 mode 3192 * within VT52 mode
3118 */ 3193 */
3119 PrivMode(1, PrivMode_vt52); 3194 PrivMode (1, PrivMode_vt52);
3120 break; 3195 break;
3121 case 3: /* 80/132 */ 3196 case 3: /* 80/132 */
3122 if (R->PrivateModes & PrivMode_132OK) 3197 if (PrivateModes & PrivMode_132OK)
3123 rxvt_set_widthheight(aR_
3124 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3125 (unsigned int)R->TermWin.height); 3199 (unsigned int)TermWin.height);
3126 break; 3200 break;
3127 case 4: /* smooth scrolling */ 3201 case 4: /* smooth scrolling */
3128 if (state) 3202 if (state)
3129 R->Options &= ~Opt_jumpScroll; 3203 Options &= ~Opt_jumpScroll;
3130 else 3204 else
3131 R->Options |= Opt_jumpScroll; 3205 Options |= Opt_jumpScroll;
3132 break; 3206 break;
3133 case 5: /* reverse video */ 3207 case 5: /* reverse video */
3134 rxvt_scr_rvideo_mode(aR_ state); 3208 scr_rvideo_mode (state);
3135 break; 3209 break;
3136 case 6: /* relative/absolute origins */ 3210 case 6: /* relative/absolute origins */
3137 rxvt_scr_relative_origin(aR_ state); 3211 scr_relative_origin (state);
3138 break; 3212 break;
3139 case 7: /* autowrap */ 3213 case 7: /* autowrap */
3140 rxvt_scr_autowrap(aR_ state); 3214 scr_autowrap (state);
3141 break; 3215 break;
3142 /* case 8: - auto repeat, can't do on a per window basis */ 3216 /* case 8: - auto repeat, can't do on a per window basis */
3143 case 9: /* X10 mouse reporting */ 3217 case 9: /* X10 mouse reporting */
3144 if (state) /* orthogonal */ 3218 if (state) /* orthogonal */
3145 R->PrivateModes &= ~(PrivMode_MouseX11); 3219 PrivateModes &= ~ (PrivMode_MouseX11);
3146 break; 3220 break;
3147#ifdef menuBar_esc 3221#ifdef menuBar_esc
3148 case menuBar_esc: 3222 case menuBar_esc:
3149#ifdef MENUBAR 3223#ifdef MENUBAR
3150 rxvt_map_menuBar(aR_ state); 3224 map_menuBar (state);
3151#endif 3225#endif
3152 break; 3226 break;
3153#endif 3227#endif
3154#ifdef scrollBar_esc 3228#ifdef scrollBar_esc
3155 case scrollBar_esc: 3229 case scrollBar_esc:
3156 if (rxvt_scrollbar_mapping(aR_ state)) { 3230 if (scrollbar_mapping (state))
3157 rxvt_resize_all_windows(aR_ 0, 0, 0); 3231 {
3158 rxvt_scr_touch(aR_ True); 3232 resize_all_windows (0, 0, 0);
3159 } 3233 scr_touch (true);
3160 break; 3234 }
3235 break;
3161#endif 3236#endif
3162 case 25: /* visible/invisible cursor */ 3237 case 25: /* visible/invisible cursor */
3163 rxvt_scr_cursor_visible(aR_ state); 3238 scr_cursor_visible (state);
3164 break; 3239 break;
3165 /* case 35: - shift keys */ 3240 /* case 35: - shift keys */
3166 /* case 40: - 80 <--> 132 mode */ 3241 /* case 40: - 80 <--> 132 mode */
3167 case 47: /* secondary screen */ 3242 case 47: /* secondary screen */
3168 rxvt_scr_change_screen(aR_ state); 3243 scr_change_screen (state);
3169 break; 3244 break;
3170 /* case 66: - application key pad */ 3245 /* case 66: - application key pad */
3171 /* case 67: - backspace key */ 3246 /* case 67: - backspace key */
3172 case 1000: /* X11 mouse reporting */ 3247 case 1000: /* X11 mouse reporting */
3173 if (state) /* orthogonal */ 3248 if (state) /* orthogonal */
3174 R->PrivateModes &= ~(PrivMode_MouseX10); 3249 PrivateModes &= ~ (PrivMode_MouseX10);
3175 break; 3250 break;
3176#if 0 3251#if 0
3177 case 1001: 3252 case 1001:
3178 break; /* X11 mouse highlighting */ 3253 break; /* X11 mouse highlighting */
3179#endif 3254#endif
3180 case 1010: /* scroll to bottom on TTY output inhibit */ 3255 case 1010: /* scroll to bottom on TTY output inhibit */
3181 if (state) 3256 if (state)
3182 R->Options &= ~Opt_scrollTtyOutput; 3257 Options &= ~Opt_scrollTtyOutput;
3183 else 3258 else
3184 R->Options |= Opt_scrollTtyOutput; 3259 Options |= Opt_scrollTtyOutput;
3185 break; 3260 break;
3186 case 1011: /* scroll to bottom on key press */ 3261 case 1011: /* scroll to bottom on key press */
3187 if (state) 3262 if (state)
3188 R->Options |= Opt_scrollTtyKeypress; 3263 Options |= Opt_scrollTtyKeypress;
3189 else 3264 else
3190 R->Options &= ~Opt_scrollTtyKeypress; 3265 Options &= ~Opt_scrollTtyKeypress;
3191 break; 3266 break;
3192 case 1047: /* secondary screen w/ clearing */ 3267 case 1047: /* secondary screen w/ clearing */
3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3193 if (R->current_screen != PRIMARY) 3269 if (current_screen != PRIMARY)
3194 rxvt_scr_erase_screen(aR_ 2); 3270 scr_erase_screen (2);
3195 rxvt_scr_change_screen(aR_ state); 3271 scr_change_screen (state);
3196 /* FALLTHROUGH */ 3272 /* FALLTHROUGH */
3197 default: 3273 default:
3198 break; 3274 break;
3199 } 3275 }
3200 } 3276 }
3201} 3277}
3202/*}}} */ 3278/*}}} */
3203 3279
3204/*{{{ process sgr sequences */ 3280/*{{{ process sgr sequences */
3205/* INTPROTO */
3206void 3281void
3207rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3208{ 3283{
3209 unsigned int i; 3284 unsigned int i;
3210 short rendset; 3285 short rendset;
3211 int rendstyle; 3286 int rendstyle;
3212 3287
3213 if (nargs == 0) { 3288 if (nargs == 0)
3214 rxvt_scr_rendition(aR_ 0, ~RS_None);
3215 return;
3216 } 3289 {
3290 scr_rendition (0, ~RS_None);
3291 return;
3292 }
3217 for (i = 0; i < nargs; i++) { 3293 for (i = 0; i < nargs; i++)
3294 {
3218 rendset = -1; 3295 rendset = -1;
3219 switch (arg[i]) { 3296 switch (arg[i])
3220 case 0: 3297 {
3298 case 0:
3221 rendset = 0, rendstyle = ~RS_None; 3299 rendset = 0, rendstyle = ~RS_None;
3222 break; 3300 break;
3223 case 1: 3301 case 1:
3224 rendset = 1, rendstyle = RS_Bold; 3302 rendset = 1, rendstyle = RS_Bold;
3225 break; 3303 break;
3226 case 4: 3304 case 4:
3227 rendset = 1, rendstyle = RS_Uline; 3305 rendset = 1, rendstyle = RS_Uline;
3228 break; 3306 break;
3229 case 5: 3307 case 5:
3230 rendset = 1, rendstyle = RS_Blink; 3308 rendset = 1, rendstyle = RS_Blink;
3231 break; 3309 break;
3232 case 7: 3310 case 7:
3233 rendset = 1, rendstyle = RS_RVid; 3311 rendset = 1, rendstyle = RS_RVid;
3234 break; 3312 break;
3235 case 22: 3313 case 22:
3236 rendset = 0, rendstyle = RS_Bold; 3314 rendset = 0, rendstyle = RS_Bold;
3237 break; 3315 break;
3238 case 24: 3316 case 24:
3239 rendset = 0, rendstyle = RS_Uline; 3317 rendset = 0, rendstyle = RS_Uline;
3240 break; 3318 break;
3241 case 25: 3319 case 25:
3242 rendset = 0, rendstyle = RS_Blink; 3320 rendset = 0, rendstyle = RS_Blink;
3243 break; 3321 break;
3244 case 27: 3322 case 27:
3245 rendset = 0, rendstyle = RS_RVid; 3323 rendset = 0, rendstyle = RS_RVid;
3246 break; 3324 break;
3247 } 3325 }
3248 if (rendset != -1) { 3326 if (rendset != -1)
3249 rxvt_scr_rendition(aR_ rendset, rendstyle); 3327 {
3328 scr_rendition (rendset, rendstyle);
3250 continue; /* for(;i;) */ 3329 continue; /* for (;i;) */
3251 } 3330 }
3252 3331
3253 switch (arg[i]) { 3332 switch (arg[i])
3254 case 30: 3333 {
3334 case 30:
3255 case 31: /* set fg color */ 3335 case 31: /* set fg color */
3256 case 32: 3336 case 32:
3257 case 33: 3337 case 33:
3258 case 34: 3338 case 34:
3259 case 35: 3339 case 35:
3260 case 36: 3340 case 36:
3261 case 37: 3341 case 37:
3262 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3263 Color_fg); 3343 Color_fg);
3264 break; 3344 break;
3265#ifdef TTY_256COLOR 3345#ifdef TTY_256COLOR
3266 case 38: 3346 case 38:
3267 if (nargs > i + 2 && arg[i + 1] == 5) { 3347 if (nargs > i + 2 && arg[i + 1] == 5)
3348 {
3268 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3269 Color_fg); 3350 Color_fg);
3270 i += 2; 3351 i += 2;
3271 } 3352 }
3272 break; 3353 break;
3273#endif 3354#endif
3274 case 39: /* default fg */ 3355 case 39: /* default fg */
3275 rxvt_scr_color(aR_ Color_fg, Color_fg); 3356 scr_color (Color_fg, Color_fg);
3276 break; 3357 break;
3277 3358
3278 case 40: 3359 case 40:
3279 case 41: /* set bg color */ 3360 case 41: /* set bg color */
3280 case 42: 3361 case 42:
3281 case 43: 3362 case 43:
3282 case 44: 3363 case 44:
3283 case 45: 3364 case 45:
3284 case 46: 3365 case 46:
3285 case 47: 3366 case 47:
3286 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3287 Color_bg); 3368 Color_bg);
3288 break; 3369 break;
3289#ifdef TTY_256COLOR 3370#ifdef TTY_256COLOR
3290 case 48: 3371 case 48:
3291 if (nargs > i + 2 && arg[i + 1] == 5) { 3372 if (nargs > i + 2 && arg[i + 1] == 5)
3373 {
3292 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3293 Color_bg); 3375 Color_bg);
3294 i += 2; 3376 i += 2;
3295 } 3377 }
3296 break; 3378 break;
3297#endif 3379#endif
3298 case 49: /* default bg */ 3380 case 49: /* default bg */
3299 rxvt_scr_color(aR_ Color_bg, Color_bg); 3381 scr_color (Color_bg, Color_bg);
3300 break; 3382 break;
3301 3383
3302#ifndef NO_BRIGHTCOLOR 3384#ifndef NO_BRIGHTCOLOR
3303 case 90: 3385 case 90:
3304 case 91: /* set bright fg color */ 3386 case 91: /* set bright fg color */
3305 case 92: 3387 case 92:
3306 case 93: 3388 case 93:
3307 case 94: 3389 case 94:
3308 case 95: 3390 case 95:
3309 case 96: 3391 case 96:
3310 case 97: 3392 case 97:
3311 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3312 Color_fg); 3394 Color_fg);
3313 break; 3395 break;
3314 case 100: 3396 case 100:
3315 case 101: /* set bright bg color */ 3397 case 101: /* set bright bg color */
3316 case 102: 3398 case 102:
3317 case 103: 3399 case 103:
3318 case 104: 3400 case 104:
3319 case 105: 3401 case 105:
3320 case 106: 3402 case 106:
3321 case 107: 3403 case 107:
3322 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3323 Color_bg); 3405 Color_bg);
3324 break; 3406 break;
3325#endif 3407#endif
3326 } 3408
3409 }
3327 } 3410 }
3328} 3411}
3329/*}}} */ 3412/*}}} */
3330 3413
3331/*{{{ process Rob Nation's own graphics mode sequences */ 3414/*{{{ process Rob Nation's own graphics mode sequences */
3332/* INTPROTO */
3333void 3415void
3334rxvt_process_graphics(pR) 3416rxvt_term::process_graphics ()
3335{ 3417{
3336 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3418 unsigned char ch, cmd = cmd_getc ();
3337 3419
3338#ifndef RXVT_GRAPHICS 3420 if (cmd == 'Q')
3339 if (cmd == 'Q') { /* query graphics */ 3421 { /* query graphics */
3340 R->tt_printf("\033G0\n"); /* no graphics */ 3422 tt_printf ("\033G0\n"); /* no graphics */
3341 return; 3423 return;
3342 } 3424 }
3343/* swallow other graphics sequences until terminating ':' */ 3425 /* swallow other graphics sequences until terminating ':' */
3344 do 3426 do
3345 ch = rxvt_cmd_getc(aR); 3427 ch = cmd_getc ();
3346 while (ch != ':'); 3428 while (ch != ':');
3347#else
3348 unsigned int nargs;
3349 int args[NGRX_PTS];
3350 unsigned char *text = NULL;
3351
3352 if (cmd == 'Q') { /* query graphics */
3353 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3354 return;
3355 }
3356 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3357 int neg;
3358
3359 ch = rxvt_cmd_getc(aR);
3360 neg = (ch == '-');
3361 if (neg || ch == '+')
3362 ch = rxvt_cmd_getc(aR);
3363
3364 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3365 args[nargs] = args[nargs] * 10 + (ch - '0');
3366 if (neg)
3367 args[nargs] = -args[nargs];
3368
3369 nargs++;
3370 args[nargs] = 0;
3371 if (ch != ';')
3372 break;
3373 }
3374
3375 if ((cmd == 'T') && (nargs >= 5)) {
3376 int i, len = args[4];
3377
3378 text = rxvt_malloc((len + 1) * sizeof(char));
3379
3380 if (text != NULL) {
3381 for (i = 0; i < len; i++)
3382 text[i] = rxvt_cmd_getc(aR);
3383 text[len] = '\0';
3384 }
3385 }
3386 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3387#endif
3388} 3429}
3389/*}}} */ 3430/*}}} */
3390 3431
3391/* ------------------------------------------------------------------------- */ 3432/* ------------------------------------------------------------------------- */
3392 3433
3393/* 3434/*
3394 * Send printf() formatted output to the command. 3435 * Send printf () formatted output to the command.
3395 * Only use for small amounts of data. 3436 * Only use for small amounts of data.
3396 */ 3437 */
3397void 3438void
3398rxvt_term::tt_printf (const char *fmt,...) 3439rxvt_term::tt_printf (const char *fmt,...)
3399{ 3440{
… …
3417 3458
3418 if (len) 3459 if (len)
3419 { 3460 {
3420 if (v_buflen == 0) 3461 if (v_buflen == 0)
3421 { 3462 {
3422 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3463 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3464
3423 if (written == len) 3465 if ((unsigned int)written == len)
3424 return; 3466 return;
3425 3467
3426 data += written; 3468 data += written;
3427 len -= written; 3469 len -= written;
3428 } 3470 }

Diff Legend

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