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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.43 by pcg, Tue Feb 24 00:02:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.5 2003/11/25 15:44:38 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
93#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
67 x_ev (this, &rxvt_term::x_cb) 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
68{ 103{
69 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
70} 105}
71 106
72rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
73{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
126
74 delete PixColors; 127 delete PixColors;
128
129 displays.put (display);
130
131 scr_release ();
132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
137 free (locale);
138 free (codeset);
139
140 delete envv;
141 delete argv;
142}
143
144void
145rxvt_term::destroy ()
146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 }
163
164 check_ev.stop ();
165 pty_ev.stop ();
166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
170 text_blink_ev.stop ();
171#endif
172#ifdef POINTER_BLANK
173 pointer_ev.stop ();
174#endif
175
176 destroy_ev.start (0);
177}
178
179void
180rxvt_term::destroy_cb (time_watcher &w)
181{
182 SET_R (this);
183
184 delete this;
75} 185}
76 186
77/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
78/* rxvt_init() */ 188/* rxvt_init () */
79/* LIBPROTO */ 189/* LIBPROTO */
80rxvt_t 190rxvt_t
81rxvt_init(int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
82{ 192{
83 SET_R(new rxvt_term); 193 SET_R (new rxvt_term);
84 dR;
85 194
86 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
87 { 196 {
88 delete R; 197 delete GET_R;
89 return NULL; 198 SET_R (0);
90 } 199 }
91 200
92 return R; 201 return GET_R;
202}
203
204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
206void
207rxvt_init_signals ()
208{
209 /* install exit handler for cleanup */
210#if 0
211#ifdef HAVE_ATEXIT
212 atexit (rxvt_clean_exit);
213#else
214#endif
215#endif
216
217 struct sigaction sa;
218
219 sigfillset (&sa.sa_mask);
220 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
221 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
222 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
227
228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
229 /* signal (SIGURG, SIG_DFL); */
230
231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
93} 233}
94 234
95bool 235bool
96rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
97{ 237{
98 dR;//TODO (scrollbar, setidle)
99
100 /* 238 /*
101 * Save and then give up any super-user privileges 239 * Save and then give up any super-user privileges
102 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
103 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
104 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
105 * 2. chown tty on some systems 243 * 2. chown tty on some systems
106 */ 244 */
107 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
108 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
109 247
110 rxvt_init_secondary (this); 248 init_secondary ();
111 249
112 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
251
252 set_locale ("");
113 253
114#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
115 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
116#endif 256#endif
117#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
118 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
119 scrollbar_setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
120#endif 260#endif
121 261
122 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
123 263
124 rxvt_init_xlocale (this); 264 init_xlocale ();
125 265
126 rxvt_scr_reset (this); /* initialize screen */ 266 scr_reset (); /* initialize screen */
127#ifdef RXVT_GRAPHICS
128 rxvt_Gr_reset (this); /* reset graphics */
129#endif
130 267
131#if 0 268#if 0
132#ifdef DEBUG_X
133 XSynchronize(Xdisplay, True); 269 XSynchronize (display->display, True);
134 XSetErrorHandler((XErrorHandler) abort);
135#else
136 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
137#endif
138#endif 270#endif
139 271
140#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
141 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
142 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
143#endif 275#endif
144#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
145 if (menubar_visible(r)) 277 if (menubar_visible ())
146 XMapWindow (Xdisplay, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
147#endif 279#endif
148#ifdef TRANSPARENT 280#ifdef TRANSPARENT
149 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
150 { 282 {
151 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 283 XSelectInput (display->display, display->root, PropertyChangeMask);
152 rxvt_check_our_parents (this); 284 check_our_parents ();
153 } 285 }
154#endif 286#endif
287
288 rootwin_ev.start (display, display->root);
289
155 XMapWindow (Xdisplay, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
156 XMapWindow (Xdisplay, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
157 292
158 rxvt_init_env (this);
159 rxvt_init_command (this, cmd_argv); 293 init_command (cmd_argv);
160 294
161 x_ev.start (Xfd, EVENT_READ);
162 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
296
297 check_ev.start ();
163 298
164 return true; 299 return true;
165} 300}
166 301
167/* ------------------------------------------------------------------------- * 302/* ------------------------------------------------------------------------- *
171 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
172 */ 307 */
173/* ARGSUSED */ 308/* ARGSUSED */
174/* EXTPROTO */ 309/* EXTPROTO */
175RETSIGTYPE 310RETSIGTYPE
176rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
177{ 312{
178 dR;
179 int pid, save_errno = errno; 313 int pid, save_errno = errno;
180
181 do {
182 errno = 0;
183 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
184 315 ;
185 if (pid == R->cmd_pid)
186 exit(EXIT_SUCCESS);
187
188 errno = save_errno; 316 errno = save_errno;
189 signal(SIGCHLD, rxvt_Child_signal); 317
318#if 0
319 if (pid == cmd_pid)
320 exit (EXIT_SUCCESS);
321#endif
190} 322}
191 323
192/* 324/*
193 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
194 */ 326 */
195/* EXTPROTO */ 327/* EXTPROTO */
196RETSIGTYPE 328RETSIGTYPE
197rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
198{ 330{
199 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
200#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
201 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
202#endif 334#endif
203 rxvt_clean_exit(); 335 rxvt_clean_exit ();
204 kill(getpid(), sig); 336 kill (getpid (), sig);
205} 337}
206 338
207/* ARGSUSED */
208/* INTPROTO */ 339/* INTPROTO */
209int 340int
210rxvt_xerror_handler(const Display * display 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
211 __attribute__ ((unused)), const XErrorEvent * event)
212{ 342{
213 dR;
214
215 if (R->allowedxerror == -1) { 343 if (GET_R->allowedxerror == -1)
216 R->allowedxerror = event->error_code; 344 GET_R->allowedxerror = event->error_code;
217 return 0; /* ignored anyway */ 345 else
218 } 346 {
219 rxvt_print_error("XError: Request: %d . %d, Error: %d", 347 old_xerror_handler (display, event);
220 event->request_code, event->minor_code, 348 GET_R->destroy ();
221 event->error_code); 349 }
222/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 350
223 exit(EXIT_FAILURE); 351 return 0;
224/* NOTREACHED */
225} 352}
226 353
227/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
228/* 355/*
229 * Exit gracefully, clearing the utmp entry and restoring tty attributes 356 * Exit gracefully, clearing the utmp entry and restoring tty attributes
230 * TODO: if debugging, this should free up any known resources if we can 357 * TODO: if debugging, this should free up any known resources if we can
231 */ 358 */
232/* EXTPROTO */ 359/* EXTPROTO */
233void 360void
234rxvt_clean_exit(void) 361rxvt_clean_exit ()
235{ 362{
236 dR; 363 // TODO: rxvtd should clean up all ressources
237 364 if (GET_R)
238#ifdef DEBUG_SCREEN 365 GET_R->destroy ();
239 rxvt_scr_release(aR);
240#endif
241#ifndef NO_SETOWNER_TTYDEV
242 rxvt_privileged_ttydev(aR_ RESTORE);
243#endif
244#ifdef UTMP_SUPPORT
245 rxvt_privileged_utmp(aR_ RESTORE);
246#endif
247#ifdef USE_XIM
248 if (R->Input_Context != NULL) {
249 XDestroyIC(R->Input_Context);
250 R->Input_Context = NULL;
251 }
252#endif
253} 366}
254 367
255/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
256 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
257 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
258/* EXTPROTO */ 371/* EXTPROTO */
259void * 372void *
260rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
261{ 374{
262 void *p; 375 void *p;
263 376
264 p = malloc(size); 377 p = malloc (size);
265 if (p) 378 if (p)
266 return p; 379 return p;
267 380
268 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
269 rxvt_clean_exit(); 382 rxvt_clean_exit ();
270 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
271/* NOTREACHED */ 384 /* NOTREACHED */
272} 385}
273 386
274/* EXTPROTO */ 387/* EXTPROTO */
275void * 388void *
276rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
277{ 390{
278 void *p; 391 void *p;
279 392
280 p = calloc(number, size); 393 p = calloc (number, size);
281 if (p) 394 if (p)
282 return p; 395 return p;
283 396
284 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
285 rxvt_clean_exit(); 398 rxvt_clean_exit ();
286 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
287/* NOTREACHED */ 400 /* NOTREACHED */
288} 401}
289 402
290/* EXTPROTO */ 403/* EXTPROTO */
291void * 404void *
292rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
293{ 406{
294 void *p; 407 void *p;
295 408
296 if (ptr) 409 if (ptr)
297 p = realloc(ptr, size); 410 p = realloc (ptr, size);
298 else 411 else
299 p = malloc(size); 412 p = malloc (size);
300 if (p) 413 if (p)
301 return p; 414 return p;
302 415
303 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
304 rxvt_clean_exit(); 417 rxvt_clean_exit ();
305 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
306/* NOTREACHED */ 419 /* NOTREACHED */
307} 420}
308 421
309/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
310 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
311 * ------------------------------------------------------------------------- */ 424 * ------------------------------------------------------------------------- */
312/* take care of suid/sgid super-user (root) privileges */ 425/* take care of suid/sgid super-user (root) privileges */
313/* INTPROTO */
314void 426void
315rxvt_privileges(pR_ int mode) 427rxvt_term::privileges (int mode)
316{ 428{
317#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
318# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
319/* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
320# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
321# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
322# define HAVE_SETEUID 434# define HAVE_SETEUID
323# endif 435# endif
324# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
325 switch (mode) { 437 switch (mode)
438 {
326 case IGNORE: 439 case IGNORE:
327 /* 440 /*
328 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
329 * back to root later, as required 442 * back to root later, as required
330 */ 443 */
331 seteuid(getuid()); 444 seteuid (getuid ());
332 setegid(getgid()); 445 setegid (getgid ());
333 break; 446 break;
334 case SAVE: 447 case SAVE:
335 R->euid = geteuid(); 448 euid = geteuid ();
336 R->egid = getegid(); 449 egid = getegid ();
337 break; 450 break;
338 case RESTORE: 451 case RESTORE:
339 seteuid(R->euid); 452 seteuid (euid);
340 setegid(R->egid); 453 setegid (egid);
341 break; 454 break;
342 } 455 }
343# else 456# else
344 switch (mode) { 457 switch (mode)
458 {
345 case IGNORE: 459 case IGNORE:
346 setuid(getuid()); 460 setuid (getuid ());
347 setgid(getgid()); 461 setgid (getgid ());
348 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
349 case SAVE: 463 case SAVE:
350 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
351 case RESTORE: 465 case RESTORE:
352 break; 466 break;
353 } 467 }
354# endif 468# endif
355#endif 469#endif
356} 470}
357 471
358#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
359/* EXTPROTO */
360void 473void
361rxvt_privileged_utmp(pR_ char action) 474rxvt_term::privileged_utmp (char action)
362{ 475{
363 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
364 action, R->next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
365 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
366 || (R->Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
367 || R->ttydev == NULL || *R->ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
368 return; 481 return;
369 482
370 rxvt_privileges(aR_ RESTORE); 483 privileges (RESTORE);
371 if (action == SAVE) { 484 if (action == SAVE)
485 {
372 R->next_utmp_action = RESTORE; 486 next_utmp_action = RESTORE;
373 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 487 makeutent (ttydev, rs[Rs_display_name]);
488 }
489 else
374 } else { /* action == RESTORE */ 490 { /* action == RESTORE */
375 R->next_utmp_action = IGNORE; 491 next_utmp_action = IGNORE;
376 rxvt_cleanutent(aR); 492 cleanutent ();
377 } 493 }
378 rxvt_privileges(aR_ IGNORE); 494 privileges (IGNORE);
379} 495}
380#endif 496#endif
381 497
382#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
383/* EXTPROTO */
384void 499void
385rxvt_privileged_ttydev(pR_ char action) 500rxvt_term::privileged_ttydev (char action)
386{ 501{
387 D_MAIN((stderr, 502 D_MAIN ((stderr,
388 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
389 action, R->next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
390 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
391 || R->ttydev == NULL || *R->ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
392 return; 507 return;
393 508
394 rxvt_privileges(aR_ RESTORE); 509 privileges (RESTORE);
395 510
396 if (action == SAVE) { 511 if (action == SAVE)
512 {
397 R->next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
398# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
399/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
400 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
401 R->next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
402 else 518 else
403# endif 519# endif
520
404 { 521 {
405 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
406 chmod(R->ttydev, R->ttymode); 523 chmod (ttydev, ttymode);
407# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
408 revoke(R->ttydev); 525 revoke (ttydev);
409# endif 526# endif
527
410 } 528 }
529 }
530 else
411 } else { /* action == RESTORE */ 531 { /* action == RESTORE */
412 R->next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
413# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
414 chmod(R->ttydev, R->ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
415 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
416# else 536# else
417 chmod(R->ttydev, 537 chmod (ttydev,
418 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
419 chown(R->ttydev, 0, 0); 539 chown (ttydev, 0, 0);
420# endif 540# endif
421 }
422 541
542 }
543
423 rxvt_privileges(aR_ IGNORE); 544 privileges (IGNORE);
424 545
425# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
426 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
427 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
428 SAVE ? "Saving" : 549 SAVE ? "Saving" :
429 "UNKNOWN ERROR for"), R->ttydev, 550 "UNKNOWN ERROR for"), ttydev,
430 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
431 R->ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
432# endif 553# endif
433} 554}
434#endif 555#endif
435 556
436/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
437/* 558/*
438 * window size/position calculcations for XSizeHint and other storage. 559 * window size/position calculcations for XSizeHint and other storage.
439 * if width/height are non-zero then override calculated width/height 560 * if width/height are non-zero then override calculated width/height
440 */ 561 */
441/* EXTPROTO */
442void 562void
443rxvt_window_calc(pR_ unsigned int width, unsigned int height) 563rxvt_term::window_calc (unsigned int width, unsigned int height)
444{ 564{
445 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
446 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
447 unsigned int w, h; 567 unsigned int w, h;
448 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
449 569
450 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
451 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
452 R->szHint.height)); 572 szHint.height));
453 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
454 R->szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
455/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
456 576
457 recalc_x = recalc_y = 0; 577 recalc_x = recalc_y = 0;
458 flags = 0; 578 flags = 0;
459 if (!R->parsed_geometry) { 579 if (!parsed_geometry)
580 {
460 R->parsed_geometry = 1; 581 parsed_geometry = 1;
461 if (R->rs[Rs_geometry]) 582 if (rs[Rs_geometry])
462 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
463 if (flags & WidthValue) { 584 if (flags & WidthValue)
585 {
464 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
465 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
466 } 588 }
467 if (flags & HeightValue) { 589 if (flags & HeightValue)
590 {
468 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
469 R->szHint.flags |= USSize; 592 szHint.flags |= USSize;
470 } 593 }
471 if (flags & XValue) { 594 if (flags & XValue)
595 {
472 R->szHint.x = x; 596 szHint.x = x;
473 R->szHint.flags |= USPosition; 597 szHint.flags |= USPosition;
474 if (flags & XNegative) { 598 if (flags & XNegative)
599 {
475 recalc_x = 1; 600 recalc_x = 1;
476 R->szHint.win_gravity = NorthEastGravity; 601 szHint.win_gravity = NorthEastGravity;
477 } 602 }
478 } 603 }
479 if (flags & YValue) { 604 if (flags & YValue)
605 {
480 R->szHint.y = y; 606 szHint.y = y;
481 R->szHint.flags |= USPosition; 607 szHint.flags |= USPosition;
482 if (flags & YNegative) { 608 if (flags & YNegative)
609 {
483 recalc_y = 1; 610 recalc_y = 1;
484 if (R->szHint.win_gravity == NorthEastGravity) 611 if (szHint.win_gravity == NorthEastGravity)
485 R->szHint.win_gravity = SouthEastGravity; 612 szHint.win_gravity = SouthEastGravity;
486 else 613 else
487 R->szHint.win_gravity = SouthWestGravity; 614 szHint.win_gravity = SouthWestGravity;
488 } 615 }
489 } 616 }
490 } 617 }
491/* TODO: BOUNDS */ 618 /* TODO: BOUNDS */
492 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 619 TermWin.width = TermWin.ncol * TermWin.fwidth;
493 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 620 TermWin.height = TermWin.nrow * TermWin.fheight;
494 max_width = MAX_COLS * R->TermWin.fwidth; 621 max_width = MAX_COLS * TermWin.fwidth;
495 max_height = MAX_ROWS * R->TermWin.fheight; 622 max_height = MAX_ROWS * TermWin.fheight;
496 623
497 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
498 625
499 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
500 R->window_vt_x = R->window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
501 if (scrollbar_visible(R)) { 628 if (scrollbar_visible ())
629 {
502 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
503 R->szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
504 if (!(R->Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
505 R->window_vt_x = sb_w; 633 window_vt_x = sb_w;
506 } 634 }
507 if (menubar_visible(R)) { 635 if (menubar_visible ())
636 {
508 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
509 R->szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
510 R->window_vt_y = mb_h; 639 window_vt_y = mb_h;
511 } 640 }
512 R->szHint.width_inc = R->TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
513 R->szHint.height_inc = R->TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
514 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 643 szHint.min_width = szHint.base_width + szHint.width_inc;
515 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 644 szHint.min_height = szHint.base_height + szHint.height_inc;
516 645
517 if (width && width - R->szHint.base_width < max_width) { 646 if (width && width - szHint.base_width < max_width)
647 {
518 R->szHint.width = width; 648 szHint.width = width;
519 R->TermWin.width = width - R->szHint.base_width; 649 TermWin.width = width - szHint.base_width;
520 } else { 650 }
651 else
652 {
521 MIN_IT(R->TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
522 R->szHint.width = R->szHint.base_width + R->TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
523 } 655 }
524 if (height && height - R->szHint.base_height < max_height) { 656 if (height && height - szHint.base_height < max_height)
657 {
525 R->szHint.height = height; 658 szHint.height = height;
526 R->TermWin.height = height - R->szHint.base_height; 659 TermWin.height = height - szHint.base_height;
527 } else { 660 }
661 else
662 {
528 MIN_IT(R->TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
529 R->szHint.height = R->szHint.base_height + R->TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
530 } 665 }
531 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
532 R->window_sb_x = R->szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
533 668
534 if (recalc_x) 669 if (recalc_x)
535 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
536 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 671 - szHint.width - 2 * TermWin.ext_bwidth);
537 if (recalc_y) 672 if (recalc_y)
538 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
539 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
540 675
541 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
542 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
543 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
544 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
545 R->szHint.height)); 680 szHint.height));
546 return; 681 return;
547} 682}
548 683
549/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
550/* 685/*
551 * Tell the teletype handler what size the window is. 686 * Tell the teletype handler what size the window is.
552 * Called after a window size change. 687 * Called after a window size change.
553 */ 688 */
554/* EXTPROTO */
555void 689void
556rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 690rxvt_term::tt_winch ()
557{ 691{
558 struct winsize ws; 692 struct winsize ws;
559 693
560 if (fd < 0) 694 if (cmd_fd < 0)
561 return; 695 return;
696
562 ws.ws_col = col; 697 ws.ws_col = TermWin.ncol;
563 ws.ws_row = row; 698 ws.ws_row = TermWin.nrow;
564 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
565#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
566 (void)ioctl(fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
567#else 702#else
568 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
569 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
570 }
571# ifdef SIGWINCH 705# ifdef SIGWINCH
572 else if (pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
573 kill(pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
574# endif 708# endif
575#endif 709#endif
576} 710}
577 711
578/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
579/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
580/* 714/*
581 * init = 1 - initialize 715 * init = 1 - initialize
582 * 716 *
583 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
584 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
585 */ 719 */
586/* EXTPROTO */ 720bool
587void
588rxvt_change_font(pR_ int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
589{ 722{
590} 723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
591 734
592/* INTPROTO */ 735 if (fs && fs->populate (fontname))
593void 736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0])
746 {
747 resize_all_windows (0, 0, 0);
748 scr_remap_chars ();
749 scr_touch (true);
750 }
751
752 return true;
753 }
754 }
755
756 return false;
757}
758
759bool
594rxvt_font_up_down(pR_ int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
595{ 761{
762 return false;
596} 763}
597 764
598/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
599/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
600/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
601/* EXTPROTO */
602void 768void
603rxvt_set_title(pR_ const char *str) 769rxvt_term::set_title (const char *str)
604{ 770{
605#ifndef SMART_WINDOW_TITLE 771#ifndef SMART_WINDOW_TITLE
606 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
607#else 773#else
608 char *name; 774 char *name;
609 775
610 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
611 name = NULL; 777 name = NULL;
612 if (name == NULL || STRCMP(name, str)) 778 if (name == NULL || STRCMP (name, str))
613 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
614 if (name) 780 if (name)
615 XFree(name); 781 XFree (name);
616#endif 782#endif
617} 783}
618 784
619/* EXTPROTO */
620void 785void
621rxvt_set_iconName(pR_ const char *str) 786rxvt_term::set_iconName (const char *str)
622{ 787{
623#ifndef SMART_WINDOW_TITLE 788#ifndef SMART_WINDOW_TITLE
624 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
625#else 790#else
626 char *name; 791 char *name;
627 792
628 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 793 if (XGetIconName (display->display, TermWin.parent[0], &name))
629 name = NULL; 794 name = NULL;
630 if (name == NULL || STRCMP(name, str)) 795 if (name == NULL || STRCMP (name, str))
631 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
632 if (name) 797 if (name)
633 XFree(name); 798 XFree (name);
634#endif 799#endif
635} 800}
636 801
637#ifdef XTERM_COLOR_CHANGE 802#ifdef XTERM_COLOR_CHANGE
638/* EXTPROTO */
639void 803void
640rxvt_set_window_color(pR_ int idx, const char *color) 804rxvt_term::set_window_color (int idx, const char *color)
641{ 805{
642 rxvt_color xcol; 806 rxvt_color xcol;
643 int i; 807 int i;
644 808
645 if (color == NULL || *color == '\0') 809 if (color == NULL || *color == '\0')
646 return; 810 return;
647 811
648/* handle color aliases */ 812 /* handle color aliases */
649 if (isdigit(*color)) { 813 if (isdigit (*color))
814 {
650 i = atoi(color); 815 i = atoi (color);
816 if (i >= 8 && i <= 15)
651 if (i >= 8 && i <= 15) { /* bright colors */ 817 { /* bright colors */
652 i -= 8; 818 i -= 8;
653# ifndef NO_BRIGHTCOLOR 819# ifndef NO_BRIGHTCOLOR
654 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 820 PixColors[idx] = PixColors[minBrightCOLOR + i];
655 SET_PIXCOLOR(R, idx); 821 SET_PIXCOLOR (idx);
656 goto Done; 822 goto Done;
657# endif 823# endif
824
658 } 825 }
659 if (i >= 0 && i <= 7) { /* normal colors */ 826 if (i >= 0 && i <= 7)
827 { /* normal colors */
660 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 828 PixColors[idx] = PixColors[minCOLOR + i];
661 SET_PIXCOLOR(R, idx); 829 SET_PIXCOLOR (idx);
662 goto Done; 830 goto Done;
663 } 831 }
664 } 832 }
665 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 833 if (!rXParseAllocColor (& xcol, color))
666 return; 834 return;
667/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 835 /* XStoreColor (display->display, XCMAP, XColor*); */
668 836
669/* 837 /*
670 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
671 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
672 */ 840 */
673# if 0 841# if 0
674 for (i = Color_Black; i <= Color_White; i++) 842 for (i = Color_Black; i <= Color_White; i++)
675 if (R->PixColors[idx] == R->PixColors[i]) 843 if (PixColors[idx] == PixColors[i])
676 break; 844 break;
677 if (i > Color_White) { 845 if (i > Color_White)
846 {
678 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
679 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
680 DisplayPlanes(R->Xdisplay, Xscreen)); 849 DisplayPlanes (display->display, display->screen));
681 } 850 }
682# endif 851# endif
683 852
684 R->PixColors[idx] = xcol; 853 PixColors[idx] = xcol;
685 SET_PIXCOLOR(R, idx); 854 SET_PIXCOLOR (idx);
686 855
687/* XSetWindowAttributes attr; */ 856 /* XSetWindowAttributes attr; */
688/* Cursor cursor; */ 857 /* Cursor cursor; */
689 Done: 858Done:
690 if (idx == Color_bg && !(R->Options & Opt_transparent)) 859 if (idx == Color_bg && ! (Options & Opt_transparent))
691 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 860 XSetWindowBackground (display->display, TermWin.vt,
692 R->PixColors[Color_bg]); 861 PixColors[Color_bg]);
693 862
694/* handle Color_BD, scrollbar background, etc. */ 863 /* handle Color_BD, scrollbar background, etc. */
695 864
696 rxvt_set_colorfgbg(aR); 865 set_colorfgbg ();
697 rxvt_recolour_cursor(aR); 866 recolour_cursor ();
698/* the only reasonable way to enforce a clean update */ 867 /* the only reasonable way to enforce a clean update */
699 rxvt_scr_poweron(aR); 868 scr_poweron ();
700} 869}
701 870
702#else 871#else
703# define rxvt_set_window_color(aR_ idx,color) ((void)0) 872# define set_window_color (idx,color) ((void)0)
704#endif /* XTERM_COLOR_CHANGE */ 873#endif /* XTERM_COLOR_CHANGE */
705 874
706/* EXTPROTO */
707void 875void
708rxvt_recolour_cursor(pR) 876rxvt_term::recolour_cursor ()
709{ 877{
710 rxvt_color xcol[2];
711
712#if TODO 878#if TODO
879 rxvt_color xcol[2];
880
713 xcol[0] = R->PixColors[Color_pointer]; 881 xcol[0] = PixColors[Color_pointer];
714 xcol[1] = R->PixColors[Color_bg]; 882 xcol[1] = PixColors[Color_bg];
715 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 883 XQueryColors (display->display, XCMAP, xcol, 2);
716 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
717#endif 885#endif
718} 886}
719 887
720/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
721/* 889/*
722 * find if fg/bg matches any of the normal (low-intensity) colors 890 * find if fg/bg matches any of the normal (low-intensity) colors
723 */ 891 */
724/* INTPROTO */
725void 892void
726rxvt_set_colorfgbg(pR) 893rxvt_term::set_colorfgbg ()
727{ 894{
728 unsigned int i; 895 unsigned int i;
729 const char *xpmb = "\0"; 896 const char *xpmb = "\0";
730 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 897 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
731 898
732 R->env_colorfgbg = 899 env_colorfgbg =
733 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 900 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
734 STRCPY(fstr, "default"); 901 STRCPY (fstr, "default");
735 STRCPY(bstr, "default"); 902 STRCPY (bstr, "default");
736 for (i = Color_Black; i <= Color_White; i++) 903 for (i = Color_Black; i <= Color_White; i++)
737 if (R->PixColors[Color_fg] == R->PixColors[i]) { 904 if (PixColors[Color_fg] == PixColors[i])
905 {
738 sprintf(fstr, "%d", (i - Color_Black)); 906 sprintf (fstr, "%d", (i - Color_Black));
739 break; 907 break;
740 } 908 }
741 for (i = Color_Black; i <= Color_White; i++) 909 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[Color_bg] == R->PixColors[i]) { 910 if (PixColors[Color_bg] == PixColors[i])
911 {
743 sprintf(bstr, "%d", (i - Color_Black)); 912 sprintf (bstr, "%d", (i - Color_Black));
744#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
745 xpmb = "default;"; 914 xpmb = "default;";
746#endif 915#endif
747 break; 916 break;
748 } 917 }
918
749 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
750 putenv(R->env_colorfgbg);
751 920
752#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
753 R->colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
754 for (i = minCOLOR; i <= maxCOLOR; i++) { 923 for (i = minCOLOR; i <= maxCOLOR; i++)
924 {
755 if (R->PixColors[Color_fg] == R->PixColors[i]) 925 if (PixColors[Color_fg] == PixColors[i])
756 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 926 colorfgbg = SET_FGCOLOR (colorfgbg, i);
757 if (R->PixColors[Color_bg] == R->PixColors[i]) 927 if (PixColors[Color_bg] == PixColors[i])
758 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 928 colorfgbg = SET_BGCOLOR (colorfgbg, i);
759 } 929 }
760#endif 930#endif
761} 931}
762 932
763/*----------------------------------------------------------------------*/ 933/*----------------------------------------------------------------------*/
764/* 934/*
765 * Colour determination for low colour displays, routine from 935 * Colour determination for low colour displays, routine from
766 * Hans de Goede <hans@highrise.nl> 936 * Hans de Goede <hans@highrise.nl>
767 */ 937 */
768 938
769/* EXTPROTO */
770int 939int
771rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
772{ 941{
773 screen_in_out->set(aR_ colour);
774
775 if (!screen_in_out->set(aR_ colour)) { 942 if (!screen_in_out->set (display, colour))
943 {
776 rxvt_print_error("can't allocate colour: %s", colour); 944 rxvt_print_error ("can't allocate colour: %s", colour);
777 return false; 945 return false;
778 } 946 }
779 947
780 return true; 948 return true;
781} 949}
782 950
783/* -------------------------------------------------------------------- * 951/* -------------------------------------------------------------------- *
784 * - WINDOW RESIZING - * 952 * - WINDOW RESIZING - *
785 * -------------------------------------------------------------------- */ 953 * -------------------------------------------------------------------- */
786/* EXTPROTO */
787void 954void
788rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 955rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
789 int ignoreparent)
790{ 956{
791 int fix_screen; 957 int fix_screen;
792 958
793#ifdef SMART_RESIZE 959#ifdef SMART_RESIZE
794 int old_width = R->szHint.width, old_height = R->szHint.height; 960 int old_width = szHint.width, old_height = szHint.height;
795#endif 961#endif
796 962
797 rxvt_window_calc(aR_ width, height); 963 window_calc (width, height);
798 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
799 if (!ignoreparent) { 965 if (!ignoreparent)
966 {
800#ifdef SMART_RESIZE 967#ifdef SMART_RESIZE
801/* 968 /*
802 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
803 * reposition window on resize depending on placement on screen 970 * reposition window on resize depending on placement on screen
804 */ 971 */
805 int x, y, x1, y1; 972 int x, y, x1, y1;
806 int dx, dy; 973 int dx, dy;
807 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 974 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
808 Window unused_cr; 975 Window unused_cr;
809 976
810 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 977 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
811 0, 0, &x, &y, &unused_cr); 978 0, 0, &x, &y, &unused_cr);
812 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 979 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
813 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 980 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
814 /* 981 /*
815 * if Xroot isn't the parent window, a WM will probably have offset 982 * if display->root isn't the parent window, a WM will probably have offset
816 * our position for handles and decorations. Counter it 983 * our position for handles and decorations. Counter it
817 */ 984 */
818 if (x1 != x || y1 != y) { 985 if (x1 != x || y1 != y)
986 {
819 x -= x1; 987 x -= x1;
820 y -= y1; 988 y -= y1;
821 } 989 }
822 990
823 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 991 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
824 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 992 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
825 dx = old_width - R->szHint.width; 993 dx = old_width - szHint.width;
826 dy = old_height - R->szHint.height; 994 dy = old_height - szHint.height;
827 995
828 /* Check position of the center of the window */ 996 /* Check position of the center of the window */
829 if (x < x1) /* left half */ 997 if (x < x1) /* left half */
830 dx = 0; 998 dx = 0;
831 else if (x == x1) /* exact center */ 999 else if (x == x1) /* exact center */
832 dx /= 2; 1000 dx /= 2;
833 if (y < y1) /* top half */ 1001 if (y < y1) /* top half */
834 dy = 0; 1002 dy = 0;
835 else if (y == y1) /* exact center */ 1003 else if (y == y1) /* exact center */
836 dy /= 2; 1004 dy /= 2;
837 1005
838 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
839 R->szHint.width, R->szHint.height); 1007 szHint.width, szHint.height);
840#else 1008#else
841 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
842 R->szHint.height); 1010 szHint.height);
843#endif 1011#endif
844 }
845 1012
1013 }
1014
846 fix_screen = (R->TermWin.ncol != R->prev_ncol 1015 fix_screen = (TermWin.ncol != prev_ncol
847 || R->TermWin.nrow != R->prev_nrow); 1016 || TermWin.nrow != prev_nrow);
1017
848 if (fix_screen || width != R->old_width || height != R->old_height) { 1018 if (fix_screen || width != old_width || height != old_height)
1019 {
849 if (scrollbar_visible(R)) { 1020 if (scrollbar_visible ())
1021 {
850 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
851 0, scrollbar_TotalWidth(), R->szHint.height); 1023 0, scrollbar_TotalWidth (), szHint.height);
852 rxvt_Resize_scrollBar(aR); 1024 resize_scrollbar ();
853 } 1025 }
1026
854 if (menubar_visible(R)) 1027 if (menubar_visible ())
855 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
856 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030
857 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
858 R->window_vt_y, TermWin_TotalWidth(), 1032 window_vt_y, TermWin_TotalWidth (),
859 TermWin_TotalHeight()); 1033 TermWin_TotalHeight ());
860#ifdef RXVT_GRAPHICS
861 if (R->old_height)
862 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
863 R->old_height - R->szHint.base_height);
864#endif
865 rxvt_scr_clear(aR); 1034 scr_clear ();
866#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
867 rxvt_resize_pixmap(aR); 1036 resize_pixmap ();
868#endif 1037#endif
869 }
870 1038
1039 }
1040
871 if (fix_screen || R->old_height == 0) { 1041 if (fix_screen || old_height == 0)
1042 {
872 int curr_screen = -1; 1043 int curr_screen = -1;
873 uint16_t old_ncol = R->prev_ncol; 1044 int old_ncol = prev_ncol;
874 1045
875 /* scr_reset only works on the primary screen */ 1046 /* scr_reset only works on the primary screen */
876 if (R->old_height) /* this is not the first time through */ 1047 if (old_height) /* this is not the first time through */
1048 {
1049 unsigned int ncol = TermWin.ncol;
1050 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
877 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1051 curr_screen = scr_change_screen (PRIMARY);
878 rxvt_scr_reset(aR); 1052 TermWin.ncol = ncol;
879 if (curr_screen >= 0) { /* this is not the first time through */
880 rxvt_scr_change_screen(aR_ curr_screen);
881 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
882 } 1053 }
883 }
884 1054
1055 scr_reset ();
1056
1057 if (curr_screen >= 0) /* this is not the first time through */
1058 {
1059 scr_change_screen (curr_screen);
1060 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1061 }
1062 }
1063
885 R->old_width = R->szHint.width; 1064 old_width = szHint.width;
886 R->old_height = R->szHint.height; 1065 old_height = szHint.height;
887 1066
888#ifdef USE_XIM 1067#ifdef USE_XIM
889 rxvt_IMSetStatusPosition(aR); 1068 IMSetStatusPosition ();
890#endif 1069#endif
891} 1070}
892 1071
893/* 1072/*
894 * Set the width/height of the vt window in characters. Units are pixels. 1073 * Set the width/height of the vt window in characters. Units are pixels.
895 * good for toggling 80/132 columns 1074 * good for toggling 80/132 columns
896 */ 1075 */
897/* EXTPROTO */
898void 1076void
899rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1077rxvt_term::set_widthheight (unsigned int width, unsigned int height)
900{ 1078{
901 XWindowAttributes wattr; 1079 XWindowAttributes wattr;
902 1080
903 if (width == 0 || height == 0) { 1081 if (width == 0 || height == 0)
1082 {
904 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1083 XGetWindowAttributes (display->display, display->root, &wattr);
905 if (width == 0) 1084 if (width == 0)
906 width = wattr.width - R->szHint.base_width; 1085 width = wattr.width - szHint.base_width;
907 if (height == 0) 1086 if (height == 0)
908 height = wattr.height - R->szHint.base_height; 1087 height = wattr.height - szHint.base_height;
909 } 1088 }
910 if (width != R->TermWin.width || height != R->TermWin.height) { 1089 if (width != TermWin.width || height != TermWin.height)
1090 {
911 width += R->szHint.base_width; 1091 width += szHint.base_width;
912 height += R->szHint.base_height; 1092 height += szHint.base_height;
913 rxvt_resize_all_windows(aR_ width, height, 0); 1093 resize_all_windows (width, height, 0);
914 } 1094 }
915} 1095}
916 1096
917/* -------------------------------------------------------------------- * 1097/* -------------------------------------------------------------------- *
918 * - X INPUT METHOD ROUTINES - * 1098 * - X INPUT METHOD ROUTINES - *
919 * -------------------------------------------------------------------- */ 1099 * -------------------------------------------------------------------- */
920#ifdef USE_XIM 1100#ifdef USE_XIM
921/* INTPROTO */ 1101
922void 1102void
923rxvt_setSize(pR_ XRectangle * size) 1103rxvt_term::im_set_size (XRectangle *size)
924{ 1104{
925 size->x = R->TermWin.int_bwidth; 1105 size->x = TermWin.int_bwidth;
926 size->y = R->TermWin.int_bwidth; 1106 size->y = TermWin.int_bwidth;
927 size->width = Width2Pixel(R->TermWin.ncol); 1107 size->width = Width2Pixel (TermWin.ncol);
928 size->height = Height2Pixel(R->TermWin.nrow); 1108 size->height = Height2Pixel (TermWin.nrow);
929} 1109}
930 1110
931/* INTPROTO */
932void 1111void
933rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1112rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
934{ 1113{
935 *fg = R->PixColors[Color_fg]; 1114 *fg = PixColors[Color_fg];
936 *bg = R->PixColors[Color_bg]; 1115 *bg = PixColors[Color_bg];
937} 1116}
938 1117
939/* Checking whether input method is running. */ 1118/* Checking whether input method is running. */
940/* INTPROTO */
941Bool 1119bool
942rxvt_IMisRunning(pR) 1120rxvt_term::IMisRunning ()
943{ 1121{
944 char *p; 1122 char *p;
945 Atom atom; 1123 Atom atom;
946 Window win; 1124 Window win;
947 char server[IMBUFSIZ]; 1125 char server[IMBUFSIZ];
948 1126
949/* get current locale modifier */ 1127 /* get current locale modifier */
950 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1128 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1129 {
951 STRCPY(server, "@server="); 1130 STRCPY (server, "@server=");
952 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1131 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
953 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1132 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
954 *p = '\0'; 1133 *p = '\0';
955 1134
956 atom = XInternAtom(R->Xdisplay, server, False); 1135 atom = XInternAtom (display->display, server, False);
957 win = XGetSelectionOwner(R->Xdisplay, atom); 1136 win = XGetSelectionOwner (display->display, atom);
958 if (win != None) 1137 if (win != None)
959 return True; 1138 return True;
960 } 1139 }
961 return False; 1140 return False;
962} 1141}
963 1142
964/* EXTPROTO */
965void 1143void
966rxvt_IMSendSpot(pR) 1144rxvt_term::IMSendSpot ()
967{ 1145{
968 XPoint spot; 1146 XPoint spot;
969 XVaNestedList preedit_attr; 1147 XVaNestedList preedit_attr;
970 1148
971 if (R->Input_Context == NULL 1149 if (Input_Context == NULL
972 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1150 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
973 || !(R->event_type == KeyPress 1151 || ! (event_type == KeyPress
974 || R->event_type == Expose 1152 || event_type == Expose
975 || R->event_type == NoExpose 1153 || event_type == NoExpose
976 || R->event_type == SelectionNotify 1154 || event_type == SelectionNotify
977 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1155 || event_type == ButtonRelease || event_type == FocusIn)
978 || !rxvt_IMisRunning(aR)) 1156 || !IMisRunning ())
979 return; 1157 return;
980 1158
981 rxvt_setPosition(aR_ & spot); 1159 im_set_position (&spot);
982 1160
983 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1161 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
984 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1162 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
985 XFree(preedit_attr); 1163 XFree (preedit_attr);
986} 1164}
987 1165
988/* EXTPROTO */
989void 1166void
990rxvt_setTermFontSet(pR_ int idx)
991{
992 char *string;
993 long length;
994 int success = 0;
995
996 if (idx < 0 || idx >= MAX_NFONTS)
997 return;
998}
999
1000/* INTPROTO */
1001void
1002rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1167rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1003 XRectangle * needed_rect) 1168 XRectangle * needed_rect)
1004{ 1169{
1005 int mbh, vtx = 0; 1170 int mbh, vtx = 0;
1006 1171
1007 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1172 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1008 vtx = scrollbar_TotalWidth(); 1173 vtx = scrollbar_TotalWidth ();
1174
1009 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1175 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1010 mbh -= R->TermWin.lineSpace; 1176 mbh -= TermWin.lineSpace;
1011 1177
1012 preedit_rect->x = needed_rect->width + vtx; 1178 preedit_rect->x = needed_rect->width + vtx;
1013 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1179 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1014 1180
1015 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1181 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1016 + vtx;
1017 preedit_rect->height = Height2Pixel(1); 1182 preedit_rect->height = Height2Pixel (1);
1018 1183
1019 status_rect->x = vtx; 1184 status_rect->x = vtx;
1020 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1185 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1021 1186
1022 status_rect->width = needed_rect->width ? needed_rect->width 1187 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1023 : Width2Pixel(R->TermWin.ncol + 1);
1024 status_rect->height = Height2Pixel(1); 1188 status_rect->height = Height2Pixel (1);
1025} 1189}
1026 1190
1027/* ARGSUSED */
1028/* INTPROTO */
1029void 1191void
1030rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1192rxvt_term::im_destroy ()
1031 __attribute__ ((unused)), XPointer call_data
1032 __attribute__ ((unused)))
1033{ 1193{
1034 dR; 1194 if (Input_Context)
1035 1195 {
1196 XDestroyIC (Input_Context);
1036 R->Input_Context = NULL; 1197 Input_Context = NULL;
1037/* To avoid Segmentation Fault in C locale: Solaris only? */ 1198 }
1038 if (STRCMP(R->locale, "C"))
1039 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1040 rxvt_IMInstantiateCallback, NULL);
1041}
1042 1199
1043/* 1200 if (input_method)
1044 * X manual pages and include files don't match on some systems:
1045 * some think this is an XIDProc and others an XIMProc so we can't
1046 * use the first argument - need to update this to be nice for
1047 * both types via some sort of configure detection
1048 */
1049/* ARGSUSED */
1050/* EXTPROTO */
1051void
1052rxvt_IMInstantiateCallback(Display * unused
1053 __attribute__ ((unused)), XPointer client_data
1054 __attribute__ ((unused)), XPointer call_data
1055 __attribute__ ((unused)))
1056{
1057 dR;
1058 int i, found, had_im;
1059 const char *p;
1060 char **s;
1061 char buf[IMBUFSIZ];
1062
1063 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1064 if (R->Input_Context)
1065 return;
1066
1067 found = had_im = 0;
1068 p = R->rs[Rs_inputMethod];
1069 if (p && *p) {
1070 had_im = 1;
1071 s = rxvt_splitcommastring(p);
1072 for (i = 0; s[i]; i++) {
1073 if (*s[i]) {
1074 STRCPY(buf, "@im=");
1075 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1076 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1077 && (rxvt_IM_get_IC(aR) == True)) {
1078 found = 1;
1079 break;
1080 }
1081 }
1082 }
1083 for (i = 0; s[i]; i++)
1084 free(s[i]);
1085 free(s);
1086 } 1201 {
1087 if (found) 1202 display->put_xim (input_method);
1088 return; 1203 input_method = 0;
1089
1090/* try with XMODIFIERS env. var. */
1091 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1092 rxvt_IM_get_IC(aR);
1093 return;
1094 } 1204 }
1095
1096/* try with no modifiers base IF the user didn't specify an IM */
1097 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1098 && rxvt_IM_get_IC(aR) == True)
1099 return;
1100} 1205}
1101 1206
1102/* 1207/*
1103 * Try to open a XIM with the current modifiers, then see if we can 1208 * Try to open a XIM with the current modifiers, then see if we can
1104 * open a suitable preedit type 1209 * open a suitable preedit type
1105 */ 1210 */
1106/* INTPROTO */
1107Bool 1211bool
1108rxvt_IM_get_IC(pR) 1212rxvt_term::IM_get_IC (const char *modifiers)
1109{ 1213{
1110 int i, j, found; 1214 int i, j, found;
1111 XIM xim; 1215 XIM xim;
1112 XPoint spot; 1216 XPoint spot;
1113 XRectangle rect, status_rect, needed_rect; 1217 XRectangle rect, status_rect, needed_rect;
1114 unsigned long fg, bg; 1218 unsigned long fg, bg;
1115 const char *p; 1219 const char *p;
1116 char **s; 1220 char **s;
1117 XIMStyles *xim_styles; 1221 XIMStyles *xim_styles;
1118 XVaNestedList preedit_attr, status_attr; 1222 XVaNestedList preedit_attr, status_attr;
1119 XIMCallback ximcallback;
1120 1223
1224 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1225 return false;
1226
1121 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1227 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1122 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1228 input_method = display->get_xim (locale, modifiers);
1123 if (xim == NULL) 1229 if (input_method == NULL)
1124 return False; 1230 return false;
1125 1231
1232 xim = input_method->xim;
1233
1126 xim_styles = NULL; 1234 xim_styles = NULL;
1127 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1235 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1128 || !xim_styles || !xim_styles->count_styles) { 1236 || !xim_styles || !xim_styles->count_styles)
1129 XCloseIM(xim); 1237 {
1238 display->put_xim (input_method);
1130 return False; 1239 return false;
1131 } 1240 }
1132 1241
1133 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1242 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1134 : "OverTheSpot,OffTheSpot,Root";
1135 s = rxvt_splitcommastring(p); 1243 s = rxvt_splitcommastring (p);
1136 for (i = found = 0; !found && s[i]; i++) { 1244 for (i = found = 0; !found && s[i]; i++)
1245 {
1137 if (!STRCMP(s[i], "OverTheSpot")) 1246 if (!STRCMP (s[i], "OverTheSpot"))
1138 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1247 input_style = (XIMPreeditPosition | XIMStatusNothing);
1139 else if (!STRCMP(s[i], "OffTheSpot")) 1248 else if (!STRCMP (s[i], "OffTheSpot"))
1140 R->input_style = (XIMPreeditArea | XIMStatusArea); 1249 input_style = (XIMPreeditArea | XIMStatusArea);
1141 else if (!STRCMP(s[i], "Root")) 1250 else if (!STRCMP (s[i], "Root"))
1142 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1251 input_style = (XIMPreeditNothing | XIMStatusNothing);
1143 1252
1144 for (j = 0; j < xim_styles->count_styles; j++) 1253 for (j = 0; j < xim_styles->count_styles; j++)
1145 if (R->input_style == xim_styles->supported_styles[j]) { 1254 if (input_style == xim_styles->supported_styles[j])
1255 {
1146 found = 1; 1256 found = 1;
1257 break;
1258 }
1259 }
1260
1261 for (i = 0; s[i]; i++)
1262 free (s[i]);
1263
1264 free (s);
1265 XFree (xim_styles);
1266
1267 if (!found)
1268 {
1269 display->put_xim (input_method);
1270 return false;
1271 }
1272
1273 preedit_attr = status_attr = NULL;
1274
1275 if (input_style & XIMPreeditPosition)
1276 {
1277 im_set_size (&rect);
1278 im_set_position (&spot);
1279 im_set_color (&fg, &bg);
1280
1281 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1282 XNSpotLocation, &spot,
1283 XNForeground, fg, XNBackground, bg,
1284 //XNFontSet, TermWin.fontset,
1285 NULL);
1286 }
1287 else if (input_style & XIMPreeditArea)
1288 {
1289 im_set_color (&fg, &bg);
1290
1291 /*
1292 * The necessary width of preedit area is unknown
1293 * until create input context.
1294 */
1295 needed_rect.width = 0;
1296
1297 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1298
1299 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1300 XNForeground, fg, XNBackground, bg,
1301 //XNFontSet, TermWin.fontset,
1302 NULL);
1303 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1304 XNForeground, fg, XNBackground, bg,
1305 //XNFontSet, TermWin.fontset,
1306 NULL);
1307 }
1308
1309 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1310 XNClientWindow, TermWin.parent[0],
1311 XNFocusWindow, TermWin.parent[0],
1312 preedit_attr ? XNPreeditAttributes : NULL,
1313 preedit_attr,
1314 status_attr ? XNStatusAttributes : NULL,
1315 status_attr, NULL);
1316 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr);
1318
1319 if (Input_Context == NULL)
1320 {
1321 rxvt_print_error ("failed to create input context");
1322 display->put_xim (input_method);
1323 return false;
1324 }
1325
1326 if (input_style & XIMPreeditArea)
1327 IMSetStatusPosition ();
1328
1329 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1330 return true;
1331}
1332
1333void
1334rxvt_term::im_cb ()
1335{
1336 int i, found, had_im;
1337 const char *p;
1338 char **s;
1339 char buf[IMBUFSIZ];
1340
1341 im_destroy ();
1342
1343 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1344 if (Input_Context)
1345 return;
1346
1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1348 if (rs[Rs_imLocale])
1349 SET_LOCALE (rs[Rs_imLocale]);
1350#endif
1351
1352 p = rs[Rs_inputMethod];
1353 if (p && *p)
1354 {
1355 bool found = false;
1356
1357 s = rxvt_splitcommastring (p);
1358 for (i = 0; s[i]; i++)
1359 {
1360 if (*s[i])
1361 {
1362 STRCPY (buf, "@im=");
1363 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1364 if (IM_get_IC (buf))
1365 {
1366 found = true;
1147 break; 1367 break;
1368 }
1148 } 1369 }
1149 } 1370 }
1150 for (i = 0; s[i]; i++) 1371 for (i = 0; s[i]; i++)
1151 free(s[i]); 1372 free (s[i]);
1152 free(s); 1373 free (s);
1153 XFree(xim_styles);
1154 1374
1155 if (!found) { 1375 if (found)
1156 XCloseIM(xim); 1376 goto done;
1157 return False;
1158 } 1377 }
1159 1378
1160 ximcallback.callback = rxvt_IMDestroyCallback; 1379 /* try with XMODIFIERS env. var. */
1380 if (IM_get_IC (""))
1381 goto done;
1161 1382
1162/* XXX: not sure why we need this (as well as IC one below) */ 1383 /* try with no modifiers base IF the user didn't specify an IM */
1163 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1384 if (IM_get_IC ("@im=none"))
1385 goto done;
1164 1386
1165 preedit_attr = status_attr = NULL; 1387done:
1166 1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1167 if (R->input_style & XIMPreeditPosition) { 1389 if (rs[Rs_imLocale])
1168 rxvt_setSize(aR_ & rect); 1390 SET_LOCALE (locale);
1169 rxvt_setPosition(aR_ & spot); 1391#endif
1170 rxvt_setColor(aR_ & fg, &bg);
1171
1172 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1173 XNSpotLocation, &spot,
1174 XNForeground, fg, XNBackground, bg,
1175 //XNFontSet, R->TermWin.fontset,
1176 NULL);
1177 } else if (R->input_style & XIMPreeditArea) {
1178 rxvt_setColor(aR_ & fg, &bg);
1179
1180 /*
1181 * The necessary width of preedit area is unknown
1182 * until create input context.
1183 */
1184 needed_rect.width = 0;
1185
1186 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1187
1188 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1189 XNForeground, fg, XNBackground, bg,
1190 //XNFontSet, R->TermWin.fontset,
1191 NULL);
1192 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1193 XNForeground, fg, XNBackground, bg,
1194 //XNFontSet, R->TermWin.fontset,
1195 NULL);
1196 }
1197 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1198 XNClientWindow, R->TermWin.parent[0],
1199 XNFocusWindow, R->TermWin.parent[0],
1200 XNDestroyCallback, &ximcallback,
1201 preedit_attr ? XNPreeditAttributes : NULL,
1202 preedit_attr,
1203 status_attr ? XNStatusAttributes : NULL,
1204 status_attr, NULL);
1205 if (preedit_attr)
1206 XFree(preedit_attr);
1207 if (status_attr)
1208 XFree(status_attr);
1209 if (R->Input_Context == NULL) {
1210 rxvt_print_error("failed to create input context");
1211 XCloseIM(xim);
1212 return False;
1213 }
1214 if (R->input_style & XIMPreeditArea)
1215 rxvt_IMSetStatusPosition(aR);
1216 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1217 return True;
1218} 1392}
1219 1393
1220/* EXTPROTO */
1221void 1394void
1222rxvt_IMSetStatusPosition(pR) 1395rxvt_term::IMSetStatusPosition ()
1223{ 1396{
1224 XRectangle preedit_rect, status_rect, *needed_rect; 1397 XRectangle preedit_rect, status_rect, *needed_rect;
1225 XVaNestedList preedit_attr, status_attr; 1398 XVaNestedList preedit_attr, status_attr;
1226 1399
1227 if (R->Input_Context == NULL 1400 if (Input_Context == NULL
1228 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1401 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1229 || !rxvt_IMisRunning(aR)) 1402 || !IMisRunning ())
1230 return; 1403 return;
1231 1404
1232/* Getting the necessary width of preedit area */ 1405 /* Getting the necessary width of preedit area */
1233 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1234 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1407 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1235 XFree(status_attr); 1408 XFree (status_attr);
1236 1409
1237 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1410 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1238 1411
1239 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1412 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1240 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1241 1414
1242 XSetICValues(R->Input_Context, 1415 XSetICValues (Input_Context,
1243 XNPreeditAttributes, preedit_attr, 1416 XNPreeditAttributes, preedit_attr,
1244 XNStatusAttributes, status_attr, NULL); 1417 XNStatusAttributes, status_attr, NULL);
1245 1418
1246 XFree(preedit_attr); 1419 XFree (preedit_attr);
1247 XFree(status_attr); 1420 XFree (status_attr);
1248} 1421}
1249#endif /* USE_XIM */ 1422#endif /* USE_XIM */
1250 1423
1251/*----------------------------------------------------------------------*/ 1424/*----------------------------------------------------------------------*/
1252rxvt_t rxvt_current_term; 1425rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines