jcomponent.h   jcomponent.h 
skipping to change at line 332 skipping to change at line 332
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBackgroundVisible(bool b); virtual void SetBackgroundVisible(bool b);
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEnabled();
/**
* \brief
*
*/
virtual void SetEnabled(bool b); virtual void SetEnabled(bool b);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetNavigation(Component *left, Component *right , Component *up, Component *down); virtual void SetNavigation(Component *left, Component *right , Component *up, Component *down);
/** /**
* \brief * \brief
skipping to change at line 530 skipping to change at line 536
/** /**
* \brief * \brief
* *
*/ */
virtual int GetY(); virtual int GetY();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetAbsoluteX();
/**
* \brief
*
*/
virtual int GetAbsoluteY();
/**
* \brief
*
*/
virtual int GetWidth(); virtual int GetWidth();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetHeight(); virtual int GetHeight();
/** /**
* \brief * \brief
 End of changes. 2 change blocks. 
0 lines changed or deleted 18 lines changed or added


 jfont.h   jfont.h 
skipping to change at line 48 skipping to change at line 48
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Font : public virtual jcommon::Object{ class Font : public virtual jcommon::Object{
friend class Graphics; friend class Graphics;
private: private:
static Font *_default_font;
#ifdef DIRECTFB_UI #ifdef DIRECTFB_UI
IDirectFBFont *_font; IDirectFBFont *_font;
#endif #endif
int _height, int _height,
_ascender, _ascender,
_descender, _descender,
_max_advance, _max_advance,
_scale_width, _scale_width,
_scale_height, _scale_height,
_virtual_height; _virtual_height;
skipping to change at line 77 skipping to change at line 79
/** /**
* \brief * \brief
* *
*/ */
virtual ~Font(); virtual ~Font();
/** /**
* \brief * \brief
* *
*/ */
static Font * GetDefaultFont();
/**
* \brief
*
*/
virtual void * GetFont(); virtual void * GetFont();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetWorkingScreenSize(int width, int height); virtual void SetWorkingScreenSize(int width, int height);
/** /**
* \brief * \brief
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added


 jframe.h   jframe.h 
skipping to change at line 48 skipping to change at line 48
#include <map> #include <map>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jframe_buttons_t { enum jframe_button_t {
FB_NONE = 0, FB_MINIMIZE = 1,
FB_MAXIMIZE = 1, FB_MAXIMIZE = 1,
FB_RELEASE = 2 FB_CLOSE = 2
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Frame : public KeyListener, public MouseListener, public Window { class Frame : public KeyListener, public MouseListener, public Window {
friend class Component; friend class Component;
skipping to change at line 125 skipping to change at line 125
std::vector<FrameInputListener *> _key_listeners; std::vector<FrameInputListener *> _key_listeners;
std::vector<frame_subtitle_t> _subtitles; std::vector<frame_subtitle_t> _subtitles;
std::string _title, std::string _title,
_icon; _icon;
int _init_type, int _init_type,
_relative_mouse_x, _relative_mouse_x,
_relative_mouse_y, _relative_mouse_y,
_relative_mouse_w, _relative_mouse_w,
_relative_mouse_h, _relative_mouse_h,
_mouse_state, _mouse_state;
_frame_buttons;
int _old_x, int _old_x,
_old_y, _old_y,
_old_width, _old_width,
_old_height; _old_height;
bool _input_locked, bool _input_locked,
_input_enabled, _input_enabled,
_background_visible, _background_visible,
_default_exit, _move_enabled,
_move_enabled, _release_enabled,
_resize_enabled, _resize_enabled,
_is_maximized; _is_maximized;
jframe_button_t _frame_buttons;
jkey_symbol_t _last_key_code; jkey_symbol_t _last_key_code;
jcursor_style_t _default_cursor; jcursor_style_t _default_cursor;
public: public:
/** /**
* \brief * \brief
* *
*/ */
Frame(std::string title, int x, int y, int width, int height , int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_H EIGHT); Frame(std::string title, int x, int y, int width, int height , int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_H EIGHT);
skipping to change at line 212 skipping to change at line 212
/** /**
* \brief * \brief
* *
*/ */
virtual void SetIcon(std::string icon); virtual void SetIcon(std::string icon);
/** /**
* \brief * \brief
* *
*/ */
virtual int GetFrameButtons(); virtual jframe_button_t GetFrameButtons();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetFrameButtons(int buttons); virtual void SetFrameButtons(jframe_button_t buttons);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetMoveEnabled(bool b); virtual void SetMoveEnabled(bool b);
/** /**
* \brief * \brief
* *
 End of changes. 6 change blocks. 
13 lines changed or deleted 13 lines changed or added


 jgfxhandler.h   jgfxhandler.h 
skipping to change at line 91 skipping to change at line 91
OffScreenImage *cursor; OffScreenImage *cursor;
int hot_x; int hot_x;
int hot_y; int hot_y;
}; };
std::map<jcursor_style_t, struct cursor_params_t> _cursors; std::map<jcursor_style_t, struct cursor_params_t> _cursors;
#endif #endif
std::vector<OffScreenImage *> _offscreenimages; std::vector<OffScreenImage *> _offscreenimages;
std::vector<Font *> _fonts; std::vector<Font *> _fonts;
Font *_default_font;
jthread::Mutex _mutex; jthread::Mutex _mutex;
jcursor_style_t _cursor; jcursor_style_t _cursor;
int r, int r,
g, g,
b, b,
a; a;
int screenWidth, int screenWidth,
screenHeight, screenHeight,
scaleWidth, scaleWidth,
scaleHeight; scaleHeight;
skipping to change at line 126 skipping to change at line 125
/** /**
* \brief * \brief
* *
*/ */
virtual void InitCursors(); virtual void InitCursors();
/** /**
* \brief * \brief
* *
*/ */
virtual void InitResources();
/**
* \brief
*
*/
void Add(Font *); void Add(Font *);
/** /**
* \brief * \brief
* *
*/ */
void Remove(Font *); void Remove(Font *);
/** /**
* \brief * \brief
skipping to change at line 219 skipping to change at line 224
/** /**
* \brief * \brief
* *
*/ */
virtual void * GetGraphicEngine(); virtual void * GetGraphicEngine();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetDefaultFont(Font *font);
/**
* \brief
*
*/
virtual Font * GetDefaultFont();
/**
* \brief
*
*/
virtual int GetScreenWidth(); virtual int GetScreenWidth();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetScreenHeight(); virtual int GetScreenHeight();
/** /**
* \brief * \brief
 End of changes. 3 change blocks. 
13 lines changed or deleted 6 lines changed or added


 jgraphics.h   jgraphics.h 
skipping to change at line 274 skipping to change at line 274
}; };
void insertEdge(edge_t *list, edge_t *edge); void insertEdge(edge_t *list, edge_t *edge);
void makeEdgeRec(struct jpoint_t lower, struct jpoint_t uppe r, int yComp, edge_t *edge, edge_t *edges[]); void makeEdgeRec(struct jpoint_t lower, struct jpoint_t uppe r, int yComp, edge_t *edge, edge_t *edges[]);
void fillScan(int scan, edge_t *active); void fillScan(int scan, edge_t *active);
int yNext(int k, int cnt, jpoint_t pts[]); int yNext(int k, int cnt, jpoint_t pts[]);
void buildEdgeList(int cnt, jpoint_t pts[], edge_t *edges[]) ; void buildEdgeList(int cnt, jpoint_t pts[], edge_t *edges[]) ;
void updateActiveList(int scan, edge_t *active); void updateActiveList(int scan, edge_t *active);
void Polygon(int n, int coordinates[]); void Polygon(int n, int coordinates[]);
void Fill_polygon(int n, int ppts[]); void Fill_polygon(int n, int ppts[]);
DFBSurfaceBlittingFlags GetBlittingFlags(jblitting_flags_t t
);
#endif #endif
void RotateImage(OffScreenImage *img, int xc, int yc, int x, int y, int width, int height, double angle, uint8_t alpha); void RotateImage(OffScreenImage *img, int xc, int yc, int x, int y, int width, int height, double angle, uint8_t alpha);
public: public:
/** /**
* \brief * \brief
* *
*/ */
virtual ~Graphics(); virtual ~Graphics();
/** /**
* \brief * \brief
* *
*/ */
static bool GetImageSize(std::string img, int *width, int *h eight); virtual void * GetNativeSurface();
/** /**
* \brief * \brief
* *
*/ */
virtual void * GetNativeSurface(); static bool GetImageSize(std::string img, int *width, int *h eight);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetNativeSurface(void *surface); virtual void SetNativeSurface(void *surface);
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
5 lines changed or deleted 2 lines changed or added


 jsystem.h   jsystem.h 
skipping to change at line 86 skipping to change at line 86
/** /**
* \brief * \brief
* *
*/ */
static int GetProcessID(); static int GetProcessID();
/** /**
* \brief * \brief
* *
*/ */
static std::string GetCurrentDirectory(); static std::string GetResourceDirectory();
/** /**
* \brief * \brief
* *
*/ */
static std::string GetHomeDirectory(); static std::string GetHomeDirectory();
/** /**
* \brief * \brief
* *
*/ */
static std::string GetCurrentDirectory();
/**
* \brief
*
*/
static std::string GetEnviromentVariable(std::string key_, s td::string default_); static std::string GetEnviromentVariable(std::string key_, s td::string default_);
/** /**
* \brief * \brief
* *
*/ */
static void UnsetEnviromentVariable(std::string key_); static void UnsetEnviromentVariable(std::string key_);
/** /**
* \brief * \brief
 End of changes. 2 change blocks. 
1 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/