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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

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

Diff Legend

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