Using AStyle of all the C and C++ source and header files - gsl-shell.git - gsl-shell

diff --git a/agg-plot/window-cpp.h b/agg-plot/window-cpp.h
index 0d724dd2..515b7fda 100644
--- a/agg-plot/window-cpp.h
+++ b/agg-plot/window-cpp.h

@@ -18,73 +18,77 @@ extern "C" {

class window : public canvas_window {

public:

- int window_id;

+ int window_id;

- typedef agg::trans_affine bmatrix;

+ typedef agg::trans_affine bmatrix;

- struct ref {

- typedef tree::node<ref, direction_e> node;

+ struct ref {

+ typedef tree::node<ref, direction_e> node;

- sg_plot* plot;

- int slot_id;

+ sg_plot* plot;

+ int slot_id;

- plot_render_info inf;

- bmatrix matrix;

+ plot_render_info inf;

+ bmatrix matrix;

- unsigned char *layer_buf;

- agg::rendering_buffer layer_img;

+ unsigned char *layer_buf;

+ agg::rendering_buffer layer_img;

- bool valid_rect;

- opt_rect<double> dirty_rect;

+ bool valid_rect;

+ opt_rect<double> dirty_rect;

- ref(sg_plot* p = 0)

- : plot(p), matrix(), layer_buf(0), valid_rect(true), dirty_rect()

- {};

+ ref(sg_plot* p = 0)

+ : plot(p), matrix(), layer_buf(0), valid_rect(true), dirty_rect()

+ {};

- ~ref() { if (layer_buf) delete layer_buf; };

+ ~ref() {

+ if (layer_buf) delete layer_buf;

+ };

- void save_image (agg::rendering_buffer& winbuf, agg::rect_base<int>& r,

- int bpp, bool flip_y);

+ void save_image (agg::rendering_buffer& winbuf, agg::rect_base<int>& r,

+ int bpp, bool flip_y);

- static void compose(bmatrix& a, const bmatrix& b);

- static int calculate(node *t, const bmatrix& m, int id);

- };

+ static void compose(bmatrix& a, const bmatrix& b);

+ static int calculate(node *t, const bmatrix& m, int id);

+ };

private:

- void draw_slot_by_ref(ref& ref, bool dirty);

- void refresh_slot_by_ref(ref& ref, bool draw_all);

- void draw_rec(ref::node *n);

- void cleanup_tree_rec (lua_State *L, int window_index, ref::node* n);

+ void draw_slot_by_ref(ref& ref, bool dirty);

+ void refresh_slot_by_ref(ref& ref, bool draw_all);

+ void draw_rec(ref::node *n);

+ void cleanup_tree_rec (lua_State *L, int window_index, ref::node* n);

- static ref *ref_lookup (ref::node *p, int slot_id);

+ static ref *ref_lookup (ref::node *p, int slot_id);

- ref::node* m_tree;

+ ref::node* m_tree;

public:

- window(gsl_shell_state* gs, agg::rgba8 bgcol= colors::white):

- canvas_window(gs, bgcol), m_tree(0)

- {

- this->split(".");

- };

-

- ~window() { if (m_tree) delete m_tree; };

-

- bool split(const char *spec);

- int attach(sg_plot *plot, const char *spec);

- void draw_slot(int slot_id, bool update_req);

- void refresh_slot(int slot_id);

- void start(lua_State *L, gslshell::ret_status& st);

-

- void save_slot_image(int slot_id);

- void restore_slot_image(int slot_id);

-

- void cleanup_refs(lua_State *L, int window_index)

- {

- cleanup_tree_rec (L, window_index, m_tree);

- };

-

- void draw_slot(int slot_id);

-

- virtual void on_draw();

- virtual void on_resize(int sx, int sy);

+ window(gsl_shell_state* gs, agg::rgba8 bgcol= colors::white):

+ canvas_window(gs, bgcol), m_tree(0)

+ {

+ this->split(".");

+ };

+

+ ~window() {

+ if (m_tree) delete m_tree;

+ };

+

+ bool split(const char *spec);

+ int attach(sg_plot *plot, const char *spec);

+ void draw_slot(int slot_id, bool update_req);

+ void refresh_slot(int slot_id);

+ void start(lua_State *L, gslshell::ret_status& st);

+

+ void save_slot_image(int slot_id);

+ void restore_slot_image(int slot_id);

+

+ void cleanup_refs(lua_State *L, int window_index)

+ {

+ cleanup_tree_rec (L, window_index, m_tree);

+ };

+

+ void draw_slot(int slot_id);

+

+ virtual void on_draw();

+ virtual void on_resize(int sx, int sy);

};