summaryrefslogtreecommitdiff
path: root/shell/maynard.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/maynard.c')
-rw-r--r--shell/maynard.c149
1 files changed, 3 insertions, 146 deletions
diff --git a/shell/maynard.c b/shell/maynard.c
index a6c7e6d..880487f 100644
--- a/shell/maynard.c
+++ b/shell/maynard.c
@@ -36,7 +36,6 @@
#include "app-icon.h"
#include "clock.h"
#include "favorites.h"
-#include "launcher.h"
#include "panel.h"
#include "vertical-clock.h"
@@ -61,15 +60,10 @@ struct desktop {
struct element *background;
struct element *panel;
- struct element *launcher_grid;
struct element *clock;
guint initial_panel_timeout_id;
guint hide_panel_idle_id;
-
- gboolean grid_visible;
- gboolean system_visible;
- gboolean volume_visible;
};
static gboolean panel_window_enter_cb (GtkWidget *widget,
@@ -93,11 +87,6 @@ connect_enter_leave_signals (gpointer data)
g_signal_connect (desktop->clock->window, "leave-notify-event",
G_CALLBACK (panel_window_leave_cb), desktop);
- g_signal_connect (desktop->launcher_grid->window, "enter-notify-event",
- G_CALLBACK (panel_window_enter_cb), desktop);
- g_signal_connect (desktop->launcher_grid->window, "leave-notify-event",
- G_CALLBACK (panel_window_leave_cb), desktop);
-
return G_SOURCE_REMOVE;
}
@@ -110,7 +99,6 @@ desktop_shell_configure (void *data,
{
struct desktop *desktop = data;
int window_height;
- int grid_width, grid_height;
gtk_widget_set_size_request (desktop->background->window,
width, height);
@@ -120,11 +108,6 @@ desktop_shell_configure (void *data,
gtk_window_resize (GTK_WINDOW (desktop->panel->window),
MAYNARD_PANEL_WIDTH, window_height);
- maynard_launcher_calculate (MAYNARD_LAUNCHER (desktop->launcher_grid->window),
- &grid_width, &grid_height, NULL);
- gtk_widget_set_size_request (desktop->launcher_grid->window,
- grid_width, grid_height);
-
shell_helper_move_surface (desktop->helper, desktop->panel->surface,
0, (height - window_height) / 2);
@@ -134,11 +117,6 @@ desktop_shell_configure (void *data,
shell_helper_move_surface (desktop->helper, desktop->clock->surface,
MAYNARD_PANEL_WIDTH, (height - window_height) / 2);
- shell_helper_move_surface (desktop->helper,
- desktop->launcher_grid->surface,
- - grid_width,
- ((height - window_height) / 2) + MAYNARD_CLOCK_HEIGHT);
-
desktop_shell_desktop_ready (desktop->shell);
/* TODO: why does the panel signal leave on drawing for
@@ -167,66 +145,6 @@ static const struct desktop_shell_listener listener = {
desktop_shell_grab_cursor
};
-static void
-launcher_grid_toggle (GtkWidget *widget,
- struct desktop *desktop)
-{
- if (desktop->grid_visible)
- {
- shell_helper_slide_surface_back (desktop->helper,
- desktop->launcher_grid->surface);
- }
- else
- {
- int width;
-
- gtk_widget_get_size_request (desktop->launcher_grid->window,
- &width, NULL);
-
- shell_helper_slide_surface (desktop->helper,
- desktop->launcher_grid->surface,
- width + MAYNARD_PANEL_WIDTH, 0);
- }
-
- desktop->grid_visible = !desktop->grid_visible;
-}
-
-static void
-launcher_grid_create (struct desktop *desktop)
-{
- struct element *launcher_grid;
- GdkWindow *gdk_window;
-
- launcher_grid = malloc (sizeof *launcher_grid);
- memset (launcher_grid, 0, sizeof *launcher_grid);
-
- launcher_grid->window = maynard_launcher_new (desktop->background->window);
- gdk_window = gtk_widget_get_window (launcher_grid->window);
- launcher_grid->surface = gdk_wayland_window_get_wl_surface (gdk_window);
-
- gdk_wayland_window_set_use_custom_surface (gdk_window);
- shell_helper_add_surface_to_layer (desktop->helper,
- launcher_grid->surface,
- desktop->panel->surface);
-
- g_signal_connect (launcher_grid->window, "app-launched",
- G_CALLBACK (launcher_grid_toggle), desktop);
-
- gtk_widget_show_all (launcher_grid->window);
-
- desktop->launcher_grid = launcher_grid;
-}
-
-static void
-volume_changed_cb (MaynardClock *clock,
- gdouble value,
- const gchar *icon_name,
- struct desktop *desktop)
-{
- maynard_panel_set_volume_icon_name (
- MAYNARD_PANEL (desktop->panel->window), icon_name);
-}
-
static GtkWidget *
clock_create (struct desktop *desktop)
{
@@ -238,9 +156,6 @@ clock_create (struct desktop *desktop)
clock->window = maynard_clock_new ();
- g_signal_connect (clock->window, "volume-changed",
- G_CALLBACK (volume_changed_cb), desktop);
-
gdk_window = gtk_widget_get_window (clock->window);
clock->surface = gdk_wayland_window_get_wl_surface (gdk_window);
@@ -261,45 +176,8 @@ button_toggled_cb (struct desktop *desktop,
*visible = !*visible;
*not_visible = FALSE;
- if (desktop->system_visible)
- {
- maynard_clock_show_section (MAYNARD_CLOCK (desktop->clock->window),
- MAYNARD_CLOCK_SECTION_SYSTEM);
- maynard_panel_show_previous (MAYNARD_PANEL (desktop->panel->window),
- MAYNARD_PANEL_BUTTON_SYSTEM);
- }
- else if (desktop->volume_visible)
- {
- maynard_clock_show_section (MAYNARD_CLOCK (desktop->clock->window),
- MAYNARD_CLOCK_SECTION_VOLUME);
- maynard_panel_show_previous (MAYNARD_PANEL (desktop->panel->window),
- MAYNARD_PANEL_BUTTON_VOLUME);
- }
- else
- {
- maynard_clock_show_section (MAYNARD_CLOCK (desktop->clock->window),
- MAYNARD_CLOCK_SECTION_CLOCK);
- maynard_panel_show_previous (MAYNARD_PANEL (desktop->panel->window),
- MAYNARD_PANEL_BUTTON_NONE);
- }
-}
-
-static void
-system_toggled_cb (GtkWidget *widget,
- struct desktop *desktop)
-{
- button_toggled_cb (desktop,
- &desktop->system_visible,
- &desktop->volume_visible);
-}
-
-static void
-volume_toggled_cb (GtkWidget *widget,
- struct desktop *desktop)
-{
- button_toggled_cb (desktop,
- &desktop->volume_visible,
- &desktop->system_visible);
+ maynard_clock_show_section (MAYNARD_CLOCK (desktop->clock->window),
+ MAYNARD_CLOCK_SECTION_CLOCK);
}
static gboolean
@@ -352,10 +230,6 @@ leave_panel_idle_cb (gpointer data)
maynard_clock_show_section (MAYNARD_CLOCK (desktop->clock->window),
MAYNARD_CLOCK_SECTION_CLOCK);
- maynard_panel_show_previous (MAYNARD_PANEL (desktop->panel->window),
- MAYNARD_PANEL_BUTTON_NONE);
- desktop->system_visible = FALSE;
- desktop->volume_visible = FALSE;
return G_SOURCE_REMOVE;
}
@@ -374,9 +248,6 @@ panel_window_leave_cb (GtkWidget *widget,
if (desktop->hide_panel_idle_id > 0)
return;
- if (desktop->grid_visible)
- return;
-
desktop->hide_panel_idle_id = g_idle_add (leave_panel_idle_cb, desktop);
return FALSE;
@@ -396,9 +267,6 @@ static void
favorite_launched_cb (MaynardPanel *panel,
struct desktop *desktop)
{
- if (desktop->grid_visible)
- launcher_grid_toggle (desktop->launcher_grid->window, desktop);
-
panel_window_leave_cb (NULL, NULL, desktop);
}
@@ -413,12 +281,6 @@ panel_create (struct desktop *desktop)
panel->window = maynard_panel_new ();
- g_signal_connect (panel->window, "app-menu-toggled",
- G_CALLBACK (launcher_grid_toggle), desktop);
- g_signal_connect (panel->window, "system-toggled",
- G_CALLBACK (system_toggled_cb), desktop);
- g_signal_connect (panel->window, "volume-toggled",
- G_CALLBACK (volume_toggled_cb), desktop);
g_signal_connect (panel->window, "favorite-launched",
G_CALLBACK (favorite_launched_cb), desktop);
@@ -641,18 +503,13 @@ main (int argc,
while (!desktop->output || !desktop->shell || !desktop->helper)
wl_display_roundtrip (desktop->display);
- desktop->grid_visible = FALSE;
- desktop->system_visible = FALSE;
- desktop->volume_visible = FALSE;
-
css_setup (desktop);
background_create (desktop);
- /* panel needs to be first so the clock and launcher grid can
+ /* panel needs to be first so the clock can
* be added to its layer */
panel_create (desktop);
clock_create (desktop);
- launcher_grid_create (desktop);
gtk_main ();
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-02 02:37:47 +0000