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.21 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.57 by pcg, Tue Feb 24 16:25:44 2004 UTC

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

Diff Legend

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