ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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