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.39 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

… …
80 vt_ev (this, &rxvt_term::x_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS 81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb), 82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif 83#endif
84#ifdef MENUBAR 84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb), fixme 85 menubar_ev (this, &rxvt_term::x_cb),
86#endif 86#endif
87#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif 89#endif
90#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
… …
117#endif 117#endif
118 118
119 delete TermWin.fontset; 119 delete TermWin.fontset;
120 120
121 if (display) 121 if (display)
122 {
122 if (TermWin.parent[0]) 123 if (TermWin.parent[0])
123 XDestroyWindow (display->display, 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 }
124 131
125 // TODO: free pixcolours, colours should become part of rxvt_display 132 // TODO: free pixcolours, colours should become part of rxvt_display
126 133
127 delete PixColors; 134 delete PixColors;
128 135
… …
249 256
250 const char **cmd_argv = init_resources (argc, argv); 257 const char **cmd_argv = init_resources (argc, argv);
251 258
252 set_locale (""); 259 set_locale ("");
253 260
254#if (MENUBAR_MAX) 261#if MENUBAR_MAX
255 menubar_read (rs[Rs_menu]); 262 menubar_read (rs[Rs_menu]);
256#endif 263#endif
257#ifdef HAVE_SCROLLBARS 264#ifdef HAVE_SCROLLBARS
258 if (Options & Opt_scrollBar) 265 if (Options & Opt_scrollBar)
259 scrollBar.setIdle (); /* set existence for size calculations */ 266 scrollBar.setIdle (); /* set existence for size calculations */
… …
262 create_windows (argc, argv); 269 create_windows (argc, argv);
263 270
264 init_xlocale (); 271 init_xlocale ();
265 272
266 scr_reset (); /* initialize screen */ 273 scr_reset (); /* initialize screen */
267#ifdef RXVT_GRAPHICS
268 Gr_reset (); /* reset graphics */
269#endif
270 274
271#if 0 275#if 0
272 XSynchronize (display->display, True); 276 XSynchronize (display->display, True);
273#endif 277#endif
274 278
275#ifdef HAVE_SCROLLBARS 279#ifdef HAVE_SCROLLBARS
276 if (Options & Opt_scrollBar) 280 if (Options & Opt_scrollBar)
277 resize_scrollbar (); /* create and map scrollbar */ 281 resize_scrollbar (); /* create and map scrollbar */
278#endif 282#endif
279#if (MENUBAR_MAX) 283#if (MENUBAR_MAX)
280 if (menubar_visible (r)) 284 if (menubar_visible ())
281 XMapWindow (display->display, menuBar.win); 285 XMapWindow (display->display, menuBar.win);
282#endif 286#endif
283#ifdef TRANSPARENT 287#ifdef TRANSPARENT
284 if (Options & Opt_transparent) 288 if (Options & Opt_transparent)
285 { 289 {
… …
718 * init = 1 - initialize 722 * init = 1 - initialize
719 * 723 *
720 * fontname == FONT_UP - switch to bigger font 724 * fontname == FONT_UP - switch to bigger font
721 * fontname == FONT_DN - switch to smaller font 725 * fontname == FONT_DN - switch to smaller font
722 */ 726 */
723void 727bool
724rxvt_term::change_font (int init, const char *fontname) 728rxvt_term::change_font (const char *fontname)
725{} 729{
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);
726 741
727void 742 if (fs && fs->populate (fontname))
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
728rxvt_term::font_up_down (int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
729{} 768{
769 return false;
770}
730 771
731/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
732/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
733/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
734void 775void
… …
995 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
996 1037
997 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
998 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
999 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
1000#ifdef RXVT_GRAPHICS
1001 if (old_height)
1002 Gr_Resize (old_width - szHint.base_width,
1003 old_height - szHint.base_height);
1004#endif
1005 scr_clear (); 1041 scr_clear ();
1006#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1007 resize_pixmap (); 1043 resize_pixmap ();
1008#endif 1044#endif
1009 1045

Diff Legend

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