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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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