small

Author: jcupitt

TODO

@@ -2,6 +2,8 @@
 
 - could right-click on a region label pop up the rowview menu?
 
+	difficult with the structure we have now
+
 - put region snap back?
 
 - maxpos, then create mark from coordinate should be two clicks

src/imageui.c

@@ -987,7 +987,7 @@ imageui_key_released(GtkEventControllerKey *self,
 
 // (x, y) in gtk cods
 static Regionview *
-imageui_find_regionview(Imageui *imageui, int x, int y)
+imageui_pick_regionview(Imageui *imageui, int x, int y)
 {
 	for (GSList *p = imageui->regionviews; p; p = p->next) {
 		Regionview *regionview = REGIONVIEW(p->data);
@@ -1015,7 +1015,7 @@ imageui_drag_begin(GtkEventControllerMotion *self,
 
 	switch (imageui->state) {
 	case IMAGEUI_WAIT:
-		regionview = imageui_find_regionview(imageui, start_x, start_y);
+		regionview = imageui_pick_regionview(imageui, start_x, start_y);
 
 		if (regionview) {
 			imageui->state = IMAGEUI_SELECT;
@@ -1221,7 +1221,7 @@ imageui_set_cursor(Imageui *imageui)
 
 		Regionview *regionview;
 
-		if ((regionview = imageui_find_regionview(imageui, x, y)))
+		if ((regionview = imageui_pick_regionview(imageui, x, y)))
 			resize = regionview_hit(regionview, x, y);
 	}
 

src/imagewindow.c

@@ -1351,14 +1351,13 @@ static void
 imagewindow_pressed(GtkGestureClick *gesture,
 	guint n_press, double x, double y, Imagewindow *win)
 {
-	gtk_popover_set_pointing_to(GTK_POPOVER(win->right_click_menu),
+	Imageui *imageui = win->imageui;
+	GtkWidget *menu = win->right_click_menu;
+
+	gtk_popover_set_pointing_to(GTK_POPOVER(menu),
 		&(const GdkRectangle){ x, y, 1, 1 });
 
-	/* This produces a lot of warnings :( not sure why. I tried calling
-	 * gtk_popover_present() in realize to force allocation, but it didn't
-	 * help.
-	 */
-	gtk_popover_popup(GTK_POPOVER(win->right_click_menu));
+	gtk_popover_popup(GTK_POPOVER(menu));
 }
 
 static void

src/iregion.c

@@ -201,8 +201,7 @@ iregion_save(Model *model, xmlNode *xnode)
 	 */
 	gpointer parent_class = PARENT_CLASS_DYNAMIC(model);
 
-	iRegionInstance *instance =
-		classmodel_get_instance(CLASSMODEL(model));
+	iRegionInstance *instance = classmodel_get_instance(CLASSMODEL(model));
 
 	xmlNode *xthis;
 

src/iregiongroup.c

@@ -52,7 +52,7 @@ iregiongroup_update_model(Heapmodel *heapmodel)
 	if (heapmodel->row->sym)
 		model_display(MODEL(heapmodel),
 			!is_super(heapmodel->row->sym) &&
-				!is_this(heapmodel->row->sym));
+			!is_this(heapmodel->row->sym));
 
 	return NULL;
 }
@@ -94,8 +94,7 @@ iregiongroup_new(Classmodel *classmodel)
 
 	iregiongroup = IREGIONGROUP(g_object_new(IREGIONGROUP_TYPE, NULL));
 
-	icontainer_child_add(ICONTAINER(classmodel),
-		ICONTAINER(iregiongroup), -1);
+	icontainer_child_add(ICONTAINER(classmodel), ICONTAINER(iregiongroup), -1);
 
 #ifdef DEBUG
 	printf("iregiongroup_new: ");

src/util.c

@@ -493,12 +493,11 @@ slist_equal(GSList *l1, GSList *l2)
 void *
 slist_map(GSList *list, SListMapFn fn, gpointer a)
 {
-	GSList *i;
 	void *result;
 
 	g_autoptr(GSList) copy = g_slist_copy(list);
 	result = NULL;
-	for (i = copy; i && !(result = fn(i->data, a)); i = i->next)
+	for (GSList *p = copy; p && !(result = fn(p->data, a)); p = p->next)
 		;
 
 	return result;