Fix indentation
This commit is contained in:
Andre Miranda
parent
4d716abc23
commit
55d6d23392
8 changed files with 251 additions and 246 deletions
|
|
@ -79,23 +79,27 @@ calculate_pupil_xy (EyesPlugin *eyes_applet,
|
|||
gfloat xalign = 0, yalign = 0;
|
||||
gint width, height;
|
||||
|
||||
gtk_widget_get_allocation (GTK_WIDGET(widget), &allocation);
|
||||
gtk_widget_get_allocation (GTK_WIDGET (widget), &allocation);
|
||||
|
||||
width = allocation.width;
|
||||
height = allocation.height;
|
||||
halign = gtk_widget_get_halign (GTK_WIDGET(widget));
|
||||
valign = gtk_widget_get_valign (GTK_WIDGET(widget));
|
||||
halign = gtk_widget_get_halign (GTK_WIDGET (widget));
|
||||
valign = gtk_widget_get_valign (GTK_WIDGET (widget));
|
||||
|
||||
if (halign == GTK_ALIGN_CENTER) xalign = 0.5;
|
||||
else if (halign == GTK_ALIGN_END) xalign = 1;
|
||||
if (halign == GTK_ALIGN_CENTER)
|
||||
xalign = 0.5;
|
||||
else if (halign == GTK_ALIGN_END)
|
||||
xalign = 1;
|
||||
|
||||
if (valign == GTK_ALIGN_CENTER) yalign = 0.5;
|
||||
else if (valign == GTK_ALIGN_END) yalign = 1;
|
||||
if (valign == GTK_ALIGN_CENTER)
|
||||
yalign = 0.5;
|
||||
else if (valign == GTK_ALIGN_END)
|
||||
yalign = 1;
|
||||
|
||||
/* calculate x,y pointer offsets wrt to eye center */
|
||||
nx = x - MAX(width - eyes_applet->eye_width, 0) * xalign
|
||||
nx = x - MAX (width - eyes_applet->eye_width, 0) * xalign
|
||||
- eyes_applet->eye_width / 2 - allocation.x;
|
||||
ny = y - MAX(height - eyes_applet->eye_height, 0) * yalign
|
||||
ny = y - MAX (height - eyes_applet->eye_height, 0) * yalign
|
||||
- eyes_applet->eye_height / 2 - allocation.y;
|
||||
|
||||
/* calculate eye sizes */
|
||||
|
|
@ -149,18 +153,16 @@ draw_eye (EyesPlugin *eyes,
|
|||
rect.width,
|
||||
rect.height,
|
||||
pupil_x - eyes->pupil_width / 2,
|
||||
pupil_y - eyes->pupil_height / 2, 1.0, 1.0,
|
||||
GDK_INTERP_BILINEAR,
|
||||
255);
|
||||
gtk_image_set_from_pixbuf (GTK_IMAGE (eyes->eyes[eye_num]),
|
||||
pixbuf);
|
||||
pupil_y - eyes->pupil_height / 2,
|
||||
1.0, 1.0, GDK_INTERP_BILINEAR, 255);
|
||||
gtk_image_set_from_pixbuf (GTK_IMAGE (eyes->eyes[eye_num]), pixbuf);
|
||||
g_object_unref (G_OBJECT (pixbuf));
|
||||
}
|
||||
|
||||
|
||||
|
||||
static gint
|
||||
timer_cb(EyesPlugin *eyes)
|
||||
timer_cb (EyesPlugin *eyes)
|
||||
{
|
||||
gint x, y;
|
||||
gint pupil_x, pupil_y;
|
||||
|
|
@ -168,11 +170,11 @@ timer_cb(EyesPlugin *eyes)
|
|||
GdkWindow *window;
|
||||
GdkDevice *mouse_device;
|
||||
|
||||
#if GTK_CHECK_VERSION(3,2,0)
|
||||
GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default());
|
||||
#if GTK_CHECK_VERSION (3,2,0)
|
||||
GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
|
||||
mouse_device = gdk_seat_get_pointer (seat);
|
||||
#else
|
||||
GdkDeviceManager *devman = gdk_display_get_device_manager (gdk_display_get_default());
|
||||
GdkDeviceManager *devman = gdk_display_get_device_manager (gdk_display_get_default ());
|
||||
mouse_device = gdk_device_manager_get_client_pointer (devman);
|
||||
#endif
|
||||
|
||||
|
|
@ -206,35 +208,35 @@ timer_cb(EyesPlugin *eyes)
|
|||
|
||||
|
||||
static void
|
||||
properties_load(EyesPlugin *eyes)
|
||||
properties_load (EyesPlugin *eyes)
|
||||
{
|
||||
gchar *path;
|
||||
|
||||
if (eyes->active_theme)
|
||||
path = g_build_filename(THEMESDIR, eyes->active_theme, NULL);
|
||||
path = g_build_filename (THEMESDIR, eyes->active_theme, NULL);
|
||||
else
|
||||
path = g_build_filename(THEMESDIR, DEFAULTTHEME, NULL);
|
||||
path = g_build_filename (THEMESDIR, DEFAULTTHEME, NULL);
|
||||
|
||||
load_theme(eyes, path);
|
||||
load_theme (eyes, path);
|
||||
|
||||
g_free(path);
|
||||
g_free (path);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
setup_eyes(EyesPlugin *eyes)
|
||||
setup_eyes (EyesPlugin *eyes)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (eyes->hbox != NULL)
|
||||
{
|
||||
gtk_widget_destroy(eyes->hbox);
|
||||
gtk_widget_destroy (eyes->hbox);
|
||||
eyes->hbox = NULL;
|
||||
}
|
||||
|
||||
eyes->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
gtk_container_add(GTK_CONTAINER(eyes->align), GTK_WIDGET(eyes->hbox));
|
||||
eyes->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
gtk_container_add (GTK_CONTAINER (eyes->align), GTK_WIDGET (eyes->hbox));
|
||||
|
||||
eyes->eyes = g_new0 (GtkWidget *, eyes->num_eyes);
|
||||
eyes->pointer_last_x = g_new0 (gint, eyes->num_eyes);
|
||||
|
|
@ -244,13 +246,13 @@ setup_eyes(EyesPlugin *eyes)
|
|||
{
|
||||
eyes->eyes[i] = gtk_image_new ();
|
||||
|
||||
gtk_widget_set_size_request(GTK_WIDGET(eyes->eyes[i]),
|
||||
gtk_widget_set_size_request (GTK_WIDGET (eyes->eyes[i]),
|
||||
eyes->eye_width,
|
||||
eyes->eye_height);
|
||||
|
||||
gtk_widget_show(eyes->eyes[i]);
|
||||
gtk_widget_show (eyes->eyes[i]);
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(eyes->hbox), eyes->eyes[i],
|
||||
gtk_box_pack_start (GTK_BOX (eyes->hbox), eyes->eyes[i],
|
||||
FALSE, FALSE, 0);
|
||||
|
||||
if ((eyes->num_eyes != 1) && (i == 0))
|
||||
|
|
@ -277,20 +279,20 @@ setup_eyes(EyesPlugin *eyes)
|
|||
eyes->eye_height / 2);
|
||||
}
|
||||
|
||||
gtk_widget_show(eyes->hbox);
|
||||
gtk_widget_show (eyes->hbox);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static gboolean
|
||||
eyes_applet_fill(EyesPlugin *eyes)
|
||||
eyes_applet_fill (EyesPlugin *eyes)
|
||||
{
|
||||
gtk_widget_show_all(GTK_WIDGET(eyes->align));
|
||||
gtk_widget_show_all (GTK_WIDGET (eyes->align));
|
||||
|
||||
if (eyes->timeout_id == 0)
|
||||
{
|
||||
eyes->timeout_id = g_timeout_add (UPDATE_TIMEOUT,
|
||||
(GSourceFunc)timer_cb, eyes);
|
||||
(GSourceFunc) timer_cb, eyes);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -327,11 +329,12 @@ combobox_changed (GtkComboBox *combobox,
|
|||
eyes->active_theme = g_strdup (selected);
|
||||
g_free (selected);
|
||||
|
||||
properties_load(eyes);
|
||||
setup_eyes(eyes);
|
||||
eyes_applet_fill(eyes);
|
||||
properties_load (eyes);
|
||||
setup_eyes (eyes);
|
||||
eyes_applet_fill (eyes);
|
||||
|
||||
eyes_set_size(eyes->plugin, xfce_panel_plugin_get_size(eyes->plugin),
|
||||
eyes_set_size (eyes->plugin,
|
||||
xfce_panel_plugin_get_size (eyes->plugin),
|
||||
eyes);
|
||||
}
|
||||
|
||||
|
|
@ -341,8 +344,9 @@ static void
|
|||
check_single_row_toggled (GtkWidget *check,
|
||||
EyesPlugin *eyes)
|
||||
{
|
||||
eyes->single_row = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
|
||||
eyes_set_size(eyes->plugin, xfce_panel_plugin_get_size(eyes->plugin),
|
||||
eyes->single_row = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
|
||||
eyes_set_size (eyes->plugin,
|
||||
xfce_panel_plugin_get_size (eyes->plugin),
|
||||
eyes);
|
||||
}
|
||||
|
||||
|
|
@ -369,16 +373,17 @@ eyes_properties_dialog (XfcePanelPlugin *plugin,
|
|||
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
|
||||
gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
|
||||
|
||||
g_signal_connect (dlg, "response", G_CALLBACK (eyes_properties_dialog_response),
|
||||
g_signal_connect (dlg, "response",
|
||||
G_CALLBACK (eyes_properties_dialog_response),
|
||||
eyes);
|
||||
|
||||
area = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
|
||||
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
|
||||
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
|
||||
gtk_box_pack_start (GTK_BOX (area), hbox, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
|
||||
|
||||
label = gtk_label_new_with_mnemonic (_("_Select a theme:"));
|
||||
gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
||||
|
||||
combobox = gtk_combo_box_text_new ();
|
||||
gtk_box_pack_start (GTK_BOX (hbox), combobox, FALSE, TRUE, 0);
|
||||
|
|
@ -388,35 +393,34 @@ eyes_properties_dialog (XfcePanelPlugin *plugin,
|
|||
else
|
||||
current = g_strdup (DEFAULTTHEME);
|
||||
|
||||
if ((dir = g_dir_open(THEMESDIR, 0, NULL)) == NULL)
|
||||
if ((dir = g_dir_open (THEMESDIR, 0, NULL)) == NULL)
|
||||
{
|
||||
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), current);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0; (entry = g_dir_read_name(dir)) != NULL; i++)
|
||||
for (i = 0; (entry = g_dir_read_name (dir)) != NULL; i++)
|
||||
{
|
||||
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), entry);
|
||||
|
||||
if (strcmp (entry, current) == 0)
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX(combobox), i);
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), i);
|
||||
}
|
||||
|
||||
g_dir_close(dir);
|
||||
g_dir_close (dir);
|
||||
}
|
||||
|
||||
g_free (current);
|
||||
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox);
|
||||
|
||||
g_signal_connect(G_OBJECT(combobox), "changed",
|
||||
G_CALLBACK(combobox_changed), eyes);
|
||||
g_signal_connect (G_OBJECT (combobox), "changed",
|
||||
G_CALLBACK (combobox_changed), eyes);
|
||||
|
||||
check = gtk_check_button_new_with_mnemonic
|
||||
(_("Use single _row in multi-row panel"));
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), eyes->single_row);
|
||||
check = gtk_check_button_new_with_mnemonic (_("Use single _row in multi-row panel"));
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), eyes->single_row);
|
||||
gtk_box_pack_start (GTK_BOX (area), check, FALSE, FALSE, 0);
|
||||
g_signal_connect(check, "toggled", G_CALLBACK(check_single_row_toggled), eyes);
|
||||
g_signal_connect (check, "toggled", G_CALLBACK (check_single_row_toggled), eyes);
|
||||
|
||||
gtk_widget_show_all (dlg);
|
||||
}
|
||||
|
|
@ -427,11 +431,11 @@ eyes_properties_dialog (XfcePanelPlugin *plugin,
|
|||
*** Panel Plugin Functions ***
|
||||
******************************/
|
||||
static void
|
||||
eyes_free_data(XfcePanelPlugin *plugin,
|
||||
eyes_free_data (XfcePanelPlugin *plugin,
|
||||
EyesPlugin *eyes)
|
||||
{
|
||||
g_return_if_fail(plugin != NULL);
|
||||
g_return_if_fail(eyes != NULL);
|
||||
g_return_if_fail (plugin != NULL);
|
||||
g_return_if_fail (eyes != NULL);
|
||||
|
||||
if (eyes->timeout_id != 0)
|
||||
g_source_remove (eyes->timeout_id);
|
||||
|
|
@ -450,19 +454,19 @@ eyes_free_data(XfcePanelPlugin *plugin,
|
|||
g_object_unref (G_OBJECT (eyes->pupil_image));
|
||||
|
||||
if (eyes->theme_dir != NULL)
|
||||
g_free(eyes->theme_dir);
|
||||
g_free (eyes->theme_dir);
|
||||
|
||||
if (eyes->theme_name != NULL)
|
||||
g_free(eyes->theme_name);
|
||||
g_free (eyes->theme_name);
|
||||
|
||||
if (eyes->eye_filename != NULL)
|
||||
g_free(eyes->eye_filename);
|
||||
g_free (eyes->eye_filename);
|
||||
|
||||
if (eyes->pupil_filename != NULL)
|
||||
g_free(eyes->pupil_filename);
|
||||
g_free (eyes->pupil_filename);
|
||||
|
||||
gtk_widget_destroy(eyes->align);
|
||||
g_free(eyes);
|
||||
gtk_widget_destroy (eyes->align);
|
||||
g_free (eyes);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -487,17 +491,17 @@ eyes_mode_changed (XfcePanelPlugin *plugin,
|
|||
if (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL ||
|
||||
mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
|
||||
{
|
||||
gtk_widget_set_halign(GTK_WIDGET(eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_valign(GTK_WIDGET(eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_hexpand(GTK_WIDGET(eyes->align), FALSE);
|
||||
gtk_widget_set_vexpand(GTK_WIDGET(eyes->align), TRUE);
|
||||
gtk_widget_set_halign (GTK_WIDGET (eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_valign (GTK_WIDGET (eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_hexpand (GTK_WIDGET (eyes->align), FALSE);
|
||||
gtk_widget_set_vexpand (GTK_WIDGET (eyes->align), TRUE);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_widget_set_halign(GTK_WIDGET(eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_valign(GTK_WIDGET(eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_hexpand(GTK_WIDGET(eyes->align), TRUE);
|
||||
gtk_widget_set_vexpand(GTK_WIDGET(eyes->align), FALSE);
|
||||
gtk_widget_set_halign (GTK_WIDGET (eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_valign (GTK_WIDGET (eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_hexpand (GTK_WIDGET (eyes->align), TRUE);
|
||||
gtk_widget_set_vexpand (GTK_WIDGET (eyes->align), FALSE);
|
||||
}
|
||||
|
||||
eyes_set_size (plugin, xfce_panel_plugin_get_size (plugin), eyes);
|
||||
|
|
@ -575,28 +579,28 @@ eyes_write_rc_file (XfcePanelPlugin *plugin,
|
|||
static EyesPlugin *
|
||||
eyes_plugin_new (XfcePanelPlugin* plugin)
|
||||
{
|
||||
EyesPlugin *eyes = g_new0(EyesPlugin, 1);
|
||||
EyesPlugin *eyes = g_new0 (EyesPlugin, 1);
|
||||
|
||||
eyes->plugin = plugin;
|
||||
|
||||
eyes->ebox = gtk_event_box_new ();
|
||||
gtk_event_box_set_visible_window (GTK_EVENT_BOX (eyes->ebox), FALSE);
|
||||
gtk_widget_show(eyes->ebox);
|
||||
gtk_widget_show (eyes->ebox);
|
||||
|
||||
eyes->align = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
|
||||
gtk_widget_set_halign(GTK_WIDGET(eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_valign(GTK_WIDGET(eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_hexpand(GTK_WIDGET(eyes->align), TRUE);
|
||||
gtk_widget_set_vexpand(GTK_WIDGET(eyes->align), TRUE);
|
||||
gtk_widget_set_halign (GTK_WIDGET (eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_valign (GTK_WIDGET (eyes->align), GTK_ALIGN_CENTER);
|
||||
gtk_widget_set_hexpand (GTK_WIDGET (eyes->align), TRUE);
|
||||
gtk_widget_set_vexpand (GTK_WIDGET (eyes->align), TRUE);
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(eyes->ebox), eyes->align);
|
||||
gtk_widget_show(eyes->align);
|
||||
gtk_container_add (GTK_CONTAINER (eyes->ebox), eyes->align);
|
||||
gtk_widget_show (eyes->align);
|
||||
|
||||
eyes_read_rc_file (plugin, eyes);
|
||||
|
||||
properties_load(eyes);
|
||||
setup_eyes(eyes);
|
||||
eyes_applet_fill(eyes);
|
||||
properties_load (eyes);
|
||||
setup_eyes (eyes);
|
||||
eyes_applet_fill (eyes);
|
||||
|
||||
return eyes;
|
||||
}
|
||||
|
|
@ -608,7 +612,7 @@ eyes_construct (XfcePanelPlugin *plugin)
|
|||
{
|
||||
EyesPlugin *eyes;
|
||||
|
||||
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
|
||||
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
|
||||
|
||||
eyes = eyes_plugin_new (plugin);
|
||||
|
||||
|
|
|
|||
|
|
@ -35,11 +35,13 @@ gchar *theme_directories[] = {
|
|||
#define NUM_THEME_DIRECTORIES 1
|
||||
|
||||
static void
|
||||
parse_theme_file (EyesPlugin *eyes, FILE *theme_file)
|
||||
parse_theme_file (EyesPlugin *eyes,
|
||||
FILE *theme_file)
|
||||
{
|
||||
gchar line_buf [512]; /* prolly overkill */
|
||||
gchar *token;
|
||||
fgets (line_buf, 512, theme_file);
|
||||
|
||||
while (!feof (theme_file)) {
|
||||
token = strtok (line_buf, "=");
|
||||
if (strncmp (token, "wall-thickness",
|
||||
|
|
@ -77,11 +79,11 @@ parse_theme_file (EyesPlugin *eyes, FILE *theme_file)
|
|||
token = strtok (NULL, "\"");
|
||||
if (eyes->pupil_filename != NULL)
|
||||
g_free (eyes->pupil_filename);
|
||||
eyes->pupil_filename
|
||||
= g_strdup_printf ("%s%s",
|
||||
eyes->pupil_filename = g_strdup_printf ("%s%s",
|
||||
eyes->theme_dir,
|
||||
token);
|
||||
}
|
||||
|
||||
fgets (line_buf, 512, theme_file);
|
||||
}
|
||||
}
|
||||
|
|
@ -97,7 +99,7 @@ load_theme (EyesPlugin *eyes,
|
|||
|
||||
eyes->theme_dir = g_strdup_printf ("%s/", theme_dir);
|
||||
|
||||
file_name = g_strdup_printf("%s%s",theme_dir,"/config");
|
||||
file_name = g_strdup_printf ("%s%s",theme_dir,"/config");
|
||||
theme_file = fopen (file_name, "r");
|
||||
if (theme_file == NULL) {
|
||||
g_error ("Unable to open theme file.");
|
||||
|
|
@ -124,5 +126,4 @@ load_theme (EyesPlugin *eyes,
|
|||
eyes->pupil_width = gdk_pixbuf_get_width (eyes->pupil_image);
|
||||
|
||||
g_free (file_name);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include <gtk/gtk.h>
|
||||
|
||||
void
|
||||
load_theme (EyesPlugin *eyes, const gchar *theme_dir);
|
||||
load_theme (EyesPlugin *eyes,
|
||||
const gchar *theme_dir);
|
||||
|
||||
#endif /* __THEMES_H__ */
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ Tango_DATA = \
|
|||
tango-pupil.png \
|
||||
config
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(Tango_DATA)
|
||||
EXTRA_DIST = $(Tango_DATA)
|
||||
|
||||
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
|
||||
|
|
|
|||
Reference in a new issue