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

Diff Legend

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