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.19 by pcg, Thu Dec 18 05:45:11 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.19 2003/12/18 05:45:11 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{
… …
696 SET_LOCALE (locale); 761 SET_LOCALE (locale);
697 762
698 flush (); 763 flush ();
699} 764}
700 765
766#ifdef CURSOR_BLINK
701void 767void
702rxvt_term::process_x_events ()
703{
704 do
705 {
706 XEvent xev;
707
708 XNextEvent (Xdisplay, &xev);
709
710#if defined(CURSOR_BLINK)
711 if ((Options & Opt_cursorBlink)
712 && xev.type == KeyPress)
713 {
714 if (hidden_cursor)
715 {
716 hidden_cursor = 0;
717 want_refresh = 1;
718 }
719
720 blink_ev.start (NOW + BLINK_INTERVAL);
721 }
722#endif
723
724#if defined(POINTER_BLANK)
725 if ((Options & Opt_pointerBlank)
726 && (pointerBlankDelay > 0))
727 {
728 if (xev.type == MotionNotify
729 || xev.type == ButtonPress
730 || xev.type == ButtonRelease)
731 if (hidden_pointer)
732 pointer_unblank ();
733
734 if (xev.type == KeyPress && hidden_pointer == 0)
735 pointer_blank ();
736 }
737#endif
738
739#ifdef USE_XIM
740 if (!XFilterEvent (&xev, xev.xany.window))
741#endif
742 rxvt_process_x_event (this, &xev);
743 }
744 while (XPending (Xdisplay));
745}
746
747void
748rxvt_term::blink_cb (time_watcher &w) 768rxvt_term::cursor_blink_cb (time_watcher &w)
749{ 769{
750 w.at += BLINK_INTERVAL;
751 hidden_cursor = !hidden_cursor; 770 hidden_cursor = !hidden_cursor;
752 want_refresh = 1; 771 want_refresh = 1;
753}
754 772
773 w.start (w.at + BLINK_INTERVAL);
774}
775#endif
776
777#ifdef TEXT_BLINK
755void 778void
756rxvt_term::x_cb (io_watcher &w, short revents) 779rxvt_term::text_blink_cb (time_watcher &w)
757{ 780{
758 SET_R (this); 781 if (scr_refresh_rend (RS_Blink, RS_Blink))
759 SET_LOCALE (locale); 782 {
760 783 hidden_text = !hidden_text;
761 process_x_events (); 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;
… …
839 if (ch == '\n') 865 if (ch == '\n')
840 { 866 {
841 nlines++; 867 nlines++;
842 refresh_count++; 868 refresh_count++;
843 869
844 if (!(Options & Opt_jumpScroll) 870 if (! (Options & Opt_jumpScroll)
845 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
846 { 872 {
847 refreshnow = true; 873 refreshnow = true;
848 flag = false; 874 flag = false;
849 ch = NOCHAR; 875 ch = NOCHAR;
850 break; 876 break;
851 } 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 }
852 } 886 }
853 887
854 if (str >= buf + BUFSIZ) 888 if (str >= buf + BUFSIZ)
855 { 889 {
856 ch = NOCHAR; 890 ch = NOCHAR;
857 break; 891 break;
858 } 892 }
859 } 893 }
860 } 894 }
861 895
862 rxvt_scr_add_lines (this, buf, nlines, str - buf); 896 scr_add_lines (buf, nlines, str - buf);
863 897
864 /* 898 /*
865 * 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
866 * 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.
867 * the number of pages between refreshes is refresh_limit, which 901 * the number of pages between refreshes is refresh_limit, which
… …
873 if (refreshnow) 907 if (refreshnow)
874 { 908 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
876 refresh_limit++; 910 refresh_limit++;
877 911
878 rxvt_scr_refresh (this, refresh_type); 912 scr_refresh (refresh_type);
879 } 913 }
880 914
881 } 915 }
882 else 916 else
883 { 917 {
884 switch (ch) 918 switch (ch)
885 { 919 {
886 default: 920 default:
887 rxvt_process_nonprinting (this, ch); 921 process_nonprinting (ch);
888 break; 922 break;
889 case C0_ESC: /* escape char */ 923 case C0_ESC: /* escape char */
890 rxvt_process_escape_seq (this); 924 process_escape_seq ();
891 break; 925 break;
892 /*case 0x9b: */ /* CSI */ 926 /*case 0x9b: */ /* CSI */
893 /* rxvt_process_csi_seq (this); */ 927 /* process_csi_seq (); */
894 } 928 }
895 929
896 ch = NOCHAR; 930 ch = NOCHAR;
897 } 931 }
898 } 932 }
… …
903// read the next character, currently handles UTF-8 937// read the next character, currently handles UTF-8
904// will probably handle all sorts of other stuff in the future 938// will probably handle all sorts of other stuff in the future
905uint32_t 939uint32_t
906rxvt_term::next_char () 940rxvt_term::next_char ()
907{ 941{
908 struct mbstate &s = mbstate;
909
910 while (cmdbuf_ptr < cmdbuf_endp) 942 while (cmdbuf_ptr < cmdbuf_endp)
911 { 943 {
912 uint8_t ch = *cmdbuf_ptr; 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
913
914 if (s.cnt)
915 {
916 if ((ch & 0xc0) == 0x80)
917 {
918 cmdbuf_ptr++;
919
920 /* continuation */
921 s.reg = (s.reg << 6) | (ch & 0x7f);
922
923 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
924 return s.reg;
925
926 continue;
927 }
928 else
929 {
930 s.cnt = 0;
931 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
932 }
933 }
934
935 if ((ch & 0xc0) == 0xc0)
936 {
937 cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
938 946
939 /* first byte */ 947 wchar_t wc;
940 s.orig = ch; /* for broken encodings */ 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
941 s.reg = ch; 949
942 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 950 if (len == (size_t)-2)
943 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 951 return NOCHAR;
944 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 952
945 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 953 if (len == (size_t)-1)
946 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
947 } 955
948 else 956 // assume wchar == unicode
949 { 957 cmdbuf_ptr += len;
950 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
951 return ch; 958 return wc;
952 }
953 } 959 }
954 960
955 return NOCHAR; 961 return NOCHAR;
956} 962}
957 963
958/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
959/* 965/*
960 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
961 * to the command. 967 * to the command.
962 */ 968 */
963/* INTPROTO */
964uint32_t 969uint32_t
965rxvt_cmd_getc(pR) 970rxvt_term::cmd_getc ()
966{ 971{
967 for (;;) 972 for (;;)
968 { 973 {
969 uint32_t c = R->next_char (); 974 uint32_t c = next_char ();
970 if (c != NOCHAR) 975 if (c != NOCHAR)
971 return c; 976 return c;
972 977
973 // incomplete sequences should occur rarely, still, a better solution 978 // incomplete sequences should occur rarely, still, a better solution
974 // would be preferred. either setjmp/longjmp or better design. 979 // would be preferred. either setjmp/longjmp or better design.
975 fcntl (R->cmd_fd, F_SETFL, 0); 980 fcntl (cmd_fd, F_SETFL, 0);
976 R->pty_fill (); 981 pty_fill ();
977 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
978 }
979
980#if 0
981#define TIMEOUT_USEC 5000
982 fd_set readfds;
983 int quick_timeout, select_res;
984 int want_motion_time, want_keypress_time;
985 struct timeval value;
986#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
987 struct timeval tp;
988#endif
989
990 for (;;) {
991 /* loop until we can return something */
992
993 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
994 R->tt_write(NULL, 0);
995
996#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
997 if (R->mouse_slip_wheel_speed) {
998 quick_timeout = 1;
999 if (!R->mouse_slip_wheel_delay--
1000 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
1001 abs(R->mouse_slip_wheel_speed))) {
1002 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1003 R->refresh_type |= SMOOTH_REFRESH;
1004 R->want_refresh = 1;
1005 } 983 }
1006 }
1007#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
1008#ifdef SELECTION_SCROLLING
1009 if (R->pending_scroll_selection) {
1010 quick_timeout = 1;
1011 if (!R->scroll_selection_delay--
1012 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1013 R->scroll_selection_lines)) {
1014 rxvt_selection_extend(aR_ R->selection_save_x,
1015 R->selection_save_y, R->selection_save_state);
1016 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1017 R->refresh_type |= SMOOTH_REFRESH;
1018 R->want_refresh = 1;
1019 }
1020 }
1021#endif
1022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1023 if (scrollbar_isUp() || scrollbar_isDn()) {
1024 quick_timeout = 1;
1025 if (!R->scroll_arrow_delay--
1026 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1027 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1028 R->refresh_type |= SMOOTH_REFRESH;
1029 R->want_refresh = 1;
1030 }
1031 }
1032#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1033
1034#ifdef TRANSPARENT
1035 quick_timeout |= R->want_full_refresh;
1036#endif
1037#endif
1038} 984}
1039 985
986#ifdef POINTER_BLANK
1040void 987void
1041rxvt_term::pointer_unblank () 988rxvt_term::pointer_unblank ()
1042{ 989{
1043 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1044 recolour_cursor (); 991 recolour_cursor ();
1045 992
1046#ifdef POINTER_BLANK
1047 hidden_pointer = 0; 993 hidden_pointer = 0;
1048 994
1049 if (Options & Opt_pointerBlank) 995 if (Options & Opt_pointerBlank)
1050 pointer_ev.start (NOW + pointerBlankDelay); 996 pointer_ev.start (NOW + pointerBlankDelay);
1051#endif
1052} 997}
1053 998
1054#ifdef POINTER_BLANK
1055void 999void
1056rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1057{ 1001{
1058 pointer_ev.stop ();
1059
1060 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1061 return; 1003 return;
1062 1004
1063 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1064 XFlush (Xdisplay); 1006 XFlush (display->display);
1065 1007
1066 hidden_pointer = 1; 1008 hidden_pointer = 1;
1067} 1009}
1068 1010
1069void 1011void
… …
1074 1016
1075 pointer_blank (); 1017 pointer_blank ();
1076} 1018}
1077#endif 1019#endif
1078 1020
1079/* INTPROTO */
1080void 1021void
1081rxvt_mouse_report(pR_ const XButtonEvent *ev) 1022rxvt_term::mouse_report (const XButtonEvent &ev)
1082{ 1023{
1083 int button_number, key_state = 0; 1024 int button_number, key_state = 0;
1084 int x, y; 1025 int x, y;
1085 1026
1086 x = ev->x; 1027 x = ev.x;
1087 y = ev->y; 1028 y = ev.y;
1088 rxvt_pixel_position(aR_ &x, &y); 1029 pixel_position (&x, &y);
1089 1030
1090 if (R->MEvent.button == AnyButton) { 1031 if (MEvent.button == AnyButton)
1032 {
1091 button_number = 3; 1033 button_number = 3;
1092 } else { 1034 }
1035 else
1036 {
1093 button_number = R->MEvent.button - Button1; 1037 button_number = MEvent.button - Button1;
1094 /* add 0x3D for wheel events, like xterm does */ 1038 /* add 0x3D for wheel events, like xterm does */
1095 if (button_number >= 3) 1039 if (button_number >= 3)
1096 button_number += (64 - 3); 1040 button_number += (64 - 3);
1097 } 1041 }
1098 1042
1099 if (R->PrivateModes & PrivMode_MouseX10) { 1043 if (PrivateModes & PrivMode_MouseX10)
1044 {
1100 /* 1045 /*
1101 * do not report ButtonRelease 1046 * do not report ButtonRelease
1102 * no state info allowed 1047 * no state info allowed
1103 */ 1048 */
1104 key_state = 0; 1049 key_state = 0;
1105 if (button_number == 3) 1050 if (button_number == 3)
1106 return; 1051 return;
1107 } else { 1052 }
1053 else
1054 {
1108 /* XTerm mouse reporting needs these values: 1055 /* XTerm mouse reporting needs these values:
1109 * 4 = Shift 1056 * 4 = Shift
1110 * 8 = Meta 1057 * 8 = Meta
1111 * 16 = Control 1058 * 16 = Control
1112 * plus will add in our own Double-Click reporting 1059 * plus will add in our own Double-Click reporting
1113 * 32 = Double Click 1060 * 32 = Double Click
1114 */ 1061 */
1115 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1062 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1116 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1063 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1117 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1064 + ((MEvent.state & ControlMask) ? 16 : 0);
1118#ifdef MOUSE_REPORT_DOUBLECLICK 1065#ifdef MOUSE_REPORT_DOUBLECLICK
1119 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1066 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1120#endif 1067#endif
1068
1121 } 1069 }
1122 1070
1123#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1124 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1125 if (key_state & 16) 1073 if (key_state & 16)
1126 fputc('C', stderr); 1074 fputc ('C', stderr);
1127 if (key_state & 4) 1075 if (key_state & 4)
1128 fputc('S', stderr); 1076 fputc ('S', stderr);
1129 if (key_state & 8) 1077 if (key_state & 8)
1130 fputc('A', stderr); 1078 fputc ('A', stderr);
1131 if (key_state & 32) 1079 if (key_state & 32)
1132 fputc('2', stderr); 1080 fputc ('2', stderr);
1133 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1134 button_number, 1082 button_number,
1135 x + 1, 1083 x + 1,
1136 y + 1); 1084 y + 1);
1137#else 1085#else
1138 R->tt_printf("\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1139 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1140 (32 + x + 1), 1088 (32 + x + 1),
1141 (32 + y + 1)); 1089 (32 + y + 1));
1142#endif 1090#endif
1143} 1091}
1144 1092
1145#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1146/* EXTPROTO */
1147void 1094void
1148rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1149{ 1096{
1150 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1151 1098
1152 rxvt_process_x_event(aR_ ev); 1099 x_cb (*ev);
1153} 1100}
1154#endif 1101#endif
1155 1102
1156/*{{{ process an X event */ 1103/*{{{ process an X event */
1157/* INTPROTO */
1158void 1104void
1159rxvt_process_x_event(pR_ XEvent *ev) 1105rxvt_term::x_cb (XEvent &ev)
1160{ 1106{
1161 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
1162 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1163 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1164 unsigned int unused_mask; 1144 unsigned int unused_mask;
1165 1145
1166#ifdef DEBUG_X 1146#ifdef DEBUG_X
1167 const char *const eventnames[] = 1147 const char *const eventnames[] =
1168 { /* mason - this matches my system */ 1148 { /* mason - this matches my system */
1169 "", 1149 "",
1170 "", 1150 "",
1171 "KeyPress", 1151 "KeyPress",
1172 "KeyRelease", 1152 "KeyRelease",
1173 "ButtonPress", 1153 "ButtonPress",
1174 "ButtonRelease", 1154 "ButtonRelease",
1175 "MotionNotify", 1155 "MotionNotify",
1176 "EnterNotify", 1156 "EnterNotify",
1177 "LeaveNotify", 1157 "LeaveNotify",
1178 "FocusIn", 1158 "FocusIn",
1179 "FocusOut", 1159 "FocusOut",
1180 "KeymapNotify", 1160 "KeymapNotify",
1181 "Expose", 1161 "Expose",
1182 "GraphicsExpose", 1162 "GraphicsExpose",
1183 "NoExpose", 1163 "NoExpose",
1184 "VisibilityNotify", 1164 "VisibilityNotify",
1185 "CreateNotify", 1165 "CreateNotify",
1186 "DestroyNotify", 1166 "DestroyNotify",
1187 "UnmapNotify", 1167 "UnmapNotify",
1188 "MapNotify", 1168 "MapNotify",
1189 "MapRequest", 1169 "MapRequest",
1190 "ReparentNotify", 1170 "ReparentNotify",
1191 "ConfigureNotify", 1171 "ConfigureNotify",
1192 "ConfigureRequest", 1172 "ConfigureRequest",
1193 "GravityNotify", 1173 "GravityNotify",
1194 "ResizeRequest", 1174 "ResizeRequest",
1195 "CirculateNotify", 1175 "CirculateNotify",
1196 "CirculateRequest", 1176 "CirculateRequest",
1197 "PropertyNotify", 1177 "PropertyNotify",
1198 "SelectionClear", 1178 "SelectionClear",
1199 "SelectionRequest", 1179 "SelectionRequest",
1200 "SelectionNotify", 1180 "SelectionNotify",
1201 "ColormapNotify", 1181 "ColormapNotify",
1202 "ClientMessage", 1182 "ClientMessage",
1203 "MappingNotify" 1183 "MappingNotify"
1204 }; 1184 };
1205#endif 1185#endif
1206 1186
1207#ifdef DEBUG_X 1187#ifdef DEBUG_X
1208 struct timeval tp; 1188 struct timeval tp;
1209 struct tm *ltt; 1189 struct tm *ltt;
1210 (void)gettimeofday(&tp, NULL); 1190 (void)gettimeofday (&tp, NULL);
1211 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime (& (tp.tv_sec));
1212 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));
1213#endif 1193#endif
1214 1194
1215 switch (ev->type) { 1195 switch (ev.type)
1196 {
1216 case KeyPress: 1197 case KeyPress:
1217 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1198 lookup_key (ev.xkey);
1218 break; 1199 break;
1219 1200
1220#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1221 case KeyRelease: 1202 case KeyRelease:
1222 { 1203 {
1223 if (!(ev->xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1224 R->mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1225 else { 1206 else
1226 KeySym ks; 1207 {
1227 1208 KeySym ks;
1209
1228 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1229 if (ks == XK_Control_L || ks == XK_Control_R) 1211 if (ks == XK_Control_L || ks == XK_Control_R)
1230 R->mouse_slip_wheel_speed = 0; 1212 mouse_slip_wheel_speed = 0;
1231 } 1213 }
1232 break; 1214 break;
1233 } 1215 }
1234#endif 1216#endif
1235 1217
1236 case ButtonPress: 1218 case ButtonPress:
1237 rxvt_button_press(aR_ (XButtonEvent *)ev); 1219 button_press (ev.xbutton);
1238 break; 1220 break;
1239 1221
1240 case ButtonRelease: 1222 case ButtonRelease:
1241 rxvt_button_release(aR_ (XButtonEvent *)ev); 1223 button_release (ev.xbutton);
1242 break; 1224 break;
1243 1225
1244 case ClientMessage: 1226 case ClientMessage:
1245 if (ev->xclient.format == 32 1227 if (ev.xclient.format == 32
1246 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1247 R->destroy (); 1229 destroy ();
1248#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1249 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1250 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1251 && (ev->xclient.data.l[0] == DndFile 1233 && (ev.xclient.data.l[0] == DndFile
1252 || ev->xclient.data.l[0] == DndDir 1234 || ev.xclient.data.l[0] == DndDir
1253 || ev->xclient.data.l[0] == DndLink)) { 1235 || ev.xclient.data.l[0] == DndLink))
1254 /* Get Dnd data */ 1236 {
1237 /* Get Dnd data */
1255 Atom ActualType; 1238 Atom ActualType;
1256 int ActualFormat; 1239 int ActualFormat;
1257 unsigned char *data; 1240 unsigned char *data;
1258 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1259 1242
1260 XGetWindowProperty(R->Xdisplay, Xroot, 1243 XGetWindowProperty (display->display, display->root,
1261 R->xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1262 0L, 1000000L, 1245 0L, 1000000L,
1263 False, AnyPropertyType, 1246 False, AnyPropertyType,
1264 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1265 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1266 &data); 1249 &data);
1267 XChangeProperty(R->Xdisplay, Xroot, 1250 XChangeProperty (display->display, display->root,
1268 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1269 8, PropModeReplace, 1252 8, PropModeReplace,
1270 data, STRLEN(data)); 1253 data, STRLEN (data));
1271 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1272 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1273 } 1256 }
1274#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1275 break; 1258 break;
1276 1259
1277 case MappingNotify: 1260 case MappingNotify:
1278 XRefreshKeyboardMapping(&(ev->xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1279 break; 1262 break;
1280 1263
1281 /* 1264 /*
1282 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1283 * Here's my conclusion: 1266 * Here's my conclusion:
1284 * If the window is completely unobscured, use bitblt's 1267 * If the window is completely unobscured, use bitblt's
1285 * to scroll. Even then, they're only used when doing partial 1268 * to scroll. Even then, they're only used when doing partial
1286 * screen scrolling. When partially obscured, we have to fill 1269 * screen scrolling. When partially obscured, we have to fill
1287 * in the GraphicsExpose parts, which means that after each refresh, 1270 * in the GraphicsExpose parts, which means that after each refresh,
1288 * we need to wait for the graphics expose or Noexpose events, 1271 * we need to wait for the graphics expose or Noexpose events,
1289 * which ought to make things real slow! 1272 * which ought to make things real slow!
1290 */ 1273 */
1291 case VisibilityNotify: 1274 case VisibilityNotify:
1292 switch (ev->xvisibility.state) 1275 switch (ev.xvisibility.state)
1293 { 1276 {
1294 case VisibilityUnobscured: 1277 case VisibilityUnobscured:
1295 R->refresh_type = FAST_REFRESH; 1278 refresh_type = FAST_REFRESH;
1296 break; 1279 break;
1297 case VisibilityPartiallyObscured: 1280 case VisibilityPartiallyObscured:
1298 R->refresh_type = SLOW_REFRESH; 1281 refresh_type = SLOW_REFRESH;
1299 break; 1282 break;
1300 default: 1283 default:
1301 R->refresh_type = NO_REFRESH; 1284 refresh_type = NO_REFRESH;
1302 break; 1285 break;
1303 } 1286 }
1304 break; 1287 break;
1305 1288
1306 case FocusIn: 1289 case FocusIn:
1307 if (!R->TermWin.focus) { 1290 if (!TermWin.focus)
1308 R->TermWin.focus = 1; 1291 {
1309 R->want_refresh = 1; 1292 TermWin.focus = 1;
1293 want_refresh = 1;
1310#ifdef USE_XIM 1294#ifdef USE_XIM
1311 if (R->Input_Context != NULL) 1295 if (Input_Context != NULL)
1312 XSetICFocus(R->Input_Context); 1296 XSetICFocus (Input_Context);
1313#endif 1297#endif
1314#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1315 if (R->Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1316 R->blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1317#endif 1301#endif
1318 }
1319 break;
1320 1302
1303 }
1304 break;
1305
1321 case FocusOut: 1306 case FocusOut:
1322 if (R->TermWin.focus) { 1307 if (TermWin.focus)
1323 R->TermWin.focus = 0; 1308 {
1324 R->want_refresh = 1; 1309 TermWin.focus = 0;
1310 want_refresh = 1;
1325#ifdef USE_XIM 1311#ifdef USE_XIM
1326 if (R->Input_Context != NULL) 1312 if (Input_Context != NULL)
1327 XUnsetICFocus(R->Input_Context); 1313 XUnsetICFocus (Input_Context);
1328#endif 1314#endif
1329#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1330 if (R->Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1331 R->blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1332 R->hidden_cursor = 0; 1318 hidden_cursor = 0;
1333#endif 1319#endif
1334 }
1335 break;
1336 1320
1321 }
1322 break;
1323
1337 case ConfigureNotify: 1324 case ConfigureNotify:
1338 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1325 if (ev.xconfigure.window == TermWin.parent[0])
1339 int height, width; 1326 {
1327 int height, width;
1340 1328
1329 do
1341 do { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1342 width = ev->xconfigure.width; 1331 width = ev.xconfigure.width;
1343 height = ev->xconfigure.height; 1332 height = ev.xconfigure.height;
1344 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1345 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1334 }
1346 ConfigureNotify, ev)); 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1347 if (R->szHint.width != width || R->szHint.height != height) { 1337 if (szHint.width != width || szHint.height != height)
1338 {
1348 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));
1349 rxvt_resize_all_windows(aR_ (unsigned int)width, 1340 resize_all_windows (width, height, 1);
1350 (unsigned int)height, 1); 1341 }
1351 }
1352#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1353 else { 1343 else
1344 {
1354 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1355 } 1346 }
1356#endif 1347#endif
1357#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1358 if (R->Options & Opt_transparent) { 1349 if (Options & Opt_transparent)
1359 rxvt_check_our_parents(aR); 1350 {
1360 if (R->am_transparent) 1351 check_our_parents ();
1361 R->want_full_refresh = 1; 1352 if (am_transparent)
1362 } 1353 want_full_refresh = 1;
1354 }
1363#endif 1355#endif
1364 }
1365 break;
1366 1356
1357 }
1358 break;
1359
1367 case SelectionClear: 1360 case SelectionClear:
1368 rxvt_selection_clear(aR); 1361 display->set_selection_owner (0);
1369 break; 1362 break;
1370 1363
1371 case SelectionNotify: 1364 case SelectionNotify:
1372 if (R->selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1373 rxvt_selection_paste(aR_ ev->xselection.requestor, 1366 selection_paste (ev.xselection.requestor,
1374 ev->xselection.property, True); 1367 ev.xselection.property, True);
1375 break; 1368 break;
1376 1369
1377 case SelectionRequest: 1370 case SelectionRequest:
1378 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1371 selection_send (ev.xselectionrequest);
1379 break; 1372 break;
1380 1373
1381 case UnmapNotify: 1374 case UnmapNotify:
1382 R->TermWin.mapped = 0; 1375 TermWin.mapped = 0;
1383 break; 1376#ifdef TEXT_BLINK
1377 text_blink_ev.stop ();
1378#endif
1379 break;
1384 1380
1385 case MapNotify: 1381 case MapNotify:
1386 R->TermWin.mapped = 1; 1382 TermWin.mapped = 1;
1387 break; 1383#ifdef TEXT_BLINK
1388 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389 case PropertyNotify: 1385#endif
1390 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1391 if (ev->xproperty.state == PropertyNewValue)
1392 rxvt_selection_property(aR_ ev->xproperty.window,
1393 ev->xproperty.atom);
1394 break; 1386 break;
1395 } 1387
1396#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1397 /*
1398 * if user used some Esetroot compatible prog to set the root bg,
1399 * use the property to determine the pixmap. We use it later on.
1400 */
1401 if (R->xa[XA_XROOTPMAPID] == 0)
1402 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1403 "_XROOTPMAP_ID", False);
1404 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1405 break;
1406 /* FALLTHROUGH */
1407 case ReparentNotify: 1389 case ReparentNotify:
1408 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1390 rootwin_cb (ev);
1409 if (R->am_transparent) 1391 break;
1410 R->want_full_refresh = 1;
1411 }
1412#endif /* TRANSPARENT */ 1392#endif /* TRANSPARENT */
1413 break;
1414 1393
1415 case GraphicsExpose: 1394 case GraphicsExpose:
1416 case Expose: 1395 case Expose:
1417 if (ev->xany.window == R->TermWin.vt) { 1396 if (ev.xany.window == TermWin.vt)
1397 {
1418#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1419 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1399 scr_expose (ev.xexpose.x, ev.xexpose.y,
1420 ev->xexpose.width, ev->xexpose.height, False); 1400 ev.xexpose.width, ev.xexpose.height, False);
1421#else 1401#else
1422 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1423 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1424 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1425 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1405 //scr_expose (ev.xexpose.x, 0,
1426 // ev->xexpose.width, R->TermWin.height, False); 1406 // ev.xexpose.width, TermWin.height, False);
1427#endif 1407#endif
1428 R->want_refresh = 1; 1408 want_refresh = 1;
1429 } else { 1409 }
1430 XEvent unused_xevent; 1410 else
1411 {
1412 XEvent unused_event;
1431 1413
1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1433 Expose, 1415 Expose,
1434 &unused_xevent)) ; 1416 &unused_event)) ;
1435 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1436 GraphicsExpose, 1418 GraphicsExpose,
1437 &unused_xevent)) ; 1419 &unused_event)) ;
1438 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow (ev.xany.window))
1439 R->scrollBar.setIdle(); 1421 {
1440 rxvt_scrollbar_show(aR_ 0); 1422 scrollBar.setIdle ();
1441 } 1423 scrollbar_show (0);
1424 }
1442#ifdef MENUBAR 1425#ifdef MENUBAR
1443 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1444 rxvt_menubar_expose(aR); 1427 menubar_expose ();
1445#endif 1428#endif
1446#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1447 rxvt_Gr_expose(aR_ ev->xany.window); 1430 Gr_expose (ev.xany.window);
1448#endif 1431#endif
1449 }
1450 break;
1451 1432
1433 }
1434 break;
1435
1452 case MotionNotify: 1436 case MotionNotify:
1453#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1454 if (R->hidden_pointer) 1438 if (hidden_pointer)
1455 R->pointer_unblank (); 1439 pointer_unblank ();
1456#endif 1440#endif
1457#if MENUBAR 1441#if MENUBAR
1458 if (isMenuBarWindow(ev->xany.window)) { 1442 if (isMenuBarWindow (ev.xany.window))
1459 rxvt_menubar_control(aR_ &(ev->xbutton)); 1443 {
1460 break; 1444 menubar_control (& (ev.xbutton));
1461 } 1445 break;
1446 }
1462#endif 1447#endif
1463 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1464 break; 1449 break;
1465 1450
1466 if (ev->xany.window == R->TermWin.vt) { 1451 if (ev.xany.window == TermWin.vt)
1452 {
1467 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1468 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1454 {
1469 MotionNotify, ev)) ; 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1470 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1456 ;
1471 &unused_root, &unused_child, 1457
1472 &unused_root_x, &unused_root_y, 1458 XQueryPointer (display->display, TermWin.vt,
1473 &(ev->xbutton.x), &(ev->xbutton.y), 1459 &unused_root, &unused_child,
1474 &unused_mask); 1460 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y),
1462 &unused_mask);
1475#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1476 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1477 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 {
1478#endif 1467#endif
1479 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1480 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1481#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1482 if (ev->xbutton.y<R->TermWin.int_bwidth || 1471 if (ev.xbutton.y < TermWin.int_bwidth
1483 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1484 int dist; 1473 {
1485 1474 int dist;
1486 R->pending_scroll_selection=1; 1475
1487 1476 pending_scroll_selection=1;
1477
1488 /* don't clobber the current delay if we are 1478 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1479 * already in the middle of scrolling.
1490 */ 1480 */
1491 if (R->scroll_selection_delay<=0) 1481 if (scroll_selection_delay<=0)
1492 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1493 1483
1494 /* save the event params so we can highlight 1484 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1485 * the selection in the pending-scroll loop
1496 */ 1486 */
1497 R->selection_save_x=ev->xbutton.x; 1487 selection_save_x=ev.xbutton.x;
1498 R->selection_save_y=ev->xbutton.y; 1488 selection_save_y=ev.xbutton.y;
1499 R->selection_save_state= 1489 selection_save_state=
1500 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1490 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501 1491
1502 /* calc number of lines to scroll */ 1492 /* calc number of lines to scroll */
1503 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1493 if (ev.xbutton.y<TermWin.int_bwidth)
1504 R->scroll_selection_dir = UP; 1494 {
1505 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1495 scroll_selection_dir = UP;
1506 } 1496 dist = TermWin.int_bwidth - ev.xbutton.y;
1507 else { 1497 }
1508 R->scroll_selection_dir = DN; 1498 else
1509 dist = ev->xbutton.y - 1499 {
1510 (R->TermWin.int_bwidth + R->TermWin.height); 1500 scroll_selection_dir = DN;
1511 } 1501 dist = ev.xbutton.y -
1512 R->scroll_selection_lines=(Pixel2Height(dist)/ 1502 (TermWin.int_bwidth + TermWin.height);
1513 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1503 }
1514 MIN_IT(R->scroll_selection_lines, 1504 scroll_selection_lines= (Pixel2Height (dist)/
1515 SELECTION_SCROLL_MAX_LINES); 1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 } 1506 MIN_IT (scroll_selection_lines,
1517 else { 1507 SELECTION_SCROLL_MAX_LINES);
1508 }
1509 else
1510 {
1518 /* we are within the text window, so we 1511 /* we are within the text window, so we
1519 * shouldn't be scrolling 1512 * shouldn't be scrolling
1520 */ 1513 */
1521 R->pending_scroll_selection = 0; 1514 pending_scroll_selection = 0;
1522 } 1515 }
1523#endif 1516#endif
1524#ifdef MOUSE_THRESHOLD 1517#ifdef MOUSE_THRESHOLD
1525 } 1518
1519 }
1526#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;
1527 } 1540 }
1528 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1529 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1530 MotionNotify, ev)) ;
1531 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1532 &unused_root, &unused_child,
1533 &unused_root_x, &unused_root_y,
1534 &(ev->xbutton.x), &(ev->xbutton.y),
1535 &unused_mask);
1536 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1537 scrollbar_size());
1538 rxvt_scr_refresh(aR_ R->refresh_type);
1539 R->refresh_limit = 0;
1540 rxvt_scrollbar_show(aR_ 1);
1541 }
1542 break;
1543 }
1544} 1541}
1545 1542
1546/* INTPROTO */
1547void 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
1548rxvt_button_press(pR_ XButtonEvent *ev) 1583rxvt_term::button_press (const XButtonEvent &ev)
1549{ 1584{
1550 int reportmode = 0, clickintime; 1585 int reportmode = 0, clickintime;
1551 1586
1552 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1553 if (!R->bypass_keystate) 1588 if (!bypass_keystate)
1554 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1555/* 1590 /*
1556 * VT window processing of button press 1591 * VT window processing of button press
1557 */ 1592 */
1558 if (ev->window == R->TermWin.vt) 1593 if (ev.window == TermWin.vt)
1559 { 1594 {
1560#if RXVT_GRAPHICS 1595#if RXVT_GRAPHICS
1561 if (ev->subwindow != None) 1596 if (ev.subwindow != None)
1562 rxvt_Gr_ButtonPress (ev->x, ev->y); 1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1563 else 1598 else
1564#endif 1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode)
1565 { 1604 {
1566 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
1567 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)
1568 { 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 {
1569 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1570 /* save the xbutton state (for ButtonRelease) */ 1861 /* don't report release of wheel "buttons" */
1571 R->MEvent.state = ev->state; 1862 if (ev.button >= 4)
1863 return;
1572#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1573 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)))
1574 { 1870 {
1575 /* same button, within alloted time */ 1871 MEvent.clicks = 0;
1576 R->MEvent.clicks++; 1872 MEvent.button = AnyButton;
1577 if (R->MEvent.clicks > 1) 1873 mouse_report (ev);
1578 {
1579 /* only report double clicks */
1580 R->MEvent.clicks = 2;
1581 rxvt_mouse_report(aR_ ev);
1582
1583 /* don't report the release */
1584 R->MEvent.clicks = 0;
1585 R->MEvent.button = AnyButton;
1586 }
1587 }
1588 else
1589 { 1874 }
1590 /* different button, or time expired */ 1875#else /* MOUSE_REPORT_DOUBLECLICK */
1591 R->MEvent.clicks = 1; 1876 MEvent.button = AnyButton;
1592 R->MEvent.button = ev->button; 1877 mouse_report (ev);
1593 rxvt_mouse_report(aR_ ev);
1594 }
1595#else
1596 R->MEvent.button = ev->button;
1597 rxvt_mouse_report(aR_ ev);
1598#endif /* MOUSE_REPORT_DOUBLECLICK */ 1878#endif /* MOUSE_REPORT_DOUBLECLICK */
1599 }
1600 else
1601 { 1879 return;
1602 if (ev->button != R->MEvent.button)
1603 R->MEvent.clicks = 0;
1604 switch (ev->button)
1605 {
1606 case Button1:
1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->MEvent.clicks++;
1609 else
1610 R->MEvent.clicks = 1;
1611 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1612 R->MEvent.button = Button1;
1613 break;
1614
1615 case Button3:
1616 if (R->MEvent.button == Button3 && clickintime)
1617 rxvt_selection_rotate(aR_ ev->x, ev->y);
1618 else
1619 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1620 R->MEvent.button = Button3;
1621 break;
1622 } 1880 }
1623 }
1624 R->MEvent.time = ev->time;
1625 return;
1626 }
1627 }
1628
1629/*
1630 * Scrollbar window processing of button press
1631 */
1632 if (isScrollbarWindow(ev->window))
1633 {
1634 R->scrollBar.setIdle ();
1635 /*
1636 * Rxvt-style scrollbar:
1637 * move up if mouse is above slider
1638 * move dn if mouse is below slider
1639 *
1640 * XTerm-style scrollbar:
1641 * Move display proportional to pointer location
1642 * pointer near top -> scroll one line
1643 * pointer near bot -> scroll full page
1644 */
1645#ifndef NO_SCROLLBAR_REPORT
1646 if (reportmode) {
1647 /*
1648 * Mouse report disabled scrollbar:
1649 * arrow buttons - send up/down
1650 * click on scrollbar - send pageup/down
1651 */
1652 if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_upButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_upButton(ev->y)))
1656 R->tt_printf("\033[A");
1657 else if ((R->scrollBar.style == R_SB_NEXT
1658 && scrollbarnext_dnButton(ev->y))
1659 || (R->scrollBar.style == R_SB_RXVT
1660 && scrollbarrxvt_dnButton(ev->y)))
1661 R->tt_printf("\033[B");
1662 else
1663 switch (ev->button) {
1664 case Button2:
1665 R->tt_printf("\014");
1666 break;
1667 case Button1:
1668 R->tt_printf("\033[6~");
1669 break;
1670 case Button3:
1671 R->tt_printf("\033[5~");
1672 break;
1673 }
1674 }
1675 else
1676#endif /* NO_SCROLLBAR_REPORT */
1677 {
1678 char upordown = 0;
1679
1680 if (R->scrollBar.style == R_SB_NEXT) {
1681 if (scrollbarnext_upButton(ev->y))
1682 upordown = -1; /* up */
1683 else if (scrollbarnext_dnButton(ev->y))
1684 upordown = 1; /* down */
1685 } else if (R->scrollBar.style == R_SB_RXVT) {
1686 if (scrollbarrxvt_upButton(ev->y))
1687 upordown = -1; /* up */
1688 else if (scrollbarrxvt_dnButton(ev->y))
1689 upordown = 1; /* down */
1690 }
1691 if (upordown) {
1692#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1693 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1694#endif
1695 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1696 if (upordown < 0)
1697 R->scrollBar.setUp ();
1698 else
1699 R->scrollBar.setDn ();
1700 }
1701 } else
1702 switch (ev->button) {
1703 case Button2:
1704 switch (R->scrollbar_align) {
1705 case R_SB_ALIGN_TOP:
1706 R->csrO = 0;
1707 break;
1708 case R_SB_ALIGN_CENTRE:
1709 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1710 break;
1711 case R_SB_ALIGN_BOTTOM:
1712 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1713 break;
1714 }
1715 if (R->scrollBar.style == R_SB_XTERM
1716 || scrollbar_above_slider(ev->y)
1717 || scrollbar_below_slider(ev->y))
1718 rxvt_scr_move_to(aR_
1719 scrollbar_position(ev->y) - R->csrO,
1720 scrollbar_size());
1721 R->scrollBar.setMotion ();
1722 break;
1723
1724 case Button1:
1725 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1726 R->csrO = ev->y - R->scrollBar.top;
1727 /* FALLTHROUGH */
1728
1729 case Button3:
1730 if (R->scrollBar.style != R_SB_XTERM) {
1731 if (scrollbar_above_slider(ev->y))
1732# ifdef RXVT_SCROLL_FULL
1733 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1734# else
1735 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1736# endif
1737 else if (scrollbar_below_slider(ev->y))
1738# ifdef RXVT_SCROLL_FULL
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1740# else
1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1742# endif
1743 else
1744 R->scrollBar.setMotion ();
1745 } else {
1746 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1747 (R->TermWin.nrow
1748 * scrollbar_position(ev->y)
1749 / scrollbar_size()));
1750 }
1751 break;
1752 }
1753 }
1754 return;
1755 }
1756#if MENUBAR
1757 /*
1758 * Menubar window processing of button press
1759 */
1760 if (isMenuBarWindow(ev->window))
1761 rxvt_menubar_control(aR_ ev);
1762#endif
1763}
1764
1765/* INTPROTO */
1766void
1767rxvt_button_release(pR_ XButtonEvent *ev)
1768{
1769 int reportmode = 0;
1770
1771 R->csrO = 0; /* reset csr Offset */
1772 if (!R->bypass_keystate)
1773 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1774
1775 if (scrollbar_isUpDn()) {
1776 R->scrollBar.setIdle ();
1777 rxvt_scrollbar_show(aR_ 0);
1778#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1779 R->refresh_type &= ~SMOOTH_REFRESH;
1780#endif
1781 }
1782#ifdef SELECTION_SCROLLING
1783 R->pending_scroll_selection=0;
1784#endif
1785 if (ev->window == R->TermWin.vt)
1786 {
1787#ifdef RXVT_GRAPHICS
1788 if (ev->subwindow != None)
1789 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1790 else
1791#endif
1792 { 1881 /*
1793 if (reportmode)
1794 {
1795 /* mouse report from vt window */
1796 /* don't report release of wheel "buttons" */
1797 if (ev->button >= 4)
1798 return;
1799#ifdef MOUSE_REPORT_DOUBLECLICK
1800 /* only report the release of 'slow' single clicks */
1801 if (R->MEvent.button != AnyButton
1802 && (ev->button != R->MEvent.button
1803 || (ev->time - R->MEvent.time
1804 > MULTICLICK_TIME / 2)))
1805 {
1806 R->MEvent.clicks = 0;
1807 R->MEvent.button = AnyButton;
1808 rxvt_mouse_report(aR_ ev);
1809 }
1810#else /* MOUSE_REPORT_DOUBLECLICK */
1811 R->MEvent.button = AnyButton;
1812 rxvt_mouse_report(aR_ ev);
1813#endif /* MOUSE_REPORT_DOUBLECLICK */
1814 return;
1815 }
1816 /*
1817 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1818 * when overriding mouse reporting 1883 * when overriding mouse reporting
1819 */ 1884 */
1820 if (R->PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1821 && R->bypass_keystate 1886 && bypass_keystate
1822 && ev->button == Button1 && R->MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1823 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1824 1889
1825 switch (ev->button) { 1890 switch (ev.button)
1891 {
1826 case Button1: 1892 case Button1:
1827 case Button3: 1893 case Button3:
1828 rxvt_selection_make(aR_ ev->time); 1894 selection_make (ev.time);
1829 break; 1895 break;
1830 case Button2: 1896 case Button2:
1831 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1897 selection_request (ev.time, ev.x, ev.y);
1832 break; 1898 break;
1833#ifdef MOUSE_WHEEL 1899#ifdef MOUSE_WHEEL
1834 case Button4: 1900 case Button4:
1835 case Button5: 1901 case Button5:
1836 { 1902 {
1837 int i; 1903 int i;
1838 page_dirn v; 1904 page_dirn v;
1839 1905
1840 v = (ev->button == Button4) ? UP : DN; 1906 v = (ev.button == Button4) ? UP : DN;
1841 if (ev->state & ShiftMask) 1907 if (ev.state & ShiftMask)
1842 i = 1; 1908 i = 1;
1843 else if ((R->Options & Opt_mouseWheelScrollPage)) 1909 else if ((Options & Opt_mouseWheelScrollPage))
1844 i = R->TermWin.nrow - 1; 1910 i = TermWin.nrow - 1;
1845 else 1911 else
1846 i = 5; 1912 i = 5;
1847# ifdef MOUSE_SLIP_WHEELING 1913# ifdef MOUSE_SLIP_WHEELING
1848 if (ev->state & ControlMask) 1914 if (ev.state & ControlMask)
1849 { 1915 {
1850 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1851 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1852 } 1918 }
1853# endif 1919# endif
1854# ifdef JUMP_MOUSE_WHEEL 1920# ifdef JUMP_MOUSE_WHEEL
1855 rxvt_scr_page(aR_ v, i); 1921 scr_page (v, i);
1856 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1922 scr_refresh (SMOOTH_REFRESH);
1857 rxvt_scrollbar_show(aR_ 1); 1923 scrollbar_show (1);
1858# else 1924# else
1859 for (; i--;) 1925 while (i--)
1860 { 1926 {
1861 rxvt_scr_page(aR_ v, 1); 1927 scr_page (v, 1);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1928 scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1929 scrollbar_show (1);
1864 } 1930 }
1865# endif 1931# endif
1866 } 1932
1867 break; 1933 }
1934 break;
1868#endif 1935#endif
1869 } 1936
1870 } 1937 }
1871 } 1938 }
1939 }
1872#ifdef MENUBAR 1940#ifdef MENUBAR
1873 else if (isMenuBarWindow(ev->window)) 1941 else if (isMenuBarWindow (ev.window))
1874 rxvt_menubar_control(aR_ ev); 1942 menubar_control (ev);
1875#endif 1943#endif
1876} 1944}
1877 1945
1878 1946
1879#ifdef TRANSPARENT 1947#ifdef TRANSPARENT
1880/* 1948/*
1881 * Check our parents are still who we think they are. 1949 * Check our parents are still who we think they are.
1882 * Do transparency updates if required 1950 * Do transparency updates if required
1883 */ 1951 */
1884/* EXTPROTO */
1885int 1952int
1886rxvt_check_our_parents(pR) 1953rxvt_term::check_our_parents ()
1887{ 1954{
1888 int i, pchanged, aformat, have_pixmap, rootdepth; 1955 int i, pchanged, aformat, have_pixmap, rootdepth;
1889 unsigned long nitems, bytes_after; 1956 unsigned long nitems, bytes_after;
1890 Atom atype; 1957 Atom atype;
1891 unsigned char *prop = NULL; 1958 unsigned char *prop = NULL;
1892 Window root, oldp, *list; 1959 Window root, oldp, *list;
1893 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1894 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1895 1962
1896 pchanged = 0; 1963 pchanged = 0;
1897 1964
1898 if (!(R->Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1899 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1900 1967
1901 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1902 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1903 1970
1904 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1905 if (rootdepth != wattr.depth) { 1972 if (rootdepth != wattr.depth)
1973 {
1906 if (R->am_transparent) { 1974 if (am_transparent)
1975 {
1907 pchanged = 1; 1976 pchanged = 1;
1908 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1909 R->PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1910 R->am_transparent = R->am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1911 } 1980 }
1912 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1913 } 1982 }
1914 1983
1915/* 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. */
1916 XSync(R->Xdisplay, False); 1985 XSync (display->display, False);
1917 1986
1918/* 1987 /*
1919 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1920 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1921 * 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.
1922 */ 1991 */
1923 i = (R->xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1924 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1925 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1926 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
1927 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1928 have_pixmap = 0; 1997 have_pixmap = 0;
1929 else { 1998 else
1999 {
1930 have_pixmap = 1; 2000 have_pixmap = 1;
1931 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1932 XFree(prop); 2002 XFree (prop);
1933 } 2003 }
1934 if (have_pixmap) { 2004 if (have_pixmap)
1935/* 2005 {
2006 /*
1936 * Copy Xroot pixmap transparency 2007 * Copy display->root pixmap transparency
1937 */ 2008 */
1938 int sx, sy, nx, ny; 2009 int sx, sy, nx, ny;
1939 unsigned int nw, nh; 2010 unsigned int nw, nh;
1940 Window cr; 2011 Window cr;
1941 XImage *image; 2012 XImage *image;
1942 GC gc; 2013 GC gc;
1943 XGCValues gcvalue; 2014 XGCValues gcvalue;
1944 2015
1945 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1946 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
1947 nw = (unsigned int)R->szHint.width; 2018 nw = (unsigned int)szHint.width;
1948 nh = (unsigned int)R->szHint.height; 2019 nh = (unsigned int)szHint.height;
1949 nx = ny = 0; 2020 nx = ny = 0;
1950 if (sx < 0) { 2021 if (sx < 0)
2022 {
1951 nw += sx; 2023 nw += sx;
1952 nx = -sx; 2024 nx = -sx;
1953 sx = 0; 2025 sx = 0;
1954 } 2026 }
1955 if (sy < 0) { 2027 if (sy < 0)
2028 {
1956 nh += sy; 2029 nh += sy;
1957 ny = -sy; 2030 ny = -sy;
1958 sy = 0; 2031 sy = 0;
1959 } 2032 }
1960 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1961 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1962 R->allowedxerror = -1; 2035 allowedxerror = -1;
1963 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1964 ZPixmap); 2037 ZPixmap);
1965 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1966 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
1967 R->allowedxerror = 0; 2040 allowedxerror = 0;
1968 if (image == NULL) { 2041 if (image == NULL)
2042 {
1969 if (R->am_transparent && R->am_pixmap_trans) { 2043 if (am_transparent && am_pixmap_trans)
1970 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 {
1971 if (R->TermWin.pixmap != None) { 2056 if (TermWin.pixmap != None)
1972 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
1973 R->TermWin.pixmap = None; 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1974 } 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 }
1975 } 2074 }
1976 R->am_pixmap_trans = 0;
1977 } else {
1978 if (R->TermWin.pixmap != None)
1979 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1980 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1981 (unsigned int)R->szHint.width,
1982 (unsigned int)R->szHint.height,
1983 (unsigned int)image->depth);
1984 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1985 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1986 nx, ny, (unsigned int)image->width,
1987 (unsigned int)image->height);
1988 XFreeGC(R->Xdisplay, gc);
1989 XDestroyImage(image);
1990 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1991 R->TermWin.pixmap);
1992 if (!R->am_transparent || !R->am_pixmap_trans)
1993 pchanged = 1;
1994 R->am_transparent = R->am_pixmap_trans = 1;
1995 }
1996 }
1997 if (!R->am_pixmap_trans) { 2075 if (!am_pixmap_trans)
2076 {
1998 unsigned int n; 2077 unsigned int n;
1999/* 2078 /*
2000 * InheritPixmap transparency 2079 * InheritPixmap transparency
2001 */ 2080 */
2002 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2003 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2004 i++) { 2083 i++)
2084 {
2005 oldp = R->TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
2006 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2007 &R->TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2008 XFree(list); 2088 XFree (list);
2009 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2010 if (R->TermWin.parent[i] == Xroot) { 2090 if (TermWin.parent[i] == display->root)
2011 if (oldp != None) 2091 {
2012 pchanged = 1; 2092 if (oldp != None)
2013 break; 2093 pchanged = 1;
2014 } 2094 break;
2095 }
2015 if (oldp != R->TermWin.parent[i]) 2096 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2097 pchanged = 1;
2017 } 2098 }
2018 n = 0; 2099 n = 0;
2019 if (pchanged) { 2100 if (pchanged)
2101 {
2020 for (; n < (unsigned int)i; n++) { 2102 for (; n < (unsigned int)i; n++)
2103 {
2021 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2022 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"));
2023 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 {
2024 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2025 break; 2109 break;
2026 } 2110 }
2027 } 2111 }
2028 } 2112 }
2029 if (n > (int)(sizeof(R->TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2030 / sizeof(R->TermWin.parent[0]))) { 2114 / sizeof (TermWin.parent[0])))
2115 {
2031 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2032 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2033 R->PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2034 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2035 R->PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2036 R->am_transparent = 0; 2121 am_transparent = 0;
2037 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2038 } else { 2123 }
2124 else
2125 {
2039 /* wait (an arbitrary period) for the WM to do its thing 2126 /* wait (an arbitrary period) for the WM to do its thing
2040 * needed for fvwm2.2.2 (and before?) */ 2127 * needed for fvwm2.2.2 (and before?) */
2041# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2042 struct timespec rqt; 2129 struct timespec rqt;
2043 2130
2044 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2045 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2046 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2047# else 2134# else
2048 sleep(1); 2135 sleep (1);
2049# endif 2136# endif
2050 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2051 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2052 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2053 ParentRelative); 2140 ParentRelative);
2054 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2055 ParentRelative); 2142 ParentRelative);
2056 R->am_transparent = 1; 2143 am_transparent = 1;
2057 } 2144 }
2058 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2059 R->TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2060 } 2147 }
2061 return pchanged; 2148 return pchanged;
2062} 2149}
2063#endif 2150#endif
2064 2151
2065/*}}} */ 2152/*}}} */
2066 2153
2067/*{{{ print pipe */ 2154/*{{{ print pipe */
2068/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2069#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2070/* EXTPROTO */ 2157FILE *
2071FILE *
2072rxvt_popen_printer(pR) 2158rxvt_term::popen_printer ()
2073{ 2159{
2074 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2075 2161
2076 if (stream == NULL) 2162 if (stream == NULL)
2077 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2078 return stream; 2164 return stream;
2079} 2165}
2080 2166
2081/* EXTPROTO */
2082int 2167int
2083rxvt_pclose_printer (FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2084{ 2169{
2085 fflush (stream); 2170 fflush (stream);
2086/* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2087# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2088/* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2089 return pclose (stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2090# else 2175# else
2091 return pclose (stream); 2176 return pclose (stream);
2092# endif 2177# endif
2093} 2178}
2094 2179
2095/* 2180/*
2096 * simulate attached vt100 printer 2181 * simulate attached vt100 printer
2097 */ 2182 */
2098/* INTPROTO */
2099void 2183void
2100rxvt_process_print_pipe(pR) 2184rxvt_term::process_print_pipe ()
2101{ 2185{
2102 int done; 2186 int done;
2103 FILE *fd; 2187 FILE *fd;
2104 2188
2105 if ((fd = rxvt_popen_printer(aR)) == NULL) 2189 if ((fd = popen_printer ()) == NULL)
2106 return; 2190 return;
2107 2191
2108/* 2192 /*
2109 * 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
2110 * is received. 2194 * is received.
2111 */ 2195 */
2112 for (done = 0; !done;) { 2196 for (done = 0; !done;)
2197 {
2113 unsigned char buf[8]; 2198 unsigned char buf[8];
2114 unsigned char ch; 2199 unsigned char ch;
2115 unsigned int i, len; 2200 unsigned int i, len;
2116 2201
2117 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2202 if ((ch = cmd_getc ()) != C0_ESC)
2203 {
2118 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2119 break; /* done = 1 */ 2205 break; /* done = 1 */
2120 } else { 2206 }
2207 else
2208 {
2121 len = 0; 2209 len = 0;
2122 buf[len++] = ch; 2210 buf[len++] = ch;
2123 2211
2124 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2212 if ((buf[len++] = cmd_getc ()) == '[')
2125 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2213 {
2126 buf[len++] = '?'; 2214 if ((ch = cmd_getc ()) == '?')
2127 ch = rxvt_cmd_getc(aR); 2215 {
2128 } 2216 buf[len++] = '?';
2217 ch = cmd_getc ();
2218 }
2129 if ((buf[len++] = ch) == '4') { 2219 if ((buf[len++] = ch) == '4')
2220 {
2130 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2131 break; /* done = 1 */ 2222 break; /* done = 1 */
2132 } 2223 }
2224 }
2225 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF)
2227 {
2228 done = 1;
2229 break;
2230 }
2231 }
2133 } 2232 }
2134 for (i = 0; i < len; i++)
2135 if (putc(buf[i], fd) == EOF) {
2136 done = 1;
2137 break;
2138 }
2139 }
2140 }
2141 rxvt_pclose_printer(fd); 2233 pclose_printer (fd);
2142} 2234}
2143#endif /* PRINTPIPE */ 2235#endif /* PRINTPIPE */
2144/*}}} */ 2236/*}}} */
2145 2237
2146/* *INDENT-OFF* */ 2238/* *INDENT-OFF* */
2147enum { 2239enum {
2148 C1_40 = 0x40, 2240 C1_40 = 0x40,
2149 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,
2150 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,
2151 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,
2152 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
2153}; 2245};
2154/* *INDENT-ON* */ 2246/* *INDENT-ON* */
2155 2247
2156/*{{{ process non-printing single characters */ 2248/*{{{ process non-printing single characters */
2157/* INTPROTO */
2158void 2249void
2159rxvt_process_nonprinting(pR_ unsigned char ch) 2250rxvt_term::process_nonprinting (unsigned char ch)
2160{ 2251{
2161 switch (ch) { 2252 switch (ch)
2253 {
2162 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2163 if (R->rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2164 R->tt_write( 2256 tt_write (
2165 (const unsigned char *)R->rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2166 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2167 else 2259 else
2168 R->tt_write((unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2169 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2170 break; 2262 break;
2171 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2172 rxvt_scr_bell(aR); 2264 scr_bell ();
2173 break; 2265 break;
2174 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
2175 rxvt_scr_backspace(aR); 2267 scr_backspace ();
2176 break; 2268 break;
2177 case C0_HT: /* tab */ 2269 case C0_HT: /* tab */
2178 rxvt_scr_tab(aR_ 1); 2270 scr_tab (1);
2179 break; 2271 break;
2180 case C0_CR: /* carriage return */ 2272 case C0_CR: /* carriage return */
2181 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2273 scr_gotorc (0, 0, R_RELATIVE);
2182 break; 2274 break;
2183 case C0_VT: /* vertical tab, form feed */ 2275 case C0_VT: /* vertical tab, form feed */
2184 case C0_FF: 2276 case C0_FF:
2185 case C0_LF: /* line feed */ 2277 case C0_LF: /* line feed */
2186 rxvt_scr_index(aR_ UP); 2278 scr_index (UP);
2187 break; 2279 break;
2188 case C0_SO: /* shift out - acs */ 2280 case C0_SO: /* shift out - acs */
2189 rxvt_scr_charset_choose(aR_ 1); 2281 scr_charset_choose (1);
2190 break; 2282 break;
2191 case C0_SI: /* shift in - acs */ 2283 case C0_SI: /* shift in - acs */
2192 rxvt_scr_charset_choose(aR_ 0); 2284 scr_charset_choose (0);
2193 break; 2285 break;
2194 } 2286 }
2195} 2287}
2196/*}}} */ 2288/*}}} */
2197 2289
2198 2290
2199/*{{{ process VT52 escape sequences */ 2291/*{{{ process VT52 escape sequences */
2200/* INTPROTO */
2201void 2292void
2202rxvt_process_escape_vt52(pR_ unsigned char ch) 2293rxvt_term::process_escape_vt52 (unsigned char ch)
2203{ 2294{
2204 int row, col; 2295 int row, col;
2296
2297 switch (ch)
2205 2298 {
2206 switch (ch) {
2207 case 'A': /* cursor up */ 2299 case 'A': /* cursor up */
2208 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2209 break; 2301 break;
2210 case 'B': /* cursor down */ 2302 case 'B': /* cursor down */
2211 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2212 break; 2304 break;
2213 case 'C': /* cursor right */ 2305 case 'C': /* cursor right */
2214 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2215 break; 2307 break;
2216 case 'D': /* cursor left */ 2308 case 'D': /* cursor left */
2217 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2309 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2218 break; 2310 break;
2219 case 'H': /* cursor home */ 2311 case 'H': /* cursor home */
2220 rxvt_scr_gotorc(aR_ 0, 0, 0); 2312 scr_gotorc (0, 0, 0);
2221 break; 2313 break;
2222 case 'I': /* cursor up and scroll down if needed */ 2314 case 'I': /* cursor up and scroll down if needed */
2223 rxvt_scr_index(aR_ DN); 2315 scr_index (DN);
2224 break; 2316 break;
2225 case 'J': /* erase to end of screen */ 2317 case 'J': /* erase to end of screen */
2226 rxvt_scr_erase_screen(aR_ 0); 2318 scr_erase_screen (0);
2227 break; 2319 break;
2228 case 'K': /* erase to end of line */ 2320 case 'K': /* erase to end of line */
2229 rxvt_scr_erase_line(aR_ 0); 2321 scr_erase_line (0);
2230 break; 2322 break;
2231 case 'Y': /* move to specified row and col */ 2323 case 'Y': /* move to specified row and col */
2232 /* full command is 'ESC Y row col' where row and col 2324 /* full command is 'ESC Y row col' where row and col
2233 * are encoded by adding 32 and sending the ascii 2325 * are encoded by adding 32 and sending the ascii
2234 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2326 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2235 * etc. */ 2327 * etc. */
2236 row = rxvt_cmd_getc(aR) - ' '; 2328 row = cmd_getc () - ' ';
2237 col = rxvt_cmd_getc(aR) - ' '; 2329 col = cmd_getc () - ' ';
2238 rxvt_scr_gotorc(aR_ row, col, 0); 2330 scr_gotorc (row, col, 0);
2239 break; 2331 break;
2240 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2241 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2242 break; 2334 break;
2243 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2244 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2245 break; 2337 break;
2246 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2247 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2248 /* unimplemented */ 2340 /* unimplemented */
2249 break; 2341 break;
2250 case '=': /* use alternate keypad mode */ 2342 case '=': /* use alternate keypad mode */
2251 case '>': /* use regular keypad mode */ 2343 case '>': /* use regular keypad mode */
2252 /* unimplemented */ 2344 /* unimplemented */
2253 break; 2345 break;
2254 } 2346 }
2255} 2347}
2256/*}}} */ 2348/*}}} */
2257 2349
2258 2350
2259/*{{{ process escape sequences */ 2351/*{{{ process escape sequences */
2260/* INTPROTO */
2261void 2352void
2262rxvt_process_escape_seq(pR) 2353rxvt_term::process_escape_seq ()
2263{ 2354{
2264 unsigned char ch = rxvt_cmd_getc(aR); 2355 unsigned char ch = cmd_getc ();
2265 2356
2266 if (R->PrivateModes & PrivMode_vt52) { 2357 if (PrivateModes & PrivMode_vt52)
2267 rxvt_process_escape_vt52(aR_ ch);
2268 return;
2269 }
2270 2358 {
2359 process_escape_vt52 (ch);
2360 return;
2361 }
2362
2271 switch (ch) { 2363 switch (ch)
2364 {
2272 /* case 1: do_tek_mode (); break; */ 2365 /* case 1: do_tek_mode (); break; */
2273 case '#': 2366 case '#':
2274 if (rxvt_cmd_getc(aR) == '8') 2367 if (cmd_getc () == '8')
2275 rxvt_scr_E(aR); 2368 scr_E ();
2276 break; 2369 break;
2277 case '(': 2370 case '(':
2278 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2371 scr_charset_set (0, (unsigned int)cmd_getc ());
2279 break; 2372 break;
2280 case ')': 2373 case ')':
2281 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2374 scr_charset_set (1, (unsigned int)cmd_getc ());
2282 break; 2375 break;
2283 case '*': 2376 case '*':
2284 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2377 scr_charset_set (2, (unsigned int)cmd_getc ());
2285 break; 2378 break;
2286 case '+': 2379 case '+':
2287 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2380 scr_charset_set (3, (unsigned int)cmd_getc ());
2288 break; 2381 break;
2289#ifdef MULTICHAR_SET 2382#ifdef MULTICHAR_SET
2290 case '$': 2383 case '$':
2291 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2292 break; 2385 break;
2293#endif 2386#endif
2294#ifndef NO_FRILLS 2387#ifndef NO_FRILLS
2295 case '6': 2388 case '6':
2296 rxvt_scr_backindex(aR); 2389 scr_backindex ();
2297 break; 2390 break;
2298#endif 2391#endif
2299 case '7': 2392 case '7':
2300 rxvt_scr_cursor(aR_ SAVE); 2393 scr_cursor (SAVE);
2301 break; 2394 break;
2302 case '8': 2395 case '8':
2303 rxvt_scr_cursor(aR_ RESTORE); 2396 scr_cursor (RESTORE);
2304 break; 2397 break;
2305#ifndef NO_FRILLS 2398#ifndef NO_FRILLS
2306 case '9': 2399 case '9':
2307 rxvt_scr_forwardindex(aR); 2400 scr_forwardindex ();
2308 break; 2401 break;
2309#endif 2402#endif
2310 case '=': 2403 case '=':
2311 case '>': 2404 case '>':
2312 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2313 break; 2406 break;
2314 2407
2315 case C1_40: 2408 case C1_40:
2316 rxvt_cmd_getc(aR); 2409 cmd_getc ();
2317 break; 2410 break;
2318 case C1_44: 2411 case C1_44:
2319 rxvt_scr_index(aR_ UP); 2412 scr_index (UP);
2320 break; 2413 break;
2321 2414
2322 /* 8.3.87: NEXT LINE */ 2415 /* 8.3.87: NEXT LINE */
2323 case C1_NEL: /* ESC E */ 2416 case C1_NEL: /* ESC E */
2324 { 2417 {
2325 uint32_t nlcr[] = { '\n', '\r' }; 2418 uint32_t nlcr[] = { '\n', '\r' };
2326 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2419 scr_add_lines (nlcr, 1, 2);
2327 } 2420 }
2328 break; 2421 break;
2329 2422
2330 /* kidnapped escape sequence: Should be 8.3.48 */ 2423 /* kidnapped escape sequence: Should be 8.3.48 */
2331 case C1_ESA: /* ESC G */ 2424 case C1_ESA: /* ESC G */
2332 rxvt_process_graphics(aR); 2425 process_graphics ();
2333 break; 2426 break;
2334 2427
2335 /* 8.3.63: CHARACTER TABULATION SET */ 2428 /* 8.3.63: CHARACTER TABULATION SET */
2336 case C1_HTS: /* ESC H */ 2429 case C1_HTS: /* ESC H */
2337 rxvt_scr_set_tab(aR_ 1); 2430 scr_set_tab (1);
2338 break; 2431 break;
2339 2432
2340 /* 8.3.105: REVERSE LINE FEED */ 2433 /* 8.3.105: REVERSE LINE FEED */
2341 case C1_RI: /* ESC M */ 2434 case C1_RI: /* ESC M */
2342 rxvt_scr_index(aR_ DN); 2435 scr_index (DN);
2343 break; 2436 break;
2344 2437
2345 /* 8.3.142: SINGLE-SHIFT TWO */ 2438 /* 8.3.142: SINGLE-SHIFT TWO */
2346 /*case C1_SS2: scr_single_shift (2); break; */ 2439 /*case C1_SS2: scr_single_shift (2); break; */
2347 2440
2348 /* 8.3.143: SINGLE-SHIFT THREE */ 2441 /* 8.3.143: SINGLE-SHIFT THREE */
2349 /*case C1_SS3: scr_single_shift (3); break; */ 2442 /*case C1_SS3: scr_single_shift (3); break; */
2350 2443
2351 /* 8.3.27: DEVICE CONTROL STRING */ 2444 /* 8.3.27: DEVICE CONTROL STRING */
2352 case C1_DCS: /* ESC P */ 2445 case C1_DCS: /* ESC P */
2353 rxvt_process_dcs_seq(aR); 2446 process_dcs_seq ();
2354 break; 2447 break;
2355 2448
2356 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2357 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2358 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2359 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2360 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2361 2454
2362 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2363 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2364 rxvt_process_csi_seq(aR); 2457 process_csi_seq ();
2365 break; 2458 break;
2366 2459
2367 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2460 /* 8.3.90: OPERATING SYSTEM COMMAND */
2368 case C1_OSC: /* ESC ] */ 2461 case C1_OSC: /* ESC ] */
2369 rxvt_process_osc_seq(aR); 2462 process_osc_seq ();
2370 break; 2463 break;
2371 2464
2372 /* 8.3.106: RESET TO INITIAL STATE */ 2465 /* 8.3.106: RESET TO INITIAL STATE */
2373 case 'c': 2466 case 'c':
2374 rxvt_scr_poweron(aR); 2467 scr_poweron ();
2375 rxvt_scrollbar_show(aR_ 1); 2468 scrollbar_show (1);
2376 break; 2469 break;
2377 2470
2378 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2379 case 'n': 2472 case 'n':
2380 rxvt_scr_charset_choose(aR_ 2); 2473 scr_charset_choose (2);
2381 break; 2474 break;
2382 2475
2383 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2476 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2384 case 'o': 2477 case 'o':
2385 rxvt_scr_charset_choose(aR_ 3); 2478 scr_charset_choose (3);
2386 break; 2479 break;
2387 } 2480 }
2388} 2481}
2389/*}}} */ 2482/*}}} */
2390 2483
2391/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2392/* *INDENT-OFF* */ 2485/* *INDENT-OFF* */
2393enum { 2486enum {
2394 CSI_ICH = 0x40, 2487 CSI_ICH = 0x40,
2395 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,
2396 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 ,
2397 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,
2398 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,
2399 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,
2400 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,
2401 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 ,
2402 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
2403}; 2496};
2404 2497
2405#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2406 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2407 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2408#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2409 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2410 2503
2411const unsigned char csi_defaults[] = { 2504const unsigned char csi_defaults[] =
2505 {
2412 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, */
2413 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, */
2414 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, */
2415 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, [, \, ], ^, _, */
2416 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, */
2417 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, */
2418 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, */
2419 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, {, |, }, ~, */
2420}; 2514 };
2421/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2422 2516
2423/* INTPROTO */
2424void 2517void
2425rxvt_process_csi_seq(pR) 2518rxvt_term::process_csi_seq ()
2426{ 2519{
2427 unsigned char ch, priv, i; 2520 unsigned char ch, priv, i;
2428 unsigned int nargs, p; 2521 unsigned int nargs, p;
2429 int n, ndef; 2522 int n, ndef;
2430 int arg[ESC_ARGS]; 2523 int arg[ESC_ARGS];
2431 2524
2432 for (nargs = ESC_ARGS; nargs > 0;) 2525 for (nargs = ESC_ARGS; nargs > 0;)
2433 arg[--nargs] = 0; 2526 arg[--nargs] = 0;
2434 2527
2435 priv = 0; 2528 priv = 0;
2529 ch = cmd_getc ();
2530 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */
2532 priv = ch;
2436 ch = rxvt_cmd_getc(aR); 2533 ch = cmd_getc ();
2437 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2438 priv = ch;
2439 ch = rxvt_cmd_getc(aR);
2440 } 2534 }
2441/* read any numerical arguments */ 2535 /* read any numerical arguments */
2442 for (n = -1; ch < CSI_ICH; ) { 2536 for (n = -1; ch < CSI_ICH; )
2537 {
2443 if (isdigit(ch)) { 2538 if (isdigit (ch))
2539 {
2444 if (n < 0) 2540 if (n < 0)
2445 n = ch - '0'; 2541 n = ch - '0';
2446 else 2542 else
2447 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
2544 }
2448 } else if (ch == ';') { 2545 else if (ch == ';')
2546 {
2449 if (nargs < ESC_ARGS) 2547 if (nargs < ESC_ARGS)
2450 arg[nargs++] = n; 2548 arg[nargs++] = n;
2451 n = -1; 2549 n = -1;
2550 }
2452 } else if (ch == '\b') { 2551 else if (ch == '\b')
2453 rxvt_scr_backspace(aR); 2552 {
2553 scr_backspace ();
2554 }
2454 } else if (ch == C0_ESC) { 2555 else if (ch == C0_ESC)
2455 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)
2456 return; 2568 return;
2457 } else if (ch < ' ') {
2458 rxvt_process_nonprinting(aR_ ch);
2459 }
2460 ch = rxvt_cmd_getc(aR);
2461 }
2462 2569
2463 if (ch > CSI_7F)
2464 return;
2465
2466 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2467 arg[nargs++] = n; 2571 arg[nargs++] = n;
2468 2572
2469 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2470 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2471 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2472 if (arg[p] == -1) 2576 if (arg[p] == -1)
2473 arg[p] = ndef; 2577 arg[p] = ndef;
2474 2578
2475#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2476 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2477 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2478 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2479 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2480#endif 2584#endif
2481 2585
2482/* 2586 /*
2483 * private mode handling 2587 * private mode handling
2484 */ 2588 */
2485 if (priv) { 2589 if (priv)
2486 switch (priv) { 2590 {
2487 case '>': 2591 switch (priv)
2592 {
2593 case '>':
2488 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2489 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2490 break; 2596 break;
2491 case '?': 2597 case '?':
2492 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2493 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2494 break; 2600 break;
2495 } 2601 }
2496 return; 2602 return;
2497 } 2603 }
2498 2604
2499 switch (ch) { 2605 switch (ch)
2500/* 2606 {
2607 /*
2501 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2502 */ 2609 */
2503#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2504 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2505 switch (arg[0]) { 2612 switch (arg[0])
2613 {
2506 case 0: /* initiate transfer to primary aux device */ 2614 case 0: /* initiate transfer to primary aux device */
2507 rxvt_scr_printscreen(aR_ 0); 2615 scr_printscreen (0);
2508 break; 2616 break;
2509 case 5: /* start relay to primary aux device */ 2617 case 5: /* start relay to primary aux device */
2510 rxvt_process_print_pipe(aR); 2618 process_print_pipe ();
2619 break;
2620 }
2511 break; 2621 break;
2512 }
2513 break;
2514#endif 2622#endif
2515 2623
2516 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2624 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2517 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2625 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2518 arg[0] = -arg[0]; 2626 arg[0] = -arg[0];
2519 /* FALLTHROUGH */ 2627 /* FALLTHROUGH */
2520 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2628 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2521 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2629 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2522 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2630 scr_gotorc (arg[0], 0, RELATIVE);
2523 break; 2631 break;
2524 2632
2525 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2633 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2526 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2634 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2527#ifdef ISO6429 2635#ifdef ISO6429
2528 arg[0] = -arg[0]; 2636 arg[0] = -arg[0];
2529#else /* emulate common DEC VTs */ 2637#else /* emulate common DEC VTs */
2530 arg[0] = arg[0] ? -arg[0] : -1; 2638 arg[0] = arg[0] ? -arg[0] : -1;
2531#endif 2639#endif
2532 /* FALLTHROUGH */ 2640 /* FALLTHROUGH */
2533 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2641 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2534 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2642 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2535#ifdef ISO6429 2643#ifdef ISO6429
2536 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2644 scr_gotorc (0, arg[0], RELATIVE);
2537#else /* emulate common DEC VTs */ 2645#else /* emulate common DEC VTs */
2538 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2646 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2539#endif 2647#endif
2540 break; 2648 break;
2541 2649
2542 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2650 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2543 arg[0] = -arg[0]; 2651 arg[0] = -arg[0];
2544 /* FALLTHROUGH */ 2652 /* FALLTHROUGH */
2545 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2653 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2546 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2654 scr_gotorc (arg[0], 0, R_RELATIVE);
2547 break; 2655 break;
2548 2656
2549 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2657 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2550 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2658 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2551 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2659 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2552 break; 2660 break;
2553 2661
2554 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2662 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2555 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2663 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2556 break; 2664 break;
2557 2665
2558 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2666 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2559 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 */
2560 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);
2561 break; 2669 break;
2562 2670
2563 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2671 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2564 arg[0] = -arg[0]; 2672 arg[0] = -arg[0];
2565 /* FALLTHROUGH */ 2673 /* FALLTHROUGH */
2566 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2674 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2567 rxvt_scr_tab(aR_ arg[0]); 2675 scr_tab (arg[0]);
2568 break; 2676 break;
2569 2677
2570 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2678 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2571 rxvt_scr_erase_screen(aR_ arg[0]); 2679 scr_erase_screen (arg[0]);
2572 break; 2680 break;
2573 2681
2574 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2682 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2575 rxvt_scr_erase_line(aR_ arg[0]); 2683 scr_erase_line (arg[0]);
2576 break; 2684 break;
2577 2685
2578 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2686 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2579 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2687 scr_insdel_chars (arg[0], INSERT);
2580 break; 2688 break;
2581 2689
2582 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2690 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2583 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2691 scr_insdel_lines (arg[0], INSERT);
2584 break; 2692 break;
2585 2693
2586 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2694 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2587 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2695 scr_insdel_lines (arg[0], DELETE);
2588 break; 2696 break;
2589 2697
2590 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2698 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2591 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2699 scr_insdel_chars (arg[0], ERASE);
2592 break; 2700 break;
2593 2701
2594 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2702 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2595 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2703 scr_insdel_chars (arg[0], DELETE);
2596 break; 2704 break;
2597 2705
2598 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2599 arg[0] = -arg[0]; 2707 arg[0] = -arg[0];
2600 /* FALLTHROUGH */ 2708 /* FALLTHROUGH */
2601 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2602 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2603 break; 2711 break;
2604 2712
2605 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2606 R->tt_write((const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2607 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2608 break; 2716 break;
2609 2717
2610 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2611 rxvt_process_sgr_mode(aR_ nargs, arg); 2719 process_sgr_mode (nargs, arg);
2612 break; 2720 break;
2613 2721
2614 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2615 switch (arg[0]) { 2723 switch (arg[0])
2724 {
2616 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2617 R->tt_printf("\033[0n"); 2726 tt_printf ("\033[0n");
2618 break; 2727 break;
2619 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2620 rxvt_scr_report_position(aR); 2729 scr_report_position ();
2621 break; 2730 break;
2622#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2623 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2624 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2625 break; 2734 break;
2626#endif 2735#endif
2627 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2628 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2738 break;
2739 }
2629 break; 2740 break;
2630 }
2631 break;
2632 2741
2633 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2634 switch (arg[0]) { 2743 switch (arg[0])
2744 {
2635 case 0: /* char tab stop cleared at active position */ 2745 case 0: /* char tab stop cleared at active position */
2636 rxvt_scr_set_tab(aR_ 0); 2746 scr_set_tab (0);
2637 break; 2747 break;
2638 /* case 1: */ /* line tab stop cleared in active line */ 2748 /* case 1: */ /* line tab stop cleared in active line */
2639 /* case 2: */ /* char tab stops cleared in active line */ 2749 /* case 2: */ /* char tab stops cleared in active line */
2640 case 3: /* all char tab stops are cleared */ 2750 case 3: /* all char tab stops are cleared */
2641 /* case 4: */ /* all line tab stops are cleared */ 2751 /* case 4: */ /* all line tab stops are cleared */
2642 case 5: /* all tab stops are cleared */ 2752 case 5: /* all tab stops are cleared */
2643 rxvt_scr_set_tab(aR_ -1); 2753 scr_set_tab (-1);
2754 break;
2755 }
2644 break; 2756 break;
2645 }
2646 break;
2647 2757
2648 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2758 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2649 switch (arg[0]) { 2759 switch (arg[0])
2760 {
2650 case 0: /* char tab stop set at active position */ 2761 case 0: /* char tab stop set at active position */
2651 rxvt_scr_set_tab(aR_ 1); 2762 scr_set_tab (1);
2652 break; /* = ESC H */ 2763 break; /* = ESC H */
2653 /* case 1: */ /* line tab stop set at active line */ 2764 /* case 1: */ /* line tab stop set at active line */
2654 case 2: /* char tab stop cleared at active position */ 2765 case 2: /* char tab stop cleared at active position */
2655 rxvt_scr_set_tab(aR_ 0); 2766 scr_set_tab (0);
2656 break; /* = ESC [ 0 g */ 2767 break; /* = ESC [ 0 g */
2657 /* case 3: */ /* line tab stop cleared at active line */ 2768 /* case 3: */ /* line tab stop cleared at active line */
2658 /* case 4: */ /* char tab stops cleared at active line */ 2769 /* case 4: */ /* char tab stops cleared at active line */
2659 case 5: /* all char tab stops are cleared */ 2770 case 5: /* all char tab stops are cleared */
2660 rxvt_scr_set_tab(aR_ -1); 2771 scr_set_tab (-1);
2661 break; /* = ESC [ 3 g */ 2772 break; /* = ESC [ 3 g */
2662 /* case 6: */ /* all line tab stops are cleared */ 2773 /* case 6: */ /* all line tab stops are cleared */
2663 } 2774 }
2664 break; 2775 break;
2665 2776
2666 case CSI_RM: /* 8.3.107: RESET MODE */ 2777 case CSI_RM: /* 8.3.107: RESET MODE */
2667 if (arg[0] == 4) 2778 if (arg[0] == 4)
2668 rxvt_scr_insert_mode(aR_ 0); 2779 scr_insert_mode (0);
2669 break; 2780 break;
2670 2781
2671 case CSI_SM: /* 8.3.126: SET MODE */ 2782 case CSI_SM: /* 8.3.126: SET MODE */
2672 if (arg[0] == 4) 2783 if (arg[0] == 4)
2673 rxvt_scr_insert_mode(aR_ 1); 2784 scr_insert_mode (1);
2674 break; 2785 break;
2675 2786
2676/* 2787 /*
2677 * PRIVATE USE beyond this point. All CSI_7? sequences here 2788 * PRIVATE USE beyond this point. All CSI_7? sequences here
2678 */ 2789 */
2679 case CSI_72: /* DECSTBM: set top and bottom margins */ 2790 case CSI_72: /* DECSTBM: set top and bottom margins */
2680 if (nargs == 1) 2791 if (nargs == 1)
2681 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2792 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2682 else if (nargs == 0 || arg[0] >= arg[1]) 2793 else if (nargs == 0 || arg[0] >= arg[1])
2683 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2794 scr_scroll_region (0, MAX_ROWS - 1);
2684 else 2795 else
2685 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2796 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2686 break; 2797 break;
2687 2798
2688 case CSI_73: 2799 case CSI_73:
2689 rxvt_scr_cursor(aR_ SAVE); 2800 scr_cursor (SAVE);
2690 break; 2801 break;
2691 case CSI_75: 2802 case CSI_75:
2692 rxvt_scr_cursor(aR_ RESTORE); 2803 scr_cursor (RESTORE);
2693 break; 2804 break;
2694 2805
2695#ifndef NO_FRILLS 2806#ifndef NO_FRILLS
2696 case CSI_74: 2807 case CSI_74:
2697 rxvt_process_window_ops(aR_ arg, nargs); 2808 process_window_ops (arg, nargs);
2698 break; 2809 break;
2699#endif 2810#endif
2700 2811
2701 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2702 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2703 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);
2704 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2705 2816
2706 default: 2817 default:
2707 break; 2818 break;
2708 } 2819 }
2709} 2820}
2710/*}}} */ 2821/*}}} */
2711 2822
2712#ifndef NO_FRILLS 2823#ifndef NO_FRILLS
2713/* ARGSUSED */ 2824/* ARGSUSED */
2714/* INTPROTO */
2715void 2825void
2716rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2826rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2717{ 2827{
2718 int x, y; 2828 int x, y;
2719#if 0 2829#if 0
2720 char *s; 2830 char *s;
2721#endif 2831#endif
2722 XWindowAttributes wattr; 2832 XWindowAttributes wattr;
2723 Window wdummy; 2833 Window wdummy;
2724 2834
2725 if (nargs == 0) 2835 if (nargs == 0)
2726 return; 2836 return;
2727 switch (args[0]) { 2837 switch (args[0])
2838 {
2728 /* 2839 /*
2729 * commands 2840 * commands
2730 */ 2841 */
2731 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2732 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2733 break; 2844 break;
2734 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2735 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2736 DefaultScreen(R->Xdisplay)); 2847 DefaultScreen (display->display));
2737 break; 2848 break;
2738 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2739 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2740 break; 2851 break;
2741 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2742 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2743 break; 2854 break;
2744 case 5: /* raise window */ 2855 case 5: /* raise window */
2745 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2746 break; 2857 break;
2747 case 6: /* lower window */ 2858 case 6: /* lower window */
2748 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2749 break; 2860 break;
2750 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2751 rxvt_scr_touch(aR_ True); 2862 scr_touch (true);
2752 break; 2863 break;
2753 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2756 break; 2867 break;
2757 default: 2868 default:
2758 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2759 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2760 (unsigned int)(args[1] * R->TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2761 break; 2872 break;
2762 /* 2873 /*
2763 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2764 */ 2875 */
2765 case 11: /* report window state */ 2876 case 11: /* report window state */
2766 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2767 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2768 break; 2879 break;
2769 case 13: /* report window position */ 2880 case 13: /* report window position */
2770 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2771 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2772 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2773 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2774 R->tt_printf("\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2775 break; 2886 break;
2776 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2777 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2778 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2779 break; 2890 break;
2780 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2781 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2782 break; 2893 break;
2783#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2784 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2785 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2786 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2787 break; 2898 break;
2788 case 21: /* report window title */ 2899 case 21: /* report window title */
2789 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2790 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2791 break; 2902 break;
2792#endif 2903#endif
2904
2793 } 2905 }
2794} 2906}
2795#endif 2907#endif
2796 2908
2797/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2798/* 2910/*
2799 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2800 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2801 */ 2913 */
2802/* INTPROTO */
2803unsigned char * 2914unsigned char *
2804rxvt_get_to_st(pR_ unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2805{ 2916{
2806 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
2807 unsigned int n = 0; 2918 unsigned int n = 0;
2808 unsigned char *s; 2919 unsigned char *s;
2809 unsigned char ch, string[STRING_MAX]; 2920 unsigned char ch, string[STRING_MAX];
2810 2921
2811 for (; (ch = rxvt_cmd_getc(aR));) { 2922 for (; (ch = cmd_getc ());)
2923 {
2812 if (ch == C0_BEL 2924 if (ch == C0_BEL
2813 || ch == CHAR_ST 2925 || ch == CHAR_ST
2814 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2815 break; 2927 break;
2816 if (ch == C0_ESC) { 2928 if (ch == C0_ESC)
2929 {
2817 seen_esc = 1; 2930 seen_esc = 1;
2818 continue; 2931 continue;
2932 }
2819 } else if (ch == '\t') 2933 else if (ch == '\t')
2820 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2821 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2822 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2823 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2824 string[n++] = ch; 2938 string[n++] = ch;
2825 seen_esc = 0; 2939 seen_esc = 0;
2826 } 2940 }
2827 string[n++] = '\0'; 2941 string[n++] = '\0';
2828 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2829 return NULL; 2943 return NULL;
2830 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2831 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2832 return s; 2946 return s;
2833} 2947}
2834 2948
2835/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2836/* 2950/*
2837 * 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)'
2838 */ 2952 */
2839/* INTPROTO */
2840void 2953void
2841rxvt_process_dcs_seq(pR) 2954rxvt_term::process_dcs_seq ()
2842{ 2955{
2843 unsigned char eh, *s; 2956 unsigned char eh, *s;
2844/* 2957 /*
2845 * Not handled yet 2958 * Not handled yet
2846 */ 2959 */
2847 s = rxvt_get_to_st(aR_ &eh); 2960 s = get_to_st (&eh);
2848 if (s) 2961 if (s)
2849 free(s); 2962 free (s);
2850 return; 2963 return;
2851} 2964}
2852 2965
2853/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2854/* 2967/*
2855 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2856 */ 2969 */
2857/* INTPROTO */
2858void 2970void
2859rxvt_process_osc_seq(pR) 2971rxvt_term::process_osc_seq ()
2860{ 2972{
2861 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2862 int arg; 2974 int arg;
2863 2975
2864 ch = rxvt_cmd_getc(aR); 2976 ch = cmd_getc ();
2865 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2866 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2867 2979
2868 if (ch == ';') { 2980 if (ch == ';')
2869 s = rxvt_get_to_st(aR_ &eh); 2981 {
2870 if (s) { 2982 s = get_to_st (&eh);
2871 /* 2983 if (s)
2984 {
2985 /*
2872 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2873 * so do it here 2987 * so do it here
2874 */ 2988 */
2875 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2876#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2877 rxvt_menubar_dispatch(aR_ (char *)s); 2991 menubar_dispatch ((char *)s);
2878#else 2992#else
2879 0; 2993 (void)0;
2880#endif 2994#endif
2881 else 2995 else
2882 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
2883 free(s); 2997 free (s);
2884 } 2998 }
2885 } 2999 }
2886} 3000}
2887/* 3001/*
2888 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2889 * 0 = change iconName/title 3003 * 0 = change iconName/title
… …
2903 * 20 = bg pixmap 3017 * 20 = bg pixmap
2904 * 39 = change default fg color 3018 * 39 = change default fg color
2905 * 49 = change default bg color 3019 * 49 = change default bg color
2906 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
2907 */ 3021 */
2908/* EXTPROTO */
2909void 3022void
2910rxvt_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)))
2911{ 3024{
2912 int changed = 0; 3025 int changed = 0;
2913 int color; 3026 int color;
2914 char *buf, *name; 3027 char *buf, *name;
2915 3028
2916 assert(str != NULL); 3029 assert (str != NULL);
2917 switch (op) { 3030 switch (op)
3031 {
2918 case XTerm_name: 3032 case XTerm_name:
2919 rxvt_set_title(aR_ str); 3033 set_title (str);
2920 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
2921 case XTerm_iconName: 3035 case XTerm_iconName:
2922 rxvt_set_iconName(aR_ str); 3036 set_iconName (str);
2923 break; 3037 break;
2924 case XTerm_title: 3038 case XTerm_title:
2925 rxvt_set_title(aR_ str); 3039 set_title (str);
2926 break; 3040 break;
2927 case XTerm_Color: 3041 case XTerm_Color:
2928 for (buf = (char *)str; buf && *buf;) { 3042 for (buf = (char *)str; buf && *buf;)
3043 {
2929 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
2930 break; 3045 break;
2931 *name++ = '\0'; 3046 *name++ = '\0';
2932 color = atoi(buf); 3047 color = atoi (buf);
2933 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
2934 break; 3049 break;
2935 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
2936 *buf++ = '\0'; 3051 *buf++ = '\0';
2937 rxvt_set_window_color(aR_ color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
2938 } 3053 }
2939 break; 3054 break;
2940#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
2941 case XTerm_Color_cursor: 3056 case XTerm_Color_cursor:
2942 rxvt_set_window_color(aR_ Color_cursor, str); 3057 set_window_color (Color_cursor, str);
2943 break; 3058 break;
2944#endif 3059#endif
2945 case XTerm_Color_pointer: 3060 case XTerm_Color_pointer:
2946 rxvt_set_window_color(aR_ Color_pointer, str); 3061 set_window_color (Color_pointer, str);
2947 break; 3062 break;
2948#ifndef NO_BOLD_UNDERLINE_REVERSE 3063#ifndef NO_BOLD_UNDERLINE_REVERSE
2949 case XTerm_Color_BD: 3064 case XTerm_Color_BD:
2950 rxvt_set_window_color(aR_ Color_BD, str); 3065 set_window_color (Color_BD, str);
2951 break; 3066 break;
2952 case XTerm_Color_UL: 3067 case XTerm_Color_UL:
2953 rxvt_set_window_color(aR_ Color_UL, str); 3068 set_window_color (Color_UL, str);
2954 break; 3069 break;
2955 case XTerm_Color_RV: 3070 case XTerm_Color_RV:
2956 rxvt_set_window_color(aR_ Color_RV, str); 3071 set_window_color (Color_RV, str);
2957 break; 3072 break;
2958#endif 3073#endif
2959 3074
2960 case XTerm_Menu: 3075 case XTerm_Menu:
2961 /* 3076 /*
2962 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
2963 * so DON'T do it here 3078 * so DON'T do it here
2964 */ 3079 */
2965 break; 3080 break;
2966 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
2967 if (*str != ';') { 3082 if (*str != ';')
3083 {
2968#if XPM_BACKGROUND 3084#if XPM_BACKGROUND
2969 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
2970 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
2971#endif 3087#endif
2972 rxvt_scr_touch(aR_ True); 3088 scr_touch (true);
2973 } 3089 }
2974 while ((str = STRCHR(str, ';')) != NULL) { 3090 while ((str = STRCHR (str, ';')) != NULL)
2975 str++; 3091 {
3092 str++;
2976#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
2977 changed += rxvt_scale_pixmap(aR_ str); 3094 changed += scale_pixmap (str);
2978#endif 3095#endif
2979 } 3096
2980 if (changed) { 3097 }
3098 if (changed)
3099 {
2981#ifdef XPM_BACKGROUND 3100#ifdef XPM_BACKGROUND
2982 rxvt_resize_pixmap(aR); 3101 resize_pixmap ();
2983#endif 3102#endif
2984 rxvt_scr_touch(aR_ True); 3103 scr_touch (true);
2985 } 3104 }
2986 break; 3105 break;
2987 3106
2988 case XTerm_restoreFG: 3107 case XTerm_restoreFG:
2989 rxvt_set_window_color(aR_ Color_fg, str); 3108 set_window_color (Color_fg, str);
2990 break; 3109 break;
2991 case XTerm_restoreBG: 3110 case XTerm_restoreBG:
2992 rxvt_set_window_color(aR_ Color_bg, str); 3111 set_window_color (Color_bg, str);
2993 break; 3112 break;
2994 case XTerm_logfile: 3113 case XTerm_logfile:
2995 break; 3114 break;
2996 case XTerm_font: 3115 case XTerm_font:
2997 rxvt_change_font(aR_ 0, str); 3116 change_font (0, str);
2998 break; 3117 break;
2999#if 0 3118#if 0
3000 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
3001 { 3120 {
3002 int fd; 3121 int fd;
3003 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)
3004 rxvt_scr_dump(aR_ fd); 3123 {
3005 close(fd); 3124 scr_dump (fd);
3006 } 3125 close (fd);
3007 } 3126 }
3008 break; 3127 }
3128 break;
3009#endif 3129#endif
3130
3010 } 3131 }
3011} 3132}
3012/*----------------------------------------------------------------------*/ 3133/*----------------------------------------------------------------------*/
3013 3134
3014/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3019 * 's' = save 3140 * 's' = save
3020 * 'r' = restore 3141 * 'r' = restore
3021 * 't' = toggle 3142 * 't' = toggle
3022 * so no need for fancy checking 3143 * so no need for fancy checking
3023 */ 3144 */
3024/* INTPROTO */
3025int 3145int
3026rxvt_privcases(pR_ int mode, unsigned long bit) 3146rxvt_term::privcases (int mode, unsigned long bit)
3027{ 3147{
3028 int state; 3148 int state;
3029 3149
3030 if (mode == 's') { 3150 if (mode == 's')
3151 {
3031 R->SavedModes |= (R->PrivateModes & bit); 3152 SavedModes |= (PrivateModes & bit);
3032 return -1; 3153 return -1;
3033 } else { 3154 }
3155 else
3156 {
3034 if (mode == 'r') 3157 if (mode == 'r')
3035 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3036 else 3159 else
3037 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3038 PrivMode(state, bit); 3161 PrivMode (state, bit);
3039 } 3162 }
3040 return state; 3163 return state;
3041} 3164}
3042 3165
3043/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3044/* INTPROTO */
3045void 3167void
3046rxvt_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)
3047{ 3169{
3048 unsigned int i, j; 3170 unsigned int i, j;
3049 int state; 3171 int state;
3050 static const struct { 3172 static const struct
3173 {
3051 const int argval; 3174 const int argval;
3052 const unsigned long bit; 3175 const unsigned long bit;
3176 }
3053 } argtopriv[] = { 3177 argtopriv[] = {
3054 { 1, PrivMode_aplCUR }, 3178 { 1, PrivMode_aplCUR },
3055 { 2, PrivMode_vt52 }, 3179 { 2, PrivMode_vt52 },
3056 { 3, PrivMode_132 }, 3180 { 3, PrivMode_132 },
3057 { 4, PrivMode_smoothScroll }, 3181 { 4, PrivMode_smoothScroll },
3058 { 5, PrivMode_rVideo }, 3182 { 5, PrivMode_rVideo },
3059 { 6, PrivMode_relOrigin }, 3183 { 6, PrivMode_relOrigin },
3060 { 7, PrivMode_Autowrap }, 3184 { 7, PrivMode_Autowrap },
3061 { 9, PrivMode_MouseX10 }, 3185 { 9, PrivMode_MouseX10 },
3062#ifdef menuBar_esc 3186#ifdef menuBar_esc
3063 { menuBar_esc, PrivMode_menuBar }, 3187 { menuBar_esc, PrivMode_menuBar },
3064#endif 3188#endif
3065#ifdef scrollBar_esc 3189#ifdef scrollBar_esc
3066 { scrollBar_esc, PrivMode_scrollBar }, 3190 { scrollBar_esc, PrivMode_scrollBar },
3067#endif 3191#endif
3068 { 25, PrivMode_VisibleCursor }, 3192 { 25, PrivMode_VisibleCursor },
3069 { 35, PrivMode_ShiftKeys }, 3193 { 35, PrivMode_ShiftKeys },
3070 { 40, PrivMode_132OK }, 3194 { 40, PrivMode_132OK },
3071 { 47, PrivMode_Screen }, 3195 { 47, PrivMode_Screen },
3072 { 66, PrivMode_aplKP }, 3196 { 66, PrivMode_aplKP },
3073#ifndef NO_BACKSPACE_KEY 3197#ifndef NO_BACKSPACE_KEY
3074 { 67, PrivMode_BackSpace }, 3198 { 67, PrivMode_BackSpace },
3075#endif 3199#endif
3076 { 1000, PrivMode_MouseX11 }, 3200 { 1000, PrivMode_MouseX11 },
3077 { 1010, PrivMode_TtyOutputInh }, 3201 { 1010, PrivMode_TtyOutputInh },
3078 { 1011, PrivMode_Keypress }, 3202 { 1011, PrivMode_Keypress },
3079 { 1047, PrivMode_Screen }, 3203 { 1047, PrivMode_Screen },
3080 }; 3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3205 };
3081 3206
3082 if (nargs == 0) 3207 if (nargs == 0)
3083 return; 3208 return;
3084 3209
3085/* make lo/hi boolean */ 3210 /* make lo/hi boolean */
3086 if (mode == 'l') 3211 if (mode == 'l')
3087 mode = 0; /* reset */ 3212 mode = 0; /* reset */
3088 else if (mode == 'h') 3213 else if (mode == 'h')
3089 mode = 1; /* set */ 3214 mode = 1; /* set */
3090 3215
3091 for (i = 0; i < nargs; i++) { 3216 for (i = 0; i < nargs; i++)
3217 {
3092 state = -1; 3218 state = -1;
3093 3219
3094 /* basic handling */ 3220 /* basic handling */
3095 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3096 if (argtopriv[j].argval == arg[i]) { 3222 if (argtopriv[j].argval == arg[i])
3223 {
3097 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3098 break; 3225 break;
3099 } 3226 }
3100 3227
3101 /* extra handling for values with state unkept */ 3228 /* extra handling for values with state unkept */
3102 if (state == -1) 3229 if (state == -1)
3103 switch (arg[i]) { 3230 switch (arg[i])
3231 {
3104 case 1048: /* alternative cursor save */ 3232 case 1048: /* alternative cursor save */
3105 if (mode == 0) 3233 if (mode == 0)
3106 rxvt_scr_cursor(aR_ RESTORE); 3234 scr_cursor (RESTORE);
3107 else if (mode == 1) 3235 else if (mode == 1)
3108 rxvt_scr_cursor(aR_ SAVE); 3236 scr_cursor (SAVE);
3109 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3110 default: 3238 default:
3111 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3112 } 3240 }
3113 3241
3114 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3115 switch (arg[i]) { 3243 switch (arg[i])
3244 {
3116 /* case 1: - application cursor keys */ 3245 /* case 1: - application cursor keys */
3117 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3118 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3119 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3120 * within VT52 mode 3249 * within VT52 mode
3121 */ 3250 */
3122 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3123 break; 3252 break;
3124 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3125 if (R->PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3126 rxvt_set_widthheight(aR_
3127 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3128 (unsigned int)R->TermWin.height); 3256 (unsigned int)TermWin.height);
3129 break; 3257 break;
3130 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3131 if (state) 3259 if (state)
3132 R->Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
3133 else 3261 else
3134 R->Options |= Opt_jumpScroll; 3262 Options |= Opt_jumpScroll;
3135 break; 3263 break;
3136 case 5: /* reverse video */ 3264 case 5: /* reverse video */
3137 rxvt_scr_rvideo_mode(aR_ state); 3265 scr_rvideo_mode (state);
3138 break; 3266 break;
3139 case 6: /* relative/absolute origins */ 3267 case 6: /* relative/absolute origins */
3140 rxvt_scr_relative_origin(aR_ state); 3268 scr_relative_origin (state);
3141 break; 3269 break;
3142 case 7: /* autowrap */ 3270 case 7: /* autowrap */
3143 rxvt_scr_autowrap(aR_ state); 3271 scr_autowrap (state);
3144 break; 3272 break;
3145 /* 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 */
3146 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3147 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3148 R->PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3149 break; 3277 break;
3150#ifdef menuBar_esc 3278#ifdef menuBar_esc
3151 case menuBar_esc: 3279 case menuBar_esc:
3152#ifdef MENUBAR 3280#ifdef MENUBAR
3153 rxvt_map_menuBar(aR_ state); 3281 map_menuBar (state);
3154#endif 3282#endif
3155 break; 3283 break;
3156#endif 3284#endif
3157#ifdef scrollBar_esc 3285#ifdef scrollBar_esc
3158 case scrollBar_esc: 3286 case scrollBar_esc:
3159 if (rxvt_scrollbar_mapping(aR_ state)) { 3287 if (scrollbar_mapping (state))
3160 rxvt_resize_all_windows(aR_ 0, 0, 0); 3288 {
3161 rxvt_scr_touch(aR_ True); 3289 resize_all_windows (0, 0, 0);
3162 } 3290 scr_touch (true);
3163 break; 3291 }
3292 break;
3164#endif 3293#endif
3165 case 25: /* visible/invisible cursor */ 3294 case 25: /* visible/invisible cursor */
3166 rxvt_scr_cursor_visible(aR_ state); 3295 scr_cursor_visible (state);
3167 break; 3296 break;
3168 /* case 35: - shift keys */ 3297 /* case 35: - shift keys */
3169 /* case 40: - 80 <--> 132 mode */ 3298 /* case 40: - 80 <--> 132 mode */
3170 case 47: /* secondary screen */ 3299 case 47: /* secondary screen */
3171 rxvt_scr_change_screen(aR_ state); 3300 scr_change_screen (state);
3172 break; 3301 break;
3173 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3174 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3175 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3176 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3177 R->PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3178 break; 3307 break;
3179#if 0 3308#if 0
3180 case 1001: 3309 case 1001:
3181 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3182#endif 3311#endif
3183 case 1010: /* scroll to bottom on TTY output inhibit */ 3312 case 1010: /* scroll to bottom on TTY output inhibit */
3184 if (state) 3313 if (state)
3185 R->Options &= ~Opt_scrollTtyOutput; 3314 Options &= ~Opt_scrollTtyOutput;
3186 else 3315 else
3187 R->Options |= Opt_scrollTtyOutput; 3316 Options |= Opt_scrollTtyOutput;
3188 break; 3317 break;
3189 case 1011: /* scroll to bottom on key press */ 3318 case 1011: /* scroll to bottom on key press */
3190 if (state) 3319 if (state)
3191 R->Options |= Opt_scrollTtyKeypress; 3320 Options |= Opt_scrollTtyKeypress;
3192 else 3321 else
3193 R->Options &= ~Opt_scrollTtyKeypress; 3322 Options &= ~Opt_scrollTtyKeypress;
3194 break; 3323 break;
3195 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 */
3196 if (R->current_screen != PRIMARY) 3326 if (current_screen != PRIMARY)
3197 rxvt_scr_erase_screen(aR_ 2); 3327 scr_erase_screen (2);
3198 rxvt_scr_change_screen(aR_ state); 3328 scr_change_screen (state);
3199 /* FALLTHROUGH */ 3329 /* FALLTHROUGH */
3200 default: 3330 default:
3201 break; 3331 break;
3202 } 3332 }
3203 } 3333 }
3204} 3334}
3205/*}}} */ 3335/*}}} */
3206 3336
3207/*{{{ process sgr sequences */ 3337/*{{{ process sgr sequences */
3208/* INTPROTO */
3209void 3338void
3210rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3211{ 3340{
3212 unsigned int i; 3341 unsigned int i;
3213 short rendset; 3342 short rendset;
3214 int rendstyle; 3343 int rendstyle;
3215 3344
3216 if (nargs == 0) { 3345 if (nargs == 0)
3217 rxvt_scr_rendition(aR_ 0, ~RS_None);
3218 return;
3219 } 3346 {
3347 scr_rendition (0, ~RS_None);
3348 return;
3349 }
3220 for (i = 0; i < nargs; i++) { 3350 for (i = 0; i < nargs; i++)
3351 {
3221 rendset = -1; 3352 rendset = -1;
3222 switch (arg[i]) { 3353 switch (arg[i])
3223 case 0: 3354 {
3355 case 0:
3224 rendset = 0, rendstyle = ~RS_None; 3356 rendset = 0, rendstyle = ~RS_None;
3225 break; 3357 break;
3226 case 1: 3358 case 1:
3227 rendset = 1, rendstyle = RS_Bold; 3359 rendset = 1, rendstyle = RS_Bold;
3228 break; 3360 break;
3229 case 4: 3361 case 4:
3230 rendset = 1, rendstyle = RS_Uline; 3362 rendset = 1, rendstyle = RS_Uline;
3231 break; 3363 break;
3232 case 5: 3364 case 5:
3233 rendset = 1, rendstyle = RS_Blink; 3365 rendset = 1, rendstyle = RS_Blink;
3234 break; 3366 break;
3235 case 7: 3367 case 7:
3236 rendset = 1, rendstyle = RS_RVid; 3368 rendset = 1, rendstyle = RS_RVid;
3237 break; 3369 break;
3238 case 22: 3370 case 22:
3239 rendset = 0, rendstyle = RS_Bold; 3371 rendset = 0, rendstyle = RS_Bold;
3240 break; 3372 break;
3241 case 24: 3373 case 24:
3242 rendset = 0, rendstyle = RS_Uline; 3374 rendset = 0, rendstyle = RS_Uline;
3243 break; 3375 break;
3244 case 25: 3376 case 25:
3245 rendset = 0, rendstyle = RS_Blink; 3377 rendset = 0, rendstyle = RS_Blink;
3246 break; 3378 break;
3247 case 27: 3379 case 27:
3248 rendset = 0, rendstyle = RS_RVid; 3380 rendset = 0, rendstyle = RS_RVid;
3249 break; 3381 break;
3250 } 3382 }
3251 if (rendset != -1) { 3383 if (rendset != -1)
3252 rxvt_scr_rendition(aR_ rendset, rendstyle); 3384 {
3385 scr_rendition (rendset, rendstyle);
3253 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3254 } 3387 }
3255 3388
3256 switch (arg[i]) { 3389 switch (arg[i])
3257 case 30: 3390 {
3391 case 30:
3258 case 31: /* set fg color */ 3392 case 31: /* set fg color */
3259 case 32: 3393 case 32:
3260 case 33: 3394 case 33:
3261 case 34: 3395 case 34:
3262 case 35: 3396 case 35:
3263 case 36: 3397 case 36:
3264 case 37: 3398 case 37:
3265 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3266 Color_fg); 3400 Color_fg);
3267 break; 3401 break;
3268#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3269 case 38: 3403 case 38:
3270 if (nargs > i + 2 && arg[i + 1] == 5) { 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3405 {
3271 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3272 Color_fg); 3407 Color_fg);
3273 i += 2; 3408 i += 2;
3274 } 3409 }
3275 break; 3410 break;
3276#endif 3411#endif
3277 case 39: /* default fg */ 3412 case 39: /* default fg */
3278 rxvt_scr_color(aR_ Color_fg, Color_fg); 3413 scr_color (Color_fg, Color_fg);
3279 break; 3414 break;
3280 3415
3281 case 40: 3416 case 40:
3282 case 41: /* set bg color */ 3417 case 41: /* set bg color */
3283 case 42: 3418 case 42:
3284 case 43: 3419 case 43:
3285 case 44: 3420 case 44:
3286 case 45: 3421 case 45:
3287 case 46: 3422 case 46:
3288 case 47: 3423 case 47:
3289 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3290 Color_bg); 3425 Color_bg);
3291 break; 3426 break;
3292#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3293 case 48: 3428 case 48:
3294 if (nargs > i + 2 && arg[i + 1] == 5) { 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3430 {
3295 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3296 Color_bg); 3432 Color_bg);
3297 i += 2; 3433 i += 2;
3298 } 3434 }
3299 break; 3435 break;
3300#endif 3436#endif
3301 case 49: /* default bg */ 3437 case 49: /* default bg */
3302 rxvt_scr_color(aR_ Color_bg, Color_bg); 3438 scr_color (Color_bg, Color_bg);
3303 break; 3439 break;
3304 3440
3305#ifndef NO_BRIGHTCOLOR 3441#ifndef NO_BRIGHTCOLOR
3306 case 90: 3442 case 90:
3307 case 91: /* set bright fg color */ 3443 case 91: /* set bright fg color */
3308 case 92: 3444 case 92:
3309 case 93: 3445 case 93:
3310 case 94: 3446 case 94:
3311 case 95: 3447 case 95:
3312 case 96: 3448 case 96:
3313 case 97: 3449 case 97:
3314 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3315 Color_fg); 3451 Color_fg);
3316 break; 3452 break;
3317 case 100: 3453 case 100:
3318 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3319 case 102: 3455 case 102:
3320 case 103: 3456 case 103:
3321 case 104: 3457 case 104:
3322 case 105: 3458 case 105:
3323 case 106: 3459 case 106:
3324 case 107: 3460 case 107:
3325 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3326 Color_bg); 3462 Color_bg);
3327 break; 3463 break;
3328#endif 3464#endif
3329 } 3465
3466 }
3330 } 3467 }
3331} 3468}
3332/*}}} */ 3469/*}}} */
3333 3470
3334/*{{{ process Rob Nation's own graphics mode sequences */ 3471/*{{{ process Rob Nation's own graphics mode sequences */
3335/* INTPROTO */
3336void 3472void
3337rxvt_process_graphics(pR) 3473rxvt_term::process_graphics ()
3338{ 3474{
3339 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3475 unsigned char ch, cmd = cmd_getc ();
3340 3476
3341#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q')
3342 if (cmd == 'Q') { /* query graphics */ 3479 { /* query graphics */
3343 R->tt_printf("\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3344 return; 3481 return;
3345 } 3482 }
3346/* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3347 do 3484 do
3348 ch = rxvt_cmd_getc(aR); 3485 ch = cmd_getc ();
3349 while (ch != ':'); 3486 while (ch != ':');
3350#else 3487#else
3351 unsigned int nargs; 3488 unsigned int nargs;
3352 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3353 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3354 3491
3492 if (cmd == 'Q')
3355 if (cmd == 'Q') { /* query graphics */ 3493 { /* query graphics */
3356 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3357 return; 3495 return;
3358 } 3496 }
3359 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3360 int neg; 3499 int neg;
3361 3500
3362 ch = rxvt_cmd_getc(aR); 3501 ch = cmd_getc ();
3363 neg = (ch == '-'); 3502 neg = (ch == '-');
3364 if (neg || ch == '+') 3503 if (neg || ch == '+')
3365 ch = rxvt_cmd_getc(aR); 3504 ch = cmd_getc ();
3366 3505
3367 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3368 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3369 if (neg) 3508 if (neg)
3370 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3371 3510
3372 nargs++; 3511 nargs++;
3373 args[nargs] = 0; 3512 args[nargs] = 0;
3374 if (ch != ';') 3513 if (ch != ';')
3375 break; 3514 break;
3376 } 3515 }
3377 3516
3378 if ((cmd == 'T') && (nargs >= 5)) { 3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3379 int i, len = args[4]; 3519 int i, len = args[4];
3380 3520
3381 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3382 3522
3383 if (text != NULL) { 3523 if (text != NULL)
3524 {
3384 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3385 text[i] = rxvt_cmd_getc(aR); 3526 text[i] = cmd_getc ();
3386 text[len] = '\0'; 3527 text[len] = '\0';
3387 } 3528 }
3388 } 3529 }
3389 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3530 Gr_do_graphics (cmd, nargs, args, text);
3390#endif 3531#endif
3391} 3532}
3392/*}}} */ 3533/*}}} */
3393 3534
3394/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3395 3536
3396/* 3537/*
3397 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3398 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3399 */ 3540 */
3400void 3541void
3401rxvt_term::tt_printf (const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3402{ 3543{
… …
3420 3561
3421 if (len) 3562 if (len)
3422 { 3563 {
3423 if (v_buflen == 0) 3564 if (v_buflen == 0)
3424 { 3565 {
3425 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
3426 if (written == len) 3568 if ((unsigned int)written == len)
3427 return; 3569 return;
3428 3570
3429 data += written; 3571 data += written;
3430 len -= written; 3572 len -= written;
3431 } 3573 }

Diff Legend

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