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.32 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.45 by pcg, Tue Feb 24 21:46:15 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
79 vt_ev (this, &rxvt_term::x_cb), 80 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 81#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 82 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 83#endif
83#ifdef MENUBAR 84#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 85 menubar_ev (this, &rxvt_term::x_cb),
85#endif 86#endif
86#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 89#endif
89#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 92#endif
92#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
94#endif 98#endif
95 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 102 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 103{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 105}
105 106
106rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
107{ 108{
108 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
109 close (cmd_fd); 110 close (cmd_fd);
110 111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
135
136 delete PixColors;
137
138 displays.put (display);
139
111 scr_release (); 140 scr_release ();
112 141
142 free (env_windowid);
143 free (env_display);
144 free (env_term);
145 free (env_colorfgbg);
113 free (locale); 146 free (locale);
114 free (codeset); 147 free (codeset);
115 148
116#ifndef NO_SETOWNER_TTYDEV 149 delete envv;
117 privileged_ttydev (RESTORE); 150 delete argv;
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset;
127
128 displays.put (display);
129} 151}
130 152
131void 153void
132rxvt_term::destroy () 154rxvt_term::destroy ()
133{ 155{
134 if (display) 156 if (display)
135 { 157 {
136 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]);
138
139 rootwin_ev.stop (display); 158 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 159 termwin_ev.stop (display);
141 vt_ev.stop (display); 160 vt_ev.stop (display);
142
143#ifdef USE_XIM 161#ifdef USE_XIM
144 im_destroy (); 162 im_destroy ();
145 im_ev.stop (display); 163 im_ev.stop (display);
146#endif 164#endif
147#ifdef HAVE_SCROLLBARS 165#ifdef HAVE_SCROLLBARS
… …
240 258
241 const char **cmd_argv = init_resources (argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
242 260
243 set_locale (""); 261 set_locale ("");
244 262
245#if (MENUBAR_MAX) 263#if MENUBAR_MAX
246 menubar_read (rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
247#endif 265#endif
248#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
249 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
250 scrollBar.setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
… …
253 create_windows (argc, argv); 271 create_windows (argc, argv);
254 272
255 init_xlocale (); 273 init_xlocale ();
256 274
257 scr_reset (); /* initialize screen */ 275 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 276
262#if 0 277#if 0
263#ifdef DEBUG_X
264 XSynchronize (display->display, True); 278 XSynchronize (display->display, True);
265#endif
266#endif 279#endif
267 280
268#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
271#endif 284#endif
272#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
273 if (menubar_visible (r)) 286 if (menubar_visible ())
274 XMapWindow (display->display, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
275#endif 288#endif
276#ifdef TRANSPARENT 289#ifdef TRANSPARENT
277 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
278 { 291 {
… …
284 rootwin_ev.start (display, display->root); 297 rootwin_ev.start (display, display->root);
285 298
286 XMapWindow (display->display, TermWin.vt); 299 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 300 XMapWindow (display->display, TermWin.parent[0]);
288 301
289 init_env ();
290 init_command (cmd_argv); 302 init_command (cmd_argv);
291 303
292 pty_ev.start (cmd_fd, EVENT_READ); 304 pty_ev.start (cmd_fd, EVENT_READ);
293 305
294 check_ev.start (); 306 check_ev.start ();
… …
712 * init = 1 - initialize 724 * init = 1 - initialize
713 * 725 *
714 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
716 */ 728 */
717void 729bool
718rxvt_term::change_font (int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
719{} 731{
732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
720 743
721void 744 if (fs && fs->populate (fontname))
745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 // TODO: screen needs to be told about new fonts
753
754 if (TermWin.parent[0])
755 {
756 resize_all_windows (0, 0, 0);
757 scr_remap_chars ();
758 scr_touch (true);
759 }
760
761 return true;
762 }
763 }
764
765 return false;
766}
767
768bool
722rxvt_term::font_up_down (int n, int direction) 769rxvt_term::font_up_down (int n, int direction)
723{} 770{
771 return false;
772}
724 773
725/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
726/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
727/* xterm sequences - title, iconName, color (exptl) */ 776/* xterm sequences - title, iconName, color (exptl) */
728void 777void
… …
873#ifdef XPM_BACKGROUND 922#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 923 xpmb = "default;";
875#endif 924#endif
876 break; 925 break;
877 } 926 }
927
878 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 928 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv (env_colorfgbg);
880 929
881#ifndef NO_BRIGHTCOLOR 930#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 931 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 932 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 933 {
… …
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1038 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990 1039
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1040 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992 window_vt_y, TermWin_TotalWidth (), 1041 window_vt_y, TermWin_TotalWidth (),
993 TermWin_TotalHeight ()); 1042 TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS
995 if (old_height)
996 Gr_Resize (old_width - szHint.base_width,
997 old_height - szHint.base_height);
998#endif
999 scr_clear (); 1043 scr_clear ();
1000#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 1045 resize_pixmap ();
1002#endif 1046#endif
1003 1047
… …
1309 if (Input_Context) 1353 if (Input_Context)
1310 return; 1354 return;
1311 1355
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1356#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1357 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1358 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1359#endif
1316 1360
1317 p = rs[Rs_inputMethod]; 1361 p = rs[Rs_inputMethod];
1318 if (p && *p) 1362 if (p && *p)
1319 { 1363 {
… …
1350 goto done; 1394 goto done;
1351 1395
1352done: 1396done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1397#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1398 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1399 SET_LOCALE (locale);
1356#endif 1400#endif
1357} 1401}
1358 1402
1359void 1403void
1360rxvt_term::IMSetStatusPosition () 1404rxvt_term::IMSetStatusPosition ()

Diff Legend

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