diff options
Diffstat (limited to 'src/display.c')
| -rw-r--r-- | src/display.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/display.c b/src/display.c index b61d847..5c27999 100644 --- a/src/display.c +++ b/src/display.c @@ -32,7 +32,7 @@ #include <libintl.h> #define _(x) gettext(x) -#include "nanolight.h" +#include "lightctx.h" #include "command.h" #define OVERALL_BORDER (20.0) @@ -56,7 +56,7 @@ int key_attrs[] = { }; -static int fixture_selected(struct nanolight *nl, struct fixture *fix) +static int fixture_selected(struct lightctx *nl, struct fixture *fix) { int i; for ( i=0; i<nl->n_sel; i++ ) { @@ -67,7 +67,7 @@ static int fixture_selected(struct nanolight *nl, struct fixture *fix) static void draw_fixture(cairo_t *cr, PangoContext *pc, PangoFontDescription *fontdesc, - struct nanolight *nl, struct fixture *fix) + struct lightctx *nl, struct fixture *fix) { PangoLayout *layout; const double w = 40.0; @@ -151,7 +151,7 @@ static const char *attr_text(int cls) } -static gboolean draw_sig(GtkWidget *widget, cairo_t *cr, struct nanolight *nl) +static gboolean draw_sig(GtkWidget *widget, cairo_t *cr, struct lightctx *nl) { int w, h; int ch; @@ -229,7 +229,7 @@ static gboolean draw_sig(GtkWidget *widget, cairo_t *cr, struct nanolight *nl) } -static void redraw(struct nanolight *nl) +static void redraw(struct lightctx *nl) { gint w, h; w = gtk_widget_get_allocated_width(GTK_WIDGET(nl->da)); @@ -238,7 +238,7 @@ static void redraw(struct nanolight *nl) } -static gboolean im_commit_sig(GtkIMContext *im, gchar *str, struct nanolight *nl) +static gboolean im_commit_sig(GtkIMContext *im, gchar *str, struct lightctx *nl) { size_t cmd_len = strlen(nl->cmdline); if ( cmd_len+strlen(str) > 1023 ) return FALSE; @@ -261,7 +261,7 @@ static size_t delete_char(char *str) } -static void set_start_pantilt(struct nanolight *nl) +static void set_start_pantilt(struct lightctx *nl) { int i; for ( i=0; i<nl->n_sel; i++ ) { @@ -272,7 +272,7 @@ static void set_start_pantilt(struct nanolight *nl) } -static gboolean button_press_sig(GtkWidget *da, GdkEventButton *event, struct nanolight *nl) +static gboolean button_press_sig(GtkWidget *da, GdkEventButton *event, struct lightctx *nl) { #if 0 GdkSeat *seat; @@ -291,14 +291,14 @@ static gboolean button_press_sig(GtkWidget *da, GdkEventButton *event, struct na } -static gboolean button_release_sig(GtkWidget *da, GdkEventButton *event, struct nanolight *nl) +static gboolean button_release_sig(GtkWidget *da, GdkEventButton *event, struct lightctx *nl) { nl->dragging = 0; return FALSE; } -static gboolean motion_sig(GtkWidget *da, GdkEventMotion *event, struct nanolight *nl) +static gboolean motion_sig(GtkWidget *da, GdkEventMotion *event, struct lightctx *nl) { int i; double x_inc, y_inc; @@ -341,7 +341,7 @@ static gboolean motion_sig(GtkWidget *da, GdkEventMotion *event, struct nanoligh } -static void home_value(struct nanolight *nl) +static void home_value(struct lightctx *nl) { int i; for ( i=0; i<nl->n_sel; i++ ) { @@ -371,7 +371,7 @@ static void home_value(struct nanolight *nl) } -static void execute_command(struct nanolight *nl) +static void execute_command(struct lightctx *nl) { if ( command_run(nl->cmdline, nl) == 0 ) { nl->cmdline[0] = '\0'; @@ -381,7 +381,7 @@ static void execute_command(struct nanolight *nl) } -static gboolean key_release_sig(GtkWidget *da, GdkEventKey *event, struct nanolight *nl) +static gboolean key_release_sig(GtkWidget *da, GdkEventKey *event, struct lightctx *nl) { switch ( event->keyval ) { @@ -398,7 +398,7 @@ static gboolean key_release_sig(GtkWidget *da, GdkEventKey *event, struct nanoli } -static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, struct nanolight *nl) +static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, struct lightctx *nl) { gboolean r; int claim = 1; @@ -534,7 +534,7 @@ static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, struct nanoligh } -static gint realise_sig(GtkWidget *da, struct nanolight *nl) +static gint realise_sig(GtkWidget *da, struct lightctx *nl) { GdkWindow *win = gtk_widget_get_window(da); PangoContext *pc; @@ -566,7 +566,7 @@ static gint realise_sig(GtkWidget *da, struct nanolight *nl) } -void create_main_window(struct nanolight *nl) +void create_main_window(struct lightctx *nl) { GtkWidget *mainwindow; GtkWidget *da; |