jtheoof/swappy
1
1
Fork 0
mirror of https://github.com/jtheoof/swappy.git synced 2024-08-16 10:10:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(render): rename draw.c into render.c

Browse Source
This commit is contained in:
Jeremy Attali 2019-12-23 17:35:47 -05:00
parent f8c0e005cc
commit 90958ab8fd
5 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/draw.h
View File

@ -1,5 +0,0 @@
#pragma once
#include "swappy.h"
void draw_state(struct swappy_state *state);

5
include/render.h Normal file
View File

@ -0,0 +1,5 @@
#pragma once
#include "swappy.h"
void render_state(struct swappy_state *state);

2
meson.build
View File

@ -39,7 +39,7 @@ executable(
'src/box.c',
'src/config.c',
'src/clipboard.c',
'src/draw.c',
'src/render.c',
'src/screencopy.c',
'src/wayland.c',
'src/application.c',

12
src/application.c
View File

@ -5,8 +5,8 @@
#include <time.h>
#include "clipboard.h"
#include "draw.h"
#include "notification.h"
#include "render.h"
#include "screencopy.h"
#include "swappy.h"
#include "wayland.h"
@ -113,7 +113,7 @@ static gboolean configure_event_handler(GtkWidget *area,
gtk_widget_get_allocated_width(area),
gtk_widget_get_allocated_height(area));
draw_state(state);
render_state(state);
return TRUE;
}
@ -160,7 +160,7 @@ static void tools_menu_button_save_clicked_handler(GtkButton *button,
static void tools_menu_button_clear_clicked_handler(
GtkWidget *widget, struct swappy_state *state) {
paint_free_all(state);
draw_state(state);
render_state(state);
}
static void tools_menu_button_brush_toggle_handler(GtkToggleButton *source,
@ -355,7 +355,7 @@ static void draw_area_button_press_handler(GtkWidget *widget,
case SWAPPY_PAINT_MODE_ELLIPSE:
case SWAPPY_PAINT_MODE_ARROW:
paint_add_temporary(state, event->x, event->y, state->mode);
draw_state(state);
render_state(state);
break;
default:
return;
@ -377,7 +377,7 @@ static void draw_area_button_release_handler(GtkWidget *widget,
case SWAPPY_PAINT_MODE_ELLIPSE:
case SWAPPY_PAINT_MODE_ARROW:
paint_commit_temporary(state);
draw_state(state);
render_state(state);
break;
default:
return;
@ -401,7 +401,7 @@ static void draw_area_motion_notify_handler(GtkWidget *widget,
case SWAPPY_PAINT_MODE_ARROW:
if (is_button1_pressed) {
paint_update_temporary(state, event->x, event->y);
draw_state(state);
render_state(state);
}
break;
default:

37
src/draw.c → src/render.c
View File

@ -31,7 +31,7 @@ static void apply_output_transform(enum wl_output_transform transform,
}
}
static void draw_shape_arrow(cairo_t *cr, struct swappy_paint_shape shape) {
static void render_shape_arrow(cairo_t *cr, struct swappy_paint_shape shape) {
cairo_set_source_rgba(cr, shape.r, shape.g, shape.b, shape.a);
cairo_set_line_width(cr, shape.w);
@ -71,7 +71,7 @@ static void draw_shape_arrow(cairo_t *cr, struct swappy_paint_shape shape) {
cairo_fill(cr);
}
static void draw_shape_ellipse(cairo_t *cr, struct swappy_paint_shape shape) {
static void render_shape_ellipse(cairo_t *cr, struct swappy_paint_shape shape) {
double x = fabs(shape.from.x - shape.to.x);
double y = fabs(shape.from.y - shape.to.y);
double xc = shape.from.x + ((shape.to.x - shape.from.x) / 2);
@ -93,7 +93,8 @@ static void draw_shape_ellipse(cairo_t *cr, struct swappy_paint_shape shape) {
cairo_close_path(cr);
}
static void draw_shape_rectangle(cairo_t *cr, struct swappy_paint_shape shape) {
static void render_shape_rectangle(cairo_t *cr,
struct swappy_paint_shape shape) {
double x = fmin(shape.from.x, shape.to.x);
double y = fmin(shape.from.y, shape.to.y);
double w = fabs(shape.from.x - shape.to.x);
@ -107,17 +108,17 @@ static void draw_shape_rectangle(cairo_t *cr, struct swappy_paint_shape shape) {
cairo_stroke(cr);
}
static void draw_shape(cairo_t *cr, struct swappy_paint_shape shape) {
static void render_shape(cairo_t *cr, struct swappy_paint_shape shape) {
cairo_save(cr);
switch (shape.type) {
case SWAPPY_PAINT_MODE_RECTANGLE:
draw_shape_rectangle(cr, shape);
render_shape_rectangle(cr, shape);
break;
case SWAPPY_PAINT_MODE_ELLIPSE:
draw_shape_ellipse(cr, shape);
render_shape_ellipse(cr, shape);
break;
case SWAPPY_PAINT_MODE_ARROW:
draw_shape_arrow(cr, shape);
render_shape_arrow(cr, shape);
break;
default:
g_debug("unknown shape type: %d", shape.type);
@ -125,7 +126,7 @@ static void draw_shape(cairo_t *cr, struct swappy_paint_shape shape) {
cairo_restore(cr);
}
static void draw_buffer(cairo_t *cr, struct swappy_state *state) {
static void render_buffer(cairo_t *cr, struct swappy_state *state) {
// FIXME This is wrong, the geometry here is not quite valid
// It must be based on output, but will work fine on single screen
struct swappy_box *geometry = state->geometry;
@ -185,7 +186,7 @@ static void draw_buffer(cairo_t *cr, struct swappy_state *state) {
}
}
static void draw_brush(cairo_t *cr, struct swappy_paint_brush brush) {
static void render_brush(cairo_t *cr, struct swappy_paint_brush brush) {
cairo_set_source_rgba(cr, brush.r, brush.g, brush.b, brush.a);
cairo_set_line_width(cr, brush.w);
cairo_set_line_join(cr, CAIRO_LINE_JOIN_BEVEL);
@ -205,19 +206,19 @@ static void draw_brush(cairo_t *cr, struct swappy_paint_brush brush) {
}
}
static void draw_paint(cairo_t *cr, struct swappy_paint *paint) {
static void render_paint(cairo_t *cr, struct swappy_paint *paint) {
if (!paint->can_draw) {
return;
}
switch (paint->type) {
case SWAPPY_PAINT_MODE_BRUSH:
draw_brush(cr, paint->content.brush);
render_brush(cr, paint->content.brush);
break;
case SWAPPY_PAINT_MODE_RECTANGLE:
case SWAPPY_PAINT_MODE_ELLIPSE:
case SWAPPY_PAINT_MODE_ARROW:
draw_shape(cr, paint->content.shape);
render_shape(cr, paint->content.shape);
break;
default:
g_info("unable to draw paint with type: %d", paint->type);
@ -225,24 +226,24 @@ static void draw_paint(cairo_t *cr, struct swappy_paint *paint) {
}
}
static void draw_paints(cairo_t *cr, struct swappy_state *state) {
static void render_paints(cairo_t *cr, struct swappy_state *state) {
for (GSList *elem = state->paints; elem; elem = elem->next) {
struct swappy_paint *paint = elem->data;
draw_paint(cr, paint);
render_paint(cr, paint);
}
if (state->temp_paint) {
draw_paint(cr, state->temp_paint);
render_paint(cr, state->temp_paint);
}
}
void draw_state(struct swappy_state *state) {
void render_state(struct swappy_state *state) {
cairo_t *cr = cairo_create(state->cairo_surface);
cairo_set_source_rgb(cr, 1, 1, 1);
draw_buffer(cr, state);
draw_paints(cr, state);
render_buffer(cr, state);
render_paints(cr, state);
// Drawing is finished, notify the GtkDrawingArea it needs to be redrawn.
gtk_widget_queue_draw(state->area);