Index: layersel/wt_layersel.c =================================================================== --- layersel/wt_layersel.c (revision 8554) +++ layersel/wt_layersel.c (revision 8555) @@ -5,7 +5,7 @@ #warning TEMPORARY HACKs: #define pcb_hid_actionl(a, b, c) printf("action: " a b "\n") -static layersel_layer_t *current = NULL; +static pcb_gtk_ls_lyr_t *current = NULL; /*** Layer visibility widget rendering ***/ #define set_pixel(dst, r, g, b, a) \ @@ -70,7 +70,7 @@ /*** Sync: make the GUI look like internal states ***/ -static void layer_vis_sync(layersel_layer_t *lsl) +static void layer_vis_sync(pcb_gtk_ls_lyr_t *lsl) { if (lsl->on) { gtk_widget_show(lsl->vis_on); @@ -86,7 +86,7 @@ pcb_gtk_set_selected(lsl->name_box, 0); } -static void group_vis_sync(layersel_grp_t *lsg) +static void group_vis_sync(pcb_gtk_ls_grp_t *lsg) { if (lsg->open) { int n; @@ -120,12 +120,12 @@ /*** Event handling ***/ -static int ev_lyr_no_select(layersel_layer_t *lsl) +static int ev_lyr_no_select(pcb_gtk_ls_lyr_t *lsl) { return 1; /* layer can not be selected ever */ } -static gboolean group_vis_press_cb(GtkWidget *widget, GdkEvent *event, layersel_grp_t *lsg) +static gboolean group_vis_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg) { switch(event->button.button) { case 1: @@ -141,7 +141,7 @@ static gboolean layer_vis_press_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - layersel_layer_t *lsl = user_data; + pcb_gtk_ls_lyr_t *lsl = user_data; switch(event->button.button) { case 1: if ((lsl->ev_toggle_vis == NULL) || (lsl->ev_toggle_vis(lsl) == 0)) @@ -157,7 +157,7 @@ static gboolean layer_select_press_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - layersel_layer_t *lsl = user_data, *old_curr; + pcb_gtk_ls_lyr_t *lsl = user_data, *old_curr; switch(event->button.button) { case 1: printf("layer select!\n"); @@ -176,7 +176,7 @@ return TRUE; } -static gboolean group_any_press_cb(GtkWidget *widget, GdkEvent *event, layersel_grp_t *lsg, int openval) +static gboolean group_any_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg, int openval) { switch(event->button.button) { case 1: @@ -190,12 +190,12 @@ return TRUE; } -static gboolean group_close_press_cb(GtkWidget *widget, GdkEvent *event, layersel_grp_t *lsg) +static gboolean group_close_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg) { return group_any_press_cb(widget, event, lsg, 0); } -static gboolean group_open_press_cb(GtkWidget *widget, GdkEvent *event, layersel_grp_t *lsg) +static gboolean group_open_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg) { return group_any_press_cb(widget, event, lsg, 1); } @@ -223,7 +223,7 @@ } /* Create a hbox of a layer within an expanded group */ -static GtkWidget *build_layer(layersel_grp_t *lsg, layersel_layer_t *lsl, const char *name) +static GtkWidget *build_layer(pcb_gtk_ls_grp_t *lsg, pcb_gtk_ls_lyr_t *lsl, const char *name) { GtkWidget *vis_box, *vis_ebox, *ly_name_bx, *lab; @@ -249,7 +249,7 @@ } /* Creating a group enrty (both open and closed state); after layers are added, finish() needs to be called */ -static GtkWidget *build_group_start(pcb_gtk_layersel_t *ls, layersel_grp_t *lsg, const char *gname, int has_group_vis) +static GtkWidget *build_group_start(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, const char *gname, int has_group_vis) { GtkWidget *gn_vert, *vlabel, *opn, *cld; @@ -298,7 +298,7 @@ } /* finish creating a group - call after layers are added */ -static void build_group_finish(layersel_grp_t *lsg) +static void build_group_finish(pcb_gtk_ls_grp_t *lsg) { /* Make sure gtk_show_all() won't mess with our hardwired hide/show */ group_vis_sync(lsg); @@ -307,7 +307,7 @@ } /* Create a group that has a real layer group in core, add all layers */ -static GtkWidget *build_group_real(pcb_gtk_layersel_t *ls, layersel_grp_t *lsg, const char *gname) +static GtkWidget *build_group_real(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, const char *gname) { int n; GtkWidget *wg = build_group_start(ls, lsg, gname, 1); @@ -340,7 +340,7 @@ gtk_box_pack_start(GTK_BOX(main_box), gtk_hseparator_new(), FALSE, FALSE, 0); { /* build hardwired virtual layers */ - layersel_grp_t *lsg = &ls->grp[3]; + pcb_gtk_ls_grp_t *lsg = &ls->grp[3]; gtk_box_pack_start(GTK_BOX(main_box), build_group_start(ls, lsg, "Virtual", 0), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(lsg->layers), build_layer(lsg, &lsg->layer[0], "Pins/Pads"), FALSE, FALSE, 1); gtk_box_pack_start(GTK_BOX(lsg->layers), build_layer(lsg, &lsg->layer[1], "Vias"), FALSE, FALSE, 1); Index: layersel/wt_layersel.h =================================================================== --- layersel/wt_layersel.h (revision 8554) +++ layersel/wt_layersel.h (revision 8555) @@ -4,25 +4,25 @@ #include typedef struct pcb_gtk_layersel_s pcb_gtk_layersel_t; -typedef struct layersel_grp_s layersel_grp_t; -typedef struct layersel_layer_s layersel_layer_t; +typedef struct pcb_gtk_ls_grp_s pcb_gtk_ls_grp_t; +typedef struct pcb_gtk_ls_lyr_s pcb_gtk_ls_lyr_t; -struct layersel_layer_s { +struct pcb_gtk_ls_lyr_s { GtkWidget *box, *vis_on, *vis_off, *name_box; - int (*ev_toggle_vis)(layersel_layer_t *lsl); /* called first in click handler, if returns non-zero, normal visibility update is supressed */ - int (*ev_selected)(layersel_layer_t *lsl); /* called first in click handler, if returns non-zero, layer can not be selected */ + int (*ev_toggle_vis)(pcb_gtk_ls_lyr_t *lsl); /* called first in click handler, if returns non-zero, normal visibility update is supressed */ + int (*ev_selected)(pcb_gtk_ls_lyr_t *lsl); /* called first in click handler, if returns non-zero, layer can not be selected */ unsigned on:1; /* TODO: temporary hack: should be extracted from the layer struct */ /* for callbacks */ - layersel_grp_t *lsg; /* points to parent */ + pcb_gtk_ls_grp_t *lsg; /* points to parent */ }; -struct layersel_grp_s { +struct pcb_gtk_ls_grp_s { GtkWidget *grp_row, *grp_closed, *grp_open, *layers, *vis_on, *vis_off; - layersel_layer_t layer[4]; + pcb_gtk_ls_lyr_t layer[4]; /* for callbacks */ pcb_gtk_layersel_t *ls; /* points to parent */ @@ -34,7 +34,7 @@ struct pcb_gtk_layersel_s { - layersel_grp_t grp[4]; + pcb_gtk_ls_grp_t grp[4]; }; GtkWidget *pcb_gtk_layersel_build(pcb_gtk_layersel_t *ls);