Use glib's str functions (g_strlcat, g_strlcpy, g_snprintf, g_strdup_vprintf)

[ncmpc.git] / src / screen_utils.c

diff --git a/src/screen_utils.c b/src/screen_utils.c
index d6e19fa3ec1047c674ed83bd2c8638d1d957fcd8..baa371be1aec79ae12c1ece3bd4691b1cb995869 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
@@ -38,6 +38,15 @@
 #define FIND_PROMPT  _("Find: ")
 #define RFIND_PROMPT _("Find backward: ")
 
+void
+screen_bell(void)
+{
+  if( options.audible_bell )
+    beep();
+  if( options.visible_bell )
+    flash();
+}
+
 int
 screen_getch(WINDOW *w, char *prompt)
 {
@@ -54,11 +63,14 @@ screen_getch(WINDOW *w, char *prompt)
   curs_set(1);
   timeout(-1);
 
-  while( (key=wgetch(w)) == ERR )
+  while( (key=my_wgetch(w)) == ERR )
     ;
-  
-  if( key==KEY_RESIZE )
-    screen_resize();
+
+#ifdef HAVE_GETMOUSE
+  /* ignore mouse events */
+  if( key==KEY_MOUSE )
+    return screen_getch(w, prompt);
+#endif
 
   noecho();
   curs_set(0);
@@ -150,7 +162,7 @@ screen_find(screen_t *screen,
       else
        {
          screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf);
-         beep();
+         screen_bell();
        }
       return 1;
     default:
@@ -200,3 +212,27 @@ screen_display_completion_list(screen_t *screen, GList *list)
   doupdate();
   colors_use(w, COLOR_LIST);
 }
+
+void
+set_xterm_title(char *format, ...)
+{
+  /* the current xterm title exists under the WM_NAME property */
+  /* and can be retreived with xprop -id $WINDOWID */
+
+  if( options.enable_xterm_title )
+    {
+      if( g_getenv("WINDOWID") )
+       {
+         char *msg;
+         va_list ap;
+         
+         va_start(ap,format);
+         msg = g_strdup_vprintf(format,ap);
+         va_end(ap);
+         printf("%c]0;%s%c", '\033', msg, '\007'); 
+         g_free(msg);
+       }
+      else
+       options.enable_xterm_title = FALSE;
+    }
+}