Move window urgency handling entirely into x.c

[st.git] / st.c

diff --git a/st.c b/st.c
index 6338510..df43fac 100644 (file)
--- a/st.c
+++ b/st.c
@@ -31,8 +31,8 @@
 #define Glyph Glyph_
 #define Font Font_
 
 #define Glyph Glyph_
 #define Font Font_
 

-#include "win.h"

 #include "st.h"
 #include "st.h"

+#include "win.h"

 
 #if   defined(__linux)
  #include <pty.h>
 
 #if   defined(__linux)
  #include <pty.h>


@@ -128,9 +128,6 @@ static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);

-static void zoom(const Arg *);
-static void zoomabs(const Arg *);
-static void zoomreset(const Arg *);

 static void printsel(const Arg *);
 static void printscreen(const Arg *) ;
 static void iso14755(const Arg *);
 static void printsel(const Arg *);
 static void printscreen(const Arg *) ;
 static void iso14755(const Arg *);


@@ -2179,10 +2176,7 @@ tcontrolcode(uchar ascii)
                        /* backwards compatibility to xterm */
                        strhandle();
                } else {
                        /* backwards compatibility to xterm */
                        strhandle();
                } else {

-                       if (!(win.state & WIN_FOCUSED))
-                               xseturgency(1);
-                       if (bellvolume)
-                               xbell(bellvolume);
+                       xbell();

                }
                break;
        case '\033': /* ESC */
                }
                break;
        case '\033': /* ESC */


@@ -2573,37 +2567,6 @@ tresize(int col, int row)
        term.c = c;
 }
 
        term.c = c;
 }
 

-void
-zoom(const Arg *arg)
-{
-       Arg larg;
-
-       larg.f = usedfontsize + arg->f;
-       zoomabs(&larg);
-}
-
-void
-zoomabs(const Arg *arg)
-{
-       xunloadfonts();
-       xloadfonts(usedfont, arg->f);
-       cresize(0, 0);
-       ttyresize();
-       redraw();
-       xhints();
-}
-
-void
-zoomreset(const Arg *arg)
-{
-       Arg larg;
-
-       if (defaultfontsize > 0) {
-               larg.f = defaultfontsize;
-               zoomabs(&larg);
-       }
-}
-

 void
 resettitle(void)
 {
 void
 resettitle(void)
 {