aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornirav <nirav@teisuu.com>2018-10-22 23:07:38 +0530
committerDandelion <nirav@teisuu.com>2018-10-22 23:07:38 +0530
commit32eb3619140b2682a6c61ab2cd3376a1981861f6 (patch)
treeeff5bca95b9b5d07796c07d4e24abe84e97f4ba6
parent62cdffbb4d3e93d6785f3054f7fa81b7cc8b6de7 (diff)
downloadim-32eb3619140b2682a6c61ab2cd3376a1981861f6.tar.gz
im-32eb3619140b2682a6c61ab2cd3376a1981861f6.zip
Switched to stdbool
-rw-r--r--src/input.c3
-rw-r--r--src/option.c1
-rw-r--r--src/window.c31
3 files changed, 19 insertions, 16 deletions
diff --git a/src/input.c b/src/input.c
index 0b2a6dc..6fb896a 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1,4 +1,5 @@
#include <gtk-3.0/gtk/gtk.h>
+#include <stdbool.h>
#include "file.h"
#include "image.h"
@@ -176,7 +177,7 @@ gboolean resize_done(gpointer data)
guint *id = data;
*id = 0;
fit_image();
- return FALSE;
+ return false;
}
void handle_resize()
diff --git a/src/option.c b/src/option.c
index 66a99f0..548b5b8 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <stdbool.h>
#include "option.h"
diff --git a/src/window.c b/src/window.c
index b50c6bc..e83e1a6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,4 +1,5 @@
#include <gtk-3.0/gtk/gtk.h>
+#include <stdbool.h>
#include "file.h"
#include "image.h"
@@ -10,46 +11,46 @@ GtkWidget *window;
GtkWidget *info_panel;
GtkWidget *scrolled_window;
GtkWidget *info_panel_left, *info_panel_right;
-int is_fullscreen = 0;
-int show_info = 0;
+bool is_fullscreen = false;
+bool show_info = true;
static gboolean key_press(GtkWindow *window, GdkEvent *event, gpointer data)
{
handle_key_press(event);
- return FALSE;
+ return false;
}
static gboolean button_press(GtkWindow *window, GdkEvent *event, gpointer data)
{
handle_button_press(event);
- return TRUE;
+ return true;
}
static gboolean button_release(GtkWindow *window, GdkEvent *event,
gpointer data)
{
handle_button_release();
- return TRUE;
+ return true;
}
static gboolean motion_notify(GtkWindow *window, GdkEvent *event, gpointer data)
{
handle_mouse_move(event->motion.x, event->motion.y);
- return TRUE;
+ return true;
}
static gboolean scroll_callback(GtkWindow *window, GdkEvent *event,
gpointer data)
{
handle_scroll(event);
- return TRUE;
+ return true;
}
static gboolean configure_callback(GtkWindow *window, GdkEvent *event,
gpointer data)
{
handle_resize();
- return TRUE;
+ return true;
}
void load_css()
@@ -86,7 +87,7 @@ void create_main_window()
// scrolled window
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_vexpand(GTK_WIDGET(scrolled_window), TRUE);
+ 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);
GtkWidget *viewport = gtk_viewport_new(NULL, NULL);
@@ -97,7 +98,7 @@ void create_main_window()
info_panel = gtk_grid_new();
gtk_widget_set_name(GTK_WIDGET(info_panel), "info_panel");
info_panel_left = gtk_label_new(NULL);
- gtk_widget_set_hexpand(GTK_WIDGET(info_panel_left), TRUE);
+ 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,
@@ -114,7 +115,7 @@ void create_main_window()
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_WIDGET(info_panel), true);
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(overlay));
gtk_widget_show_all(GTK_WIDGET(window));
@@ -165,10 +166,10 @@ void toggle_fullscreen()
{
if (is_fullscreen) {
gtk_window_unfullscreen(GTK_WINDOW(window));
- is_fullscreen = 0;
+ is_fullscreen = false;
} else {
gtk_window_fullscreen(GTK_WINDOW(window));
- is_fullscreen = 1;
+ is_fullscreen = true;
}
}
@@ -176,9 +177,9 @@ void toggle_infopanel()
{
if (show_info) {
gtk_widget_hide(GTK_WIDGET(info_panel));
- show_info = 0;
+ show_info = false;
} else {
gtk_widget_show(GTK_WIDGET(info_panel));
- show_info = 1;
+ show_info = true;
}
}