aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile9
-rw-r--r--src/image.c23
-rw-r--r--src/main.c2
-rw-r--r--src/option.c1
-rw-r--r--src/window.c57
5 files changed, 50 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index 524c50a..12fae3d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,3 +55,12 @@ uninstall:
rm -f $(DESTDIR)$(BINDIR)/qwe
rm -f $(DESTDIR)$(APPDIR)/qwe.desktop
rm -f $(DESTDIR)$(MANDIR)/qwe.1
+
+src/file.o: src/file.c src/file.h src/image.h
+src/image.o: src/image.c src/image.h src/window.h
+src/input.o: src/input.c src/file.h src/image.h src/input.h src/window.h
+src/main.o: src/main.c src/file.h src/image.h src/option.h src/window.h
+src/option.o: src/option.c src/option.h
+src/resources.o: src/resources.c
+src/window.o: src/window.c src/file.h src/image.h src/input.h \
+ src/option.h src/window.h
diff --git a/src/image.c b/src/image.c
index 4b725e7..4001097 100644
--- a/src/image.c
+++ b/src/image.c
@@ -22,8 +22,8 @@ GtkWidget *new_image()
return image;
}
-void pixbuf_load_callback(GObject *source_object, GAsyncResult *res,
- gpointer user_data)
+void pixbuf_load_callback(
+ GObject *source_object, GAsyncResult *res, gpointer user_data)
{
if (pixbuf != NULL)
g_object_unref(pixbuf);
@@ -38,7 +38,7 @@ void pixbuf_load_callback(GObject *source_object, GAsyncResult *res,
}
curr_pixbuf_width = pixbuf_width = gdk_pixbuf_get_width(GDK_PIXBUF(pixbuf));
curr_pixbuf_height = pixbuf_height =
- gdk_pixbuf_get_height(GDK_PIXBUF(pixbuf));
+ gdk_pixbuf_get_height(GDK_PIXBUF(pixbuf));
aspect_ratio = (double)pixbuf_width / (double)pixbuf_height;
fit_image();
set_window_title(g_file_get_basename(file), pixbuf_width, pixbuf_height);
@@ -47,8 +47,8 @@ void pixbuf_load_callback(GObject *source_object, GAsyncResult *res,
loading = 0;
}
-void file_read_callback(GObject *source_object, GAsyncResult *res,
- gpointer user_data)
+void file_read_callback(
+ GObject *source_object, GAsyncResult *res, gpointer user_data)
{
GError *error = NULL;
is = g_file_read_finish(file, res, &error);
@@ -57,8 +57,8 @@ void file_read_callback(GObject *source_object, GAsyncResult *res,
g_printerr("%s\n", error->message);
exit(EXIT_FAILURE);
}
- gdk_pixbuf_new_from_stream_async(G_INPUT_STREAM(is), NULL,
- &pixbuf_load_callback, NULL);
+ gdk_pixbuf_new_from_stream_async(
+ G_INPUT_STREAM(is), NULL, &pixbuf_load_callback, NULL);
}
int load_image(char *file_name)
@@ -67,8 +67,8 @@ int load_image(char *file_name)
return -1;
loading = 1;
file = g_file_new_for_path(file_name);
- g_file_read_async(file, G_PRIORITY_DEFAULT, NULL, &file_read_callback,
- NULL);
+ g_file_read_async(
+ file, G_PRIORITY_DEFAULT, NULL, &file_read_callback, NULL);
curr_zoom = 1.0;
return 0;
}
@@ -79,9 +79,8 @@ void update_pixbuf()
g_object_unref(curr_pixbuf);
if (pixbuf == NULL)
return;
- curr_pixbuf =
- gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), curr_pixbuf_width,
- curr_pixbuf_height, GDK_INTERP_BILINEAR);
+ curr_pixbuf = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), curr_pixbuf_width,
+ curr_pixbuf_height, GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(GTK_IMAGE(image), GDK_PIXBUF(curr_pixbuf));
}
diff --git a/src/main.c b/src/main.c
index 9b67bf2..edc4bb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,7 +10,6 @@
int main(int argc, char **argv)
{
gtk_init(&argc, &argv);
-
parse_options(argc, argv);
// load the specified image
@@ -20,7 +19,6 @@ int main(int argc, char **argv)
// scan other supported image file in the same dir
scan(options->file_name);
-
create_main_window();
gtk_main();
diff --git a/src/option.c b/src/option.c
index 290eff3..e548d78 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 123123
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/window.c b/src/window.c
index 5376126..dbb41f9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -26,8 +26,8 @@ static gboolean button_press(GtkWindow *window, GdkEvent *event, gpointer data)
return true;
}
-static gboolean button_release(GtkWindow *window, GdkEvent *event,
- gpointer data)
+static gboolean button_release(
+ GtkWindow *window, GdkEvent *event, gpointer data)
{
handle_button_release();
return true;
@@ -39,15 +39,15 @@ static gboolean motion_notify(GtkWindow *window, GdkEvent *event, gpointer data)
return true;
}
-static gboolean scroll_callback(GtkWindow *window, GdkEvent *event,
- gpointer data)
+static gboolean scroll_callback(
+ GtkWindow *window, GdkEvent *event, gpointer data)
{
handle_scroll(event);
return true;
}
-static gboolean configure_callback(GtkWindow *window, GdkEvent *event,
- gpointer data)
+static gboolean configure_callback(
+ GtkWindow *window, GdkEvent *event, gpointer data)
{
handle_resize();
return true;
@@ -58,8 +58,9 @@ void load_css()
GtkCssProvider *provider = gtk_css_provider_new();
gtk_css_provider_load_from_resource(provider, "/org/gtk/qwe/qwe.css");
gtk_style_context_add_provider_for_screen(
- gdk_display_get_default_screen(gdk_display_get_default()),
- GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ gdk_display_get_default_screen(gdk_display_get_default()),
+ GTK_STYLE_PROVIDER(provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref(provider);
}
@@ -73,23 +74,23 @@ void create_main_window()
gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
gtk_widget_add_events(GTK_WIDGET(window), GDK_SCROLL_MASK);
g_signal_connect(G_OBJECT(window), "configure-event",
- G_CALLBACK(configure_callback), NULL);
- g_signal_connect(G_OBJECT(window), "key-press-event", G_CALLBACK(key_press),
- NULL);
+ G_CALLBACK(configure_callback), NULL);
+ g_signal_connect(
+ G_OBJECT(window), "key-press-event", G_CALLBACK(key_press), NULL);
g_signal_connect(G_OBJECT(window), "button-press-event",
- G_CALLBACK(button_press), NULL);
+ G_CALLBACK(button_press), NULL);
g_signal_connect(G_OBJECT(window), "button-release-event",
- G_CALLBACK(button_release), NULL);
+ G_CALLBACK(button_release), NULL);
g_signal_connect(G_OBJECT(window), "motion-notify-event",
- G_CALLBACK(motion_notify), NULL);
+ G_CALLBACK(motion_notify), NULL);
g_signal_connect(G_OBJECT(window), "scroll-event",
- G_CALLBACK(scroll_callback), NULL);
+ G_CALLBACK(scroll_callback), NULL);
// scrolled window
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_vexpand(GTK_WIDGET(scrolled_window), true);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GtkWidget *viewport = gtk_viewport_new(NULL, NULL);
gtk_container_add(GTK_CONTAINER(viewport), GTK_WIDGET(new_image()));
gtk_container_add(GTK_CONTAINER(scrolled_window), GTK_WIDGET(viewport));
@@ -101,11 +102,11 @@ void create_main_window()
gtk_widget_set_hexpand(GTK_WIDGET(info_panel_left), true);
gtk_label_set_ellipsize(GTK_LABEL(info_panel_left), PANGO_ELLIPSIZE_END);
gtk_label_set_xalign(GTK_LABEL(info_panel_left), 0.0f);
- gtk_grid_attach(GTK_GRID(info_panel), GTK_WIDGET(info_panel_left), 0, 0, 1,
- 1);
+ gtk_grid_attach(
+ GTK_GRID(info_panel), GTK_WIDGET(info_panel_left), 0, 0, 1, 1);
info_panel_right = gtk_label_new(NULL);
- gtk_grid_attach(GTK_GRID(info_panel), GTK_WIDGET(info_panel_right), 1, 0, 1,
- 1);
+ gtk_grid_attach(
+ GTK_GRID(info_panel), GTK_WIDGET(info_panel_right), 1, 0, 1, 1);
gtk_widget_set_valign(GTK_WIDGET(info_panel), GTK_ALIGN_END);
gtk_widget_set_name(GTK_WIDGET(info_panel_left), "info-panel");
gtk_widget_set_name(GTK_WIDGET(info_panel_right), "info-panel");
@@ -114,8 +115,8 @@ void create_main_window()
GtkWidget *overlay = gtk_overlay_new();
gtk_overlay_add_overlay(GTK_OVERLAY(overlay), GTK_WIDGET(scrolled_window));
gtk_overlay_add_overlay(GTK_OVERLAY(overlay), GTK_WIDGET(info_panel));
- gtk_overlay_set_overlay_pass_through(GTK_OVERLAY(overlay),
- GTK_WIDGET(info_panel), true);
+ gtk_overlay_set_overlay_pass_through(
+ GTK_OVERLAY(overlay), GTK_WIDGET(info_panel), true);
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(overlay));
gtk_widget_show_all(GTK_WIDGET(window));
@@ -133,15 +134,15 @@ void create_main_window()
void scroll_window(gdouble x, gdouble y)
{
GtkAdjustment *h_adj = gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(scrolled_window));
+ GTK_SCROLLED_WINDOW(scrolled_window));
GtkAdjustment *v_adj = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(scrolled_window));
+ GTK_SCROLLED_WINDOW(scrolled_window));
gtk_adjustment_set_value(h_adj, gtk_adjustment_get_value(h_adj) + x);
gtk_adjustment_set_value(v_adj, gtk_adjustment_get_value(v_adj) + y);
- gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolled_window),
- h_adj);
- gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolled_window),
- v_adj);
+ gtk_scrolled_window_set_hadjustment(
+ GTK_SCROLLED_WINDOW(scrolled_window), h_adj);
+ gtk_scrolled_window_set_vadjustment(
+ GTK_SCROLLED_WINDOW(scrolled_window), v_adj);
}
void set_window_title(const char *title, int width, int height)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 04:17:39 +0000