more cleanup

diff --git a/application/application.c b/application/application.c
index cc03795e0573ed5d66b37fa3559143e74466daaf..f032afdac3066dc2b44ff1722188cc535b1613ee 100644 (file)
--- a/application/application.c
+++ b/application/application.c
@@ -55,7 +55,7 @@ void AppInitMenu(void) {
         ui_menuitem(.label = "Fullscreen");
         ui_menu_toggleitem(.label = "View Sidebar", .varname = "sidebar", .onchange = ActionViewSidebarCB);
         ui_menuseparator();
-        ui_menu_toggleitem(.label = "Adjust Window Size", .varname = "adjustwindowsize", .onchange = ActionViewAdjustWindowSizeCB);
+        ui_menu_toggleitem(.label = "Adjust Window Size", .varname = "adjustwindowsize");
     }
     ui_menu("Preferences") {
         ui_menu_toggleitem(.label = "Single Instance", .varname = "singleinstance", .onchange = ActionPrefSingleInstanceCB);
@@ -69,8 +69,7 @@ void AppStart(UiEvent *event, AppStartupSettings *settings) {
     MainWindow *window = WindowCreate(display);
     toplevel_window = window->obj->window;
     if(settings->disable_adjust_window_size) {
-        window->adjustWindowSize = FALSE;
-        XtVaSetValues(window->viewAdjustWindowSize, XmNset, FALSE, NULL);
+        ui_set(window->adjustWindowSize, 0);
     }
     
     // random numbers used for creating tmp dirs and for random playback
@@ -81,9 +80,7 @@ void AppStart(UiEvent *event, AppStartupSettings *settings) {
     }
     
     if(settings->single_instance) {
-        // this will trigger the Single Instance menu button event handler
-        // and enable the single instance mode if possible
-        XmToggleButtonGadgetSetState(window->prefSingleInstanceButton, True, True);
+        enable_single_instance_mode(window);
     }
       
     WindowShow(window);
@@ -143,9 +140,9 @@ void ActionPlayRepeat(UiEvent *event, void *userdata) {
     }
     MainWindow *win = event->window;
     win->playlist.playback = event->intval ? PLAYBACK_REPEAT : PLAYBACK_STOP;
-    ui_set(win->_playbackRepeatList, 0);
-    ui_set(win->_playbackAutoPlay, 0);
-    ui_set(win->_playbackRandom, 0);
+    ui_set(win->playbackRepeatList, 0);
+    ui_set(win->playbackAutoPlay, 0);
+    ui_set(win->playbackRandom, 0);
 }
 
 void ActionPlayRepeatList(UiEvent *event, void *userdata) {
@@ -154,9 +151,9 @@ void ActionPlayRepeatList(UiEvent *event, void *userdata) {
     }
     MainWindow *win = event->window;
     win->playlist.playback = event->intval ? PLAYBACK_REPEAT_LIST : PLAYBACK_STOP;
-    ui_set(win->_playbackRepeat, 0);
-    ui_set(win->_playbackRandom, 0);
-    ui_set(win->_playbackAutoPlay, 0);
+    ui_set(win->playbackRepeat, 0);
+    ui_set(win->playbackRandom, 0);
+    ui_set(win->playbackAutoPlay, 0);
 }
 
 void ActionPlayAutoPlayCB(UiEvent *event, void *userdata) {
@@ -165,9 +162,9 @@ void ActionPlayAutoPlayCB(UiEvent *event, void *userdata) {
     }
     MainWindow *win = event->window;
     win->playlist.playback = event->intval ? PLAYBACK_AUTOPLAY : PLAYBACK_STOP;
-    ui_set(win->_playbackRepeat, 0);
-    ui_set(win->_playbackRepeatList, 0);
-    ui_set(win->_playbackRandom, 0);
+    ui_set(win->playbackRepeat, 0);
+    ui_set(win->playbackRepeatList, 0);
+    ui_set(win->playbackRandom, 0);
 }
 
 void ActionPlayRandomCB(UiEvent *event, void *userdata) {
@@ -176,9 +173,9 @@ void ActionPlayRandomCB(UiEvent *event, void *userdata) {
     }
     MainWindow *win = event->window;
     win->playlist.playback = event->intval ? PLAYBACK_RANDOM : PLAYBACK_STOP;
-    ui_set(win->_playbackRepeat, 0);
-    ui_set(win->_playbackRepeatList, 0);
-    ui_set(win->_playbackAutoPlay, 0);
+    ui_set(win->playbackRepeat, 0);
+    ui_set(win->playbackRepeatList, 0);
+    ui_set(win->playbackAutoPlay, 0);
 }
 
 void ActionPlayPreviousCB(UiEvent *event, void *userdata) {
@@ -211,37 +208,36 @@ void ActionViewSidebarCB(UiEvent *event, void *userdata) {
     WindowShowSidebar(win, event->intval);
 }
 
-void ActionViewAdjustWindowSizeCB(UiEvent *event, void *userdata) {
-    if(event->set) {
-        return;
-    }
-    MainWindow *win = event->window;
-    win->adjustWindowSize = event->intval;
-}
-
 void ActionPrefSingleInstanceCB(UiEvent *event, void *userdata) {
     if(event->set) {
         return;
     }
-    MainWindow *win = event->window;
     
-    win->singleInstance = event->intval;
+    MainWindow *win = event->window;
     
     Display *dp = ui_motif_get_display();
     
-    if(!win->singleInstance) {
+    if(!event->intval) {
         ShutdownInstanceSocket(dp);
         return;
     }
     
-    Bool disable_item = False;
-    if(CreateSingleInstanceSocket(dp, &disable_item)) {
-        // TODO: err
-        disable_item = True;
+    enable_single_instance_mode(win);
+}
+
+int enable_single_instance_mode(MainWindow *win) {
+    Display *dp = ui_motif_get_display();
+    
+    int error = 0;
+    if(CreateSingleInstanceSocket(dp, &error)) {
+        // TODO: err msg
+        error = 1;
     }
-    if(disable_item) {
-        win->singleInstance = 0;
-        //XmToggleButtonGadgetSetState(w, False, False);
-        ui_set(win->_singleInstance, 0);
+    
+    if(error) {
+        ui_set(win->singleInstance, 0);
+    } else {
+        ui_set(win->singleInstance, 1);
     }
+    return error;
 }

diff --git a/application/application.h b/application/application.h
index 82c086e2283eb8101c1e451430c2cd8e104a4e94..4f50bfa24e93934ce386c13bd61214b5f042911f 100644 (file)
--- a/application/application.h
+++ b/application/application.h
@@ -75,9 +75,9 @@ typedef struct {
 typedef struct MainWindow {
     UiObject *obj;
     
-    Widget player_widget;
-    Widget sidebar_scrolledwindow;
-    Widget sidebar;
+    UIWIDGET player_widget;
+    UIWIDGET sidebar_scrolledwindow;
+    UIWIDGET sidebar;
     
     UIWIDGET listview; // TODO: maybe this can be removed
     UIWIDGET listview_scrolledwindow;
@@ -90,30 +90,18 @@ typedef struct MainWindow {
     bool buttongrab; // TODO: can this be removed
     bool pwbuttonpressed;
     
-    UiInteger *_sidebarVisible;
-    UiInteger *_playbackRepeat;
-    UiInteger *_playbackRepeatList;
-    UiInteger *_playbackAutoPlay;
-    UiInteger *_playbackRandom;
-    UiInteger *_adjustWindowSize;
-    UiInteger *_singleInstance;
+    UiInteger *sidebarVisible;
+    UiInteger *playbackRepeat;
+    UiInteger *playbackRepeatList;
+    UiInteger *playbackAutoPlay;
+    UiInteger *playbackRandom;
+    UiInteger *adjustWindowSize;
+    UiInteger *singleInstance;
     
     UiInteger *splitview;
     
-    
-    Widget playRepeatTrackButton;
-    Widget playRepeatListButton;
-    Widget playAutoPlayButton;
-    Widget playRandom;
-    Widget viewSidebarButton;
-    Widget viewAdjustWindowSize;
-    Widget prefSingleInstanceButton;
-    
     PlayList playlist;
     
-    bool adjustWindowSize;
-    bool singleInstance;
-    
     Time player_event_time;
     Time button_press_time;
     double motion_playback_time;
@@ -146,6 +134,8 @@ void ActionViewSidebarCB(UiEvent *event, void *userdata);
 void ActionViewAdjustWindowSizeCB(UiEvent *event, void *userdata);
 void ActionPrefSingleInstanceCB(UiEvent *event, void *userdata);
 
+int enable_single_instance_mode(MainWindow *win);
+
 
 #ifdef __cplusplus
 }

diff --git a/application/player.c b/application/player.c
index 9ae9d2ab732df199054552d00902c5044871977a..97aec86e39863b58f8b25ec401814afc34dbd36e 100644 (file)
--- a/application/player.c
+++ b/application/player.c
@@ -374,7 +374,7 @@ static int player_widget_set_size(void *data) {
     Player *player = data;
     MainWindow *win = GetMainWindow();
     
-    if(!win->adjustWindowSize) {
+    if(!ui_get(win->adjustWindowSize)) {
         return 0;
     }
         

diff --git a/application/playlist.c b/application/playlist.c
index 5393bb1eb117924351939303c6adfa6c17f58ee2..a4892d79c0b36560abe4284704e64afb8235acd7 100644 (file)
--- a/application/playlist.c
+++ b/application/playlist.c
@@ -129,10 +129,10 @@ void PlayListClear(MainWindow *win) {
 
 void PlayListSetMode(MainWindow *win, PlaybackMode mode) {
     win->playlist.playback = mode;
-    XtVaSetValues(win->playRepeatTrackButton, XmNset, mode == PLAYBACK_REPEAT, NULL);
-    XtVaSetValues(win->playRepeatListButton, XmNset, mode == PLAYBACK_REPEAT_LIST, NULL);
-    XtVaSetValues(win->playAutoPlayButton, XmNset, mode == PLAYBACK_RANDOM, NULL);
-    XtVaSetValues(win->playRandom, XmNset, mode == PLAYBACK_AUTOPLAY, NULL);
+    ui_set(win->playbackRepeat, mode == PLAYBACK_REPEAT);
+    ui_set(win->playbackRepeatList, mode == PLAYBACK_REPEAT_LIST);
+    ui_set(win->playbackAutoPlay, mode == PLAYBACK_AUTOPLAY);
+    ui_set(win->playbackRandom, mode == PLAYBACK_RANDOM);
 }
 
 int PlayListGetNextFromHistory(MainWindow *win) {

diff --git a/application/window.c b/application/window.c
index 01cfc26160f21ccec2f7fe6be23e2ec2e9d64854..2e7155a327809fc523336e47a10f4c2701c5649d 100644 (file)
--- a/application/window.c
+++ b/application/window.c
@@ -282,13 +282,13 @@ MainWindow* WindowCreate(Display *display) {
     UiContext *ctx = obj->ctx;
     obj->window = window;
     window->obj = obj;
-    window->_sidebarVisible = ui_int_new(ctx, "sidebar");
-    window->_playbackRepeat = ui_int_new(ctx, "repeat");
-    window->_playbackRepeatList = ui_int_new(ctx, "repeatlist");
-    window->_playbackRandom = ui_int_new(ctx, "random");
-    window->_playbackAutoPlay = ui_int_new(ctx, "autoplay");
-    window->_adjustWindowSize = ui_int_new(ctx, "adjustwindowsize");
-    window->_singleInstance = ui_int_new(ctx, "singleinstance");
+    window->sidebarVisible = ui_int_new(ctx, "sidebar");
+    window->playbackRepeat = ui_int_new(ctx, "repeat");
+    window->playbackRepeatList = ui_int_new(ctx, "repeatlist");
+    window->playbackRandom = ui_int_new(ctx, "random");
+    window->playbackAutoPlay = ui_int_new(ctx, "autoplay");
+    window->adjustWindowSize = ui_int_new(ctx, "adjustwindowsize");
+    window->singleInstance = ui_int_new(ctx, "singleinstance");
     window->splitview = ui_int_new(ctx, NULL);
     ui_set(window->splitview, 400);
     
@@ -321,7 +321,7 @@ MainWindow* WindowCreate(Display *display) {
     
     PlayListInit(window);
     
-    window->adjustWindowSize = true; // auto adjust window size by default
+    ui_set(window->adjustWindowSize, true);
     
     return window;
 }
@@ -346,28 +346,6 @@ void WindowFullscreen(MainWindow *win, bool enableFullscreen) {
     ui_window_fullscreen(win->obj, enableFullscreen);
 }
 
-static void PrefSingleInstanceCB(Widget w, void *udata, void *cdata) {
-    MainWindow *win = udata;
-    win->singleInstance = XmToggleButtonGadgetGetState(w);
-    
-    Display *dp = XtDisplay(w);
-    
-    if(!win->singleInstance) {
-        ShutdownInstanceSocket(dp);
-        return;
-    }
-    
-    Bool disable_item = False;
-    if(CreateSingleInstanceSocket(dp, &disable_item)) {
-        // TODO: err
-        disable_item = True;
-    }
-    if(disable_item) {
-        win->singleInstance = 0;
-        XmToggleButtonGadgetSetState(w, False, False);
-    }
-}
-
 void WindowAdjustAspectRatio(MainWindow *win) {
     if(!win->player) return;
     if(!win->player->isactive || win->player->width <= 0 || win->player->height <= 0) return;