jadjustmentevent.h   jadjustmentevent.h 
skipping to change at line 31 skipping to change at line 31
#define J_ADJUSTMENTEVENT_H #define J_ADJUSTMENTEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jadjustment_type_t { enum jadjustmentevent_type_t {
BLOCK_INCREMENT, JAT_BLOCK_INCREMENT,
BLOCK_DECREMENT, JAT_BLOCK_DECREMENT,
UNIT_INCREMENT, JAT_UNIT_INCREMENT,
UNIT_DECREMENT JAT_UNIT_DECREMENT
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class AdjustmentEvent : public jcommon::EventObject{ class AdjustmentEvent : public jcommon::EventObject{
private: private:
/** \brief */ /** \brief */
jadjustment_type_t _type; jadjustmentevent_type_t _type;
/** \brief */ /** \brief */
double _value; double _value;
public: public:
/** /**
* \brief * \brief
* *
*/ */
AdjustmentEvent(void *source, jadjustment_type_t type, doubl e value); AdjustmentEvent(void *source, jadjustmentevent_type_t type, double value);
/** /**
* \brief * \brief
* *
*/ */
virtual ~AdjustmentEvent(); virtual ~AdjustmentEvent();
/** /**
* \brief * \brief
* *
*/ */
virtual double GetValue(); virtual double GetValue();
/** /**
* \brief * \brief
* *
*/ */
virtual jadjustment_type_t GetType(); virtual jadjustmentevent_type_t GetType();
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
8 lines changed or deleted 8 lines changed or added


 jborderlayout.h   jborderlayout.h 
skipping to change at line 37 skipping to change at line 37
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jborderlayout_align_t { enum jborderlayout_align_t {
BL_UNKNOWN, JBA_UNKNOWN,
BL_NORTH, JBA_NORTH,
BL_SOUTH, JBA_SOUTH,
BL_EAST, JBA_EAST,
BL_WEST, JBA_WEST,
BL_CENTER, JBA_CENTER,
BL_BEFORE_FIRST_LINE, JBA_BEFORE_FIRST_LINE,
BL_AFTER_LAST_LINE, JBA_AFTER_LAST_LINE,
BL_BEFORE_LINE_BEGINS, JBA_BEFORE_LINE_BEGINS,
BL_AFTER_LINE_ENDS, JBA_AFTER_LINE_ENDS,
BL_PAGE_START = BL_BEFORE_FIRST_LINE, JBA_PAGE_START = JBA_BEFORE_FIRST_LINE,
BL_PAGE_END = BL_AFTER_LAST_LINE, JBA_PAGE_END = JBA_AFTER_LAST_LINE,
BL_LINE_START = BL_BEFORE_LINE_BEGINS, JBA_LINE_START = JBA_BEFORE_LINE_BEGINS,
BL_LINE_END = BL_AFTER_LINE_ENDS JBA_LINE_END = JBA_AFTER_LINE_ENDS
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class BorderLayout : public Layout{ class BorderLayout : public Layout{
private: private:
 End of changes. 1 change blocks. 
14 lines changed or deleted 14 lines changed or added


 jbutton.h   jbutton.h 
skipping to change at line 43 skipping to change at line 43
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Button : public Component{ class Button : public Component{
private: private:
std::vector<ButtonListener *> _button_listeners; std::vector<ButtonListener *> _button_listeners;
std::vector<std::string> _name_list; std::string _name,
int _index; _label;
protected: protected:
jhorizontal_align_t _halign; jhorizontal_align_t _halign;
jvertical_align_t _valign; jvertical_align_t _valign;
bool _wrap; bool _wrap;
public: public:
/** /**
* \brief * \brief
* *
skipping to change at line 68 skipping to change at line 68
/** /**
* \brief * \brief
* *
*/ */
virtual ~Button(); virtual ~Button();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetText(std::string text); virtual void SetName(std::string name);
/**
* \brief
*
*/
virtual void AddName(std::string);
/**
* \brief
*
*/
virtual void RemoveName(int index);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCurrentNameIndex(int index); virtual void SetLabel(std::string label);
/** /**
* \brief * \brief
* *
*/ */
virtual void NextName(); virtual std::string GetName();
/** /**
* \brief * \brief
* *
*/ */
virtual void PreviousName(); virtual std::string GetLabel();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetHorizontalAlign(jhorizontal_align_t align); virtual void SetHorizontalAlign(jhorizontal_align_t align);
/** /**
* \brief * \brief
* *
skipping to change at line 128 skipping to change at line 116
/** /**
* \brief * \brief
* *
*/ */
virtual jvertical_align_t GetVerticalAlign(); virtual jvertical_align_t GetVerticalAlign();
/** /**
* \brief * \brief
* *
*/ */
virtual std::string GetText();
/**
* \brief
*
*/
virtual void Paint(Graphics *g); virtual void Paint(Graphics *g);
/** /**
* \brief * \brief
* *
*/ */
virtual bool ProcessEvent(KeyEvent *event); virtual bool ProcessEvent(KeyEvent *event);
/** /**
* \brief * \brief
 End of changes. 6 change blocks. 
24 lines changed or deleted 6 lines changed or added


 jbuttonevent.h   jbuttonevent.h 
skipping to change at line 36 skipping to change at line 36
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ButtonEvent : public jcommon::EventObject{ class ButtonEvent : public jcommon::EventObject{
private: private:
std::string _symbol;
public: public:
/** /**
* \brief * \brief
* *
*/ */
ButtonEvent(void *source, std::string symbol); ButtonEvent(void *source);
/** /**
* \brief * \brief
* *
*/ */
virtual ~ButtonEvent(); virtual ~ButtonEvent();
/**
* \brief
*
*/
virtual std::string GetSymbol();
}; };
} }
#endif #endif
 End of changes. 3 change blocks. 
8 lines changed or deleted 1 lines changed or added


 jcharset.h   jcharset.h 
skipping to change at line 43 skipping to change at line 43
typedef uint32_t Char; // 0 or 1 typedef uint32_t Char; // 0 or 1
// Some fundamental constants // Some fundamental constants
#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD #define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
#define UNI_MAX_BMP (UTF32)0x0000FFFF #define UNI_MAX_BMP (UTF32)0x0000FFFF
#define UNI_MAX_UTF16 (UTF32)0x0010FFFF #define UNI_MAX_UTF16 (UTF32)0x0010FFFF
#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF #define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF #define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
enum jcharset_result_t { enum jcharset_result_t {
CS_OK, // conversion successful JCR_OK, // conversion succes
CS_SOURCE_EXHAUSTED, // partial character in source, but hit end sful
CS_TARGET_EXHAUSTED, // insuff. room in target for conversion JCR_SOURCE_EXHAUSTED, // partial character in source, but hit end
CS_SOURCE_ILLEGAL, // source sequence is illegal/malfor JCR_TARGET_EXHAUSTED, // insuff. room in target for conversion
med JCR_SOURCE_ILLEGAL, // source sequence is illegal/malfor
CS_SOURCE_CORRUPT // source was corrupted med
JCR_SOURCE_CORRUPT // source was corrupted
}; };
enum jcharset_flags_t { enum jcharset_flags_t {
strictConversion = 0, JCF_STRICT_CONVERSION = 0,
lenientConversion JCF_LENIENT_CONVERSION,
}; };
enum { enum {
Low6Bits = 0x3F, // 00111111 Low6Bits = 0x3F, // 00111111
High2Bits = 0xC0, // 11000000 High2Bits = 0xC0, // 11000000
ByteMask = 0x00BF, // 10111111 ByteMask = 0x00BF, // 10111111
ContinueBits = 0x80 // 10xxxxxx ContinueBits = 0x80 // 10xxxxxx
}; };
namespace jcommon { namespace jcommon {
 End of changes. 2 change blocks. 
8 lines changed or deleted 9 lines changed or added


 jcheckbutton.h   jcheckbutton.h 
skipping to change at line 32 skipping to change at line 32
#include "jcomponent.h" #include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
enum jcheckbox_type_t { enum jcheckbox_type_t {
CHECK_TYPE, JCT_CHECK,
RADIO_TYPE JCT_RADIO
}; };
class CheckButtonListener; class CheckButtonListener;
class CheckButtonEvent; class CheckButtonEvent;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcomponent.h   jcomponent.h 
skipping to change at line 43 skipping to change at line 43
#include <string> #include <string>
#include <vector> #include <vector>
#define DEFAULT_COMPONENT_WIDTH 192 #define DEFAULT_COMPONENT_WIDTH 192
#define DEFAULT_COMPONENT_HEIGHT 54 #define DEFAULT_COMPONENT_HEIGHT 54
namespace jgui { namespace jgui {
enum jcomponent_alignment_t { enum jcomponent_alignment_t {
TOP_ALIGNMENT = 0, JCA_TOP,
CENTER_ALIGNMENT = 1, JCA_CENTER,
BOTTOM_ALIGNMENT = 2, JCA_BOTTOM,
LEFT_ALIGNMENT = 0, JCA_LEFT,
RIGHT_ALIGNMENT = 2 JCA_RIGHT
}; };
enum jcomponent_orientation_t { enum jcomponent_orientation_t {
LEFT_TO_RIGHT_ORIENTATION, JCO_LEFT_TO_RIGHT,
RIGHT_TO_LEFT_ORIENTATION, JCO_RIGHT_TO_LEFT,
TOP_TO_BOTTOM_ORIENTATION, JCO_UP_TO_BOTTOM,
BOTTOM_TO_TOP_ORIENTATION, JCO_BOTTOM_TO_UP,
}; };
enum jcomponent_border_t { enum jcomponent_border_t {
EMPTY_BORDER, JCB_EMPTY,
LINE_BORDER, JCB_LINE,
BEVEL_BORDER, JCB_BEVEL,
ROUND_BORDER, JCB_ROUND,
RAISED_GRADIENT_BORDER, JCB_RAISED_GRADIENT,
LOWERED_GRADIENT_BORDER, JCB_LOWERED_GRADIENT,
RAISED_BEVEL_BORDER, JCB_RAISED_BEVEL,
LOWERED_BEVEL_BORDER, JCB_LOWERED_BEVEL,
RAISED_ETCHED_BORDER, JCB_RAISED_ETCHED,
LOWERED_ETCHED_BORDER JCB_LOWERED_ETCHED
}; };
// component baseline resize behavior // component baseline resize behavior
enum jcomponent_behavior_t { enum jcomponent_behavior_t {
// Indicates the baseline remains fixed relative to the y-origin. T hat is, <code>getBaseline</code> returns // Indicates the baseline remains fixed relative to the y-origin. T hat is, <code>getBaseline</code> returns
// the same value regardless of the height or width. For example, a <code>JLabel</code> containing non-empty // the same value regardless of the height or width. For example, a <code>JLabel</code> containing non-empty
// text with a vertical alignment of <code>TOP</code> should have a baseline type of <code>CONSTANT_ASCENT</code>. // text with a vertical alignment of <code>TOP</code> should have a baseline type of <code>CONSTANT_ASCENT</code>.
CB_CONSTANT_ASCENT, JCB_CONSTANT_ASCENT,
// Indicates the baseline remains fixed relative to the height and d oes not change as the width is varied. That is, // Indicates the baseline remains fixed relative to the height and d oes not change as the width is varied. That is,
// for any height H the difference between H and <code>getBaseline(w , H)</code> is the same. For example, a <code> // for any height H the difference between H and <code>getBaseline(w , H)</code> is the same. For example, a <code>
// JLabel</code> containing non-empty text with a vertical alignment of <code>BOTTOM</code> should have a baseline // JLabel</code> containing non-empty text with a vertical alignment of <code>BOTTOM</code> should have a baseline
// type of <code>CONSTANT_DESCENT</code>. // type of <code>CONSTANT_DESCENT</code>.
CB_CONSTANT_DESCENT, JCB_CONSTANT_DESCENT,
// Indicates the baseline remains a fixed distance from the center o f the component. That is, for any height H the // Indicates the baseline remains a fixed distance from the center o f the component. That is, for any height H the
// difference between <code>getBaseline(w, H)</code> and <code>H / 2 </code> is the same (plus or minus one depending // difference between <code>getBaseline(w, H)</code> and <code>H / 2 </code> is the same (plus or minus one depending
// upon rounding error). <p> Because of possible rounding errors it is recommended you ask for the baseline with two // upon rounding error). <p> Because of possible rounding errors it is recommended you ask for the baseline with two
// consecutive heights and use the return value to determine if you need to pad calculations by 1. The following shows // consecutive heights and use the return value to determine if you need to pad calculations by 1. The following shows
// how to calculate the baseline for any height: // how to calculate the baseline for any height:
// <pre> // <pre>
// jregion_t preferredSize = component->GetPreferredSize(); // jregion_t preferredSize = component->GetPreferredSize();
// int baseline = GetBaseline(preferredSize.width, preferredSize. height); // int baseline = GetBaseline(preferredSize.width, preferredSize. height);
// int nextBaseline = GetBaseline(preferredSize.width, preferredS ize.height + 1); // int nextBaseline = GetBaseline(preferredSize.width, preferredS ize.height + 1);
// // Amount to add to height when calculating where ba seline lands for a particular height: // // Amount to add to height when calculating where ba seline lands for a particular height:
skipping to change at line 103 skipping to change at line 103
// int baselineOffset = baseline - height / 2; // int baselineOffset = baseline - height / 2;
// if (preferredSize.height % 2 == 0 && baseline != nex tBaseline) { // if (preferredSize.height % 2 == 0 && baseline != nex tBaseline) {
// padding = 1; // padding = 1;
// } else if (preferredSize.height % 2 == 1 && baseline == nextBaseline) { // } else if (preferredSize.height % 2 == 1 && baseline == nextBaseline) {
// baselineOffset--; // baselineOffset--;
// padding = 1; // padding = 1;
// } // }
// // The following calculates where the baseline lands for the height z: // // The following calculates where the baseline lands for the height z:
// int calculatedBaseline = (z + padding) / 2 + baselin eOffset; // int calculatedBaseline = (z + padding) / 2 + baselin eOffset;
// </pre> // </pre>
CB_CENTER_OFFSET, JCB_CENTER_OFFSET,
// Indicates the baseline resize behavior can not be expressed using any of the other constants. // Indicates the baseline resize behavior can not be expressed using any of the other constants.
// This may also indicate the baseline varies with the width of the component. This is also returned // This may also indicate the baseline varies with the width of the component. This is also returned
// by components that do not have a baseline. // by components that do not have a baseline.
CB_OTHER JCB_OTHER
}; };
class FocusListener; class FocusListener;
class FocusEvent; class FocusEvent;
class InteractionListener; class InteractionListener;
class InteractionEvent; class InteractionEvent;
class Container; class Container;
/** /**
* \brief * \brief
 End of changes. 7 change blocks. 
23 lines changed or deleted 23 lines changed or added


 jcomponentevent.h   jcomponentevent.h 
skipping to change at line 42 skipping to change at line 42
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jcomponent_event_t { enum jcomponent_event_t {
COMPONENT_HIDDEN_EVENT, JCE_HIDDEN,
COMPONENT_SHOWN_EVENT, JCE_SHOWN,
COMPONENT_MOVED_EVENT, JCE_MOVED,
COMPONENT_PAINTED_EVENT JCE_PAINTED
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ComponentEvent : public jcommon::EventObject{ class ComponentEvent : public jcommon::EventObject{
private: private:
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jconnection.h   jconnection.h 
skipping to change at line 49 skipping to change at line 49
typedef SOCKET jsocket_t; typedef SOCKET jsocket_t;
#else #else
typedef int jsocket_t; typedef int jsocket_t;
#endif #endif
/** /**
* \brief * \brief
* *
*/ */
enum jconnection_type_t { enum jconnection_type_t {
TCP_SOCKET, JCT_UNKNOWN,
UDP_SOCKET, JCT_TCP,
MCAST_SOCKET, JCT_UDP,
RTP_SOCKET, JCT_MCAST,
RAW_SOCKET, JCT_RTP,
UNKNOWN_SOCKET JCT_RAW
}; };
/** /**
* \brief Connection. * \brief Connection.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Connection : public virtual jcommon::Object{ class Connection : public virtual jcommon::Object{
friend class DatagramSocket; friend class DatagramSocket;
 End of changes. 1 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jconnectionpipe.h   jconnectionpipe.h 
skipping to change at line 46 skipping to change at line 46
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
namespace jsocket { namespace jsocket {
/** /**
* \brief * \brief
* *
*/ */
enum jconnection_pipe_t { enum jconnection_pipe_t {
RECEIVER_PIPE, JCP_RECEIVER,
SENDER_PIPE JCP_SENDER
}; };
/** /**
* \brief ConnectionPipe. * \brief ConnectionPipe.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ConnectionPipe : public jsocket::Connection, public jthread::Thread{ class ConnectionPipe : public jsocket::Connection, public jthread::Thread{
private: private:
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcontainer.h   jcontainer.h 
skipping to change at line 68 skipping to change at line 68
jinsets_t _insets; jinsets_t _insets;
jsize_t _scale; jsize_t _scale;
jpoint_t _scroll; jpoint_t _scroll;
bool _optimized_paint; bool _optimized_paint;
protected: protected:
/** /**
* \brief * \brief
* *
*/ */
virtual void RequestComponentFocus(jgui::Component *c, bool has_parent); virtual void RequestComponentFocus(jgui::Component *c);
/** /**
* \brief * \brief
* *
*/ */
virtual void ReleaseComponentFocus(jgui::Component *c); virtual void ReleaseComponentFocus(jgui::Component *c);
public: public:
/** /**
* \brief * \brief
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 jcontainerevent.h   jcontainerevent.h 
skipping to change at line 36 skipping to change at line 36
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jframe_event_t { enum jcontainerevent_type_t {
COMPONENT_ADDED_EVENT, JCT_COMPONENT_ADDED,
COMPONENT_REMOVED_EVENT JCT_COMPONENT_REMOVED
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ContainerEvent : public jcommon::EventObject{ class ContainerEvent : public jcommon::EventObject{
private: private:
Component *_component; Component *_component;
jframe_event_t _type; jcontainerevent_type_t _type;
public: public:
/** /**
* \brief * \brief
* *
*/ */
ContainerEvent(void *source, Component *component, jframe_ev ent_t type); ContainerEvent(void *source, Component *component, jcontaine revent_type_t type);
/** /**
* \brief * \brief
* *
*/ */
virtual ~ContainerEvent(); virtual ~ContainerEvent();
/** /**
* \brief * \brief
* *
*/ */
virtual Component * GetComponent(); virtual Component * GetComponent();
/** /**
* \brief * \brief
* *
*/ */
virtual jframe_event_t GetType(); virtual jcontainerevent_type_t GetType();
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jcoordinatelayout.h   jcoordinatelayout.h 
skipping to change at line 37 skipping to change at line 37
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jcoordinate_layout_t { enum jcoordinate_layout_t {
CL_HORIZONTAL = 1, JCL_HORIZONTAL = 1,
CL_VERTICAL = 2 JCL_VERTICAL = 2
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class CoordinateLayout : public Layout{ class CoordinateLayout : public Layout{
private: private:
jcoordinate_layout_t _type; jcoordinate_layout_t _type;
int _width, int _width,
_height; _height;
public: public:
/** /**
* \brief * \brief
* *
*/ */
CoordinateLayout(int width = -1, int height = -1, jcoordinat e_layout_t type = (jcoordinate_layout_t)(CL_HORIZONTAL | CL_VERTICAL)); CoordinateLayout(int width = -1, int height = -1, jcoordinat e_layout_t type = (jcoordinate_layout_t)(JCL_HORIZONTAL | JCL_VERTICAL));
/** /**
* \brief * \brief
* *
*/ */
virtual ~CoordinateLayout(); virtual ~CoordinateLayout();
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 jdynamiclink.h   jdynamiclink.h 
skipping to change at line 35 skipping to change at line 35
#include <string> #include <string>
#ifdef _WIN32 #ifdef _WIN32
#else #else
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
namespace jcommon { namespace jcommon {
enum jlink_flags_t { enum jlink_flags_t {
NOW_LINK, JLF_NOW,
LAZY_LINK, JLF_LAZY,
LOCAL_LINK, JLF_LOCAL,
GLOBAL_LINK JLF_GLOBAL
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class DynamicLink : public virtual jcommon::Object{ class DynamicLink : public virtual jcommon::Object{
private: private:
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jfile.h   jfile.h 
skipping to change at line 48 skipping to change at line 48
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
namespace jio { namespace jio {
/** /**
* \brief Tipo de arquivo. * \brief Tipo de arquivo.
* *
*/ */
enum jfile_type_t { enum jfile_type_t {
F_UNKNOWN, JFT_UNKNOWN,
F_REGULAR, JFT_REGULAR,
F_DIRECTORY, JFT_DIRECTORY,
F_CHAR_DEVICE, JFT_CHAR_DEVICE,
F_COMPRESS, JFT_COMPRESS,
F_ENCRYPTED, JFT_ENCRYPTED,
F_HIDDEN, JFT_HIDDEN,
F_OFFLINE, JFT_OFFLINE,
F_SYSTEM, JFT_SYSTEM,
F_BLOCK_DEVICE, JFT_BLOCK_DEVICE,
F_FIFO, JFT_FIFO,
F_SYMBOLIC_LINK, JFT_SYMBOLIC_LINK,
F_SOCKET, JFT_SOCKET,
}; };
/** /**
* \brief Flags de arquivo. * \brief Flags de arquivo.
* *
*/ */
enum jfile_flags_t { enum jfile_flags_t {
F_WRITE_ONLY = 0x0001, JFF_WRITE_ONLY = 0x0001,
F_READ_ONLY = 0x0002, JFF_READ_ONLY = 0x0002,
F_READ_WRITE = 0x0004, JFF_READ_WRITE = 0x0004,
F_EXCLUSIVE = 0x0008, JFF_EXCLUSIVE = 0x0008,
F_TRUNCATE = 0x0010, JFF_TRUNCATE = 0x0010,
F_APPEND = 0x0020, JFF_APPEND = 0x0020,
F_NON_BLOCK = 0x0040, JFF_NON_BLOCK = 0x0040,
F_SYNC = 0x0080, JFF_SYNC = 0x0080,
F_NON_FOLLOW = 0x0100, JFF_NON_FOLLOW = 0x0100,
F_DIR = 0x0200, JFF_DIR = 0x0200,
F_ASYNC = 0x0400, JFF_ASYNC = 0x0400,
F_LARGEFILE = 0x0800, JFF_LARGEFILE = 0x0800,
F_CREATE = 0x1000, JFF_CREATE = 0x1000,
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class File : public virtual jcommon::Object{ class File : public virtual jcommon::Object{
private: private:
skipping to change at line 123 skipping to change at line 123
* \brief Construtor. * \brief Construtor.
* *
*/ */
File(std::string prefix, std::string sufix, bool is_director y); File(std::string prefix, std::string sufix, bool is_director y);
public: public:
/** /**
* \brief Create a new file. * \brief Create a new file.
* *
*/ */
File(std::string filename_, int = F_READ_ONLY | F_LARGEFILE) ; File(std::string filename_, int = JFF_READ_ONLY | JFF_LARGEF ILE);
/** /**
* \brief Create a new directory. * \brief Create a new directory.
* *
*/ */
File(std::string filename_, int flags_, bool recursive_); File(std::string filename_, int flags_, bool recursive_);
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
 End of changes. 3 change blocks. 
27 lines changed or deleted 27 lines changed or added


 jfilechooserdialogbox.h   jfilechooserdialogbox.h 
skipping to change at line 44 skipping to change at line 44
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jfilechooser_type_t { enum jfilechooser_type_t {
OPEN_FILE_DIALOG, JFT_OPEN_FILE_DIALOG,
SAVE_FILE_DIALOG JFT_SAVE_FILE_DIALOG
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jfilechooser_filter_t { enum jfilechooser_filter_t {
FILE_ONLY, JFF_FILE_ONLY,
DIRECTORY_ONLY, JFF_DIRECTORY_ONLY,
FILE_AND_DIRECTORY JFF_FILE_AND_DIRECTORY
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class FileChooserDialogBox : public jgui::Frame, public jgui::SelectListene r{ class FileChooserDialogBox : public jgui::Frame, public jgui::SelectListene r{
private: private:
skipping to change at line 108 skipping to change at line 108
* *
*/ */
bool IsFile(std::string path); bool IsFile(std::string path);
public: public:
/** /**
* \brief * \brief
* *
*/ */
FileChooserDialogBox(std::string title, std::string director y, int x, int y, jfilechooser_type_t type = OPEN_FILE_DIALOG); FileChooserDialogBox(std::string title, std::string director y, int x, int y, jfilechooser_type_t type = JFT_OPEN_FILE_DIALOG);
/** /**
* \brief * \brief
* *
*/ */
virtual ~FileChooserDialogBox(); virtual ~FileChooserDialogBox();
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jflowlayout.h   jflowlayout.h 
skipping to change at line 37 skipping to change at line 37
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jflowlayout_align_t { enum jflowlayout_align_t {
FL_LEFT, JFL_LEFT,
FL_CENTER, JFL_CENTER,
FL_RIGHT, JFL_RIGHT,
FL_LEADING, JFL_LEADING,
FL_TRAILING JFL_TRAILING
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class FlowLayout : public Layout{ class FlowLayout : public Layout{
private: private:
skipping to change at line 63 skipping to change at line 63
_newalign; _newalign;
int _hgap, int _hgap,
_vgap; _vgap;
bool _align_on_baseline; bool _align_on_baseline;
public: public:
/** /**
* \brief * \brief
* *
*/ */
FlowLayout(jflowlayout_align_t align = FL_CENTER, int hgap = 10, int vgap = 10); FlowLayout(jflowlayout_align_t align = JFL_CENTER, int hgap = 10, int vgap = 10);
/** /**
* \brief * \brief
* *
*/ */
virtual ~FlowLayout(); virtual ~FlowLayout();
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jfocusevent.h   jfocusevent.h 
skipping to change at line 32 skipping to change at line 32
#include "jeventobject.h" #include "jeventobject.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jfocus_event_t { enum jfocus_event_t {
GAINED_FOCUS_EVENT, JFE_LOST,
LOST_FOCUS_EVENT JFE_GAINED
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class FocusEvent : public jcommon::EventObject{ class FocusEvent : public jcommon::EventObject{
private: private:
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jfont.h   jfont.h 
skipping to change at line 38 skipping to change at line 38
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <ctype.h> #include <ctype.h>
#include <string> #include <string>
#include <math.h> #include <math.h>
#include <list> #include <list>
namespace jgui { namespace jgui {
enum jfont_attributes_t {
JFA_NONE
};
/** /**
* \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:
skipping to change at line 61 skipping to change at line 65
IDirectFBFont *_font; IDirectFBFont *_font;
#endif #endif
struct jsize_t _screen; struct jsize_t _screen;
struct jsize_t _scale; struct jsize_t _scale;
int _height, int _height,
_ascender, _ascender,
_descender, _descender,
_max_advance, _max_advance,
_virtual_height; _virtual_height;
std::string _name; std::string _name;
jfont_attributes_t _attributes;
public: public:
/** /**
* \brief * \brief
* *
*/ */
Font(std::string name, int attr, int height, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT); Font(std::string name, jfont_attributes_t attributes, int he ight, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCA LE_HEIGHT);
/** /**
* \brief * \brief
* *
*/ */
virtual ~Font(); virtual ~Font();
/** /**
* \brief * \brief
* *
skipping to change at line 91 skipping to change at line 96
/** /**
* \brief * \brief
* *
*/ */
virtual void * GetFont(); virtual void * GetFont();
/** /**
* \brief * \brief
* *
*/ */
jfont_attributes_t GetFontAttributes();
/**
* \brief
*
*/
virtual void SetWorkingScreenSize(int width, int height); virtual void SetWorkingScreenSize(int width, int height);
/** /**
* \brief * \brief
* *
*/ */
virtual jsize_t GetWorkingScreenSize(); virtual jsize_t GetWorkingScreenSize();
/** /**
* \brief * \brief
 End of changes. 4 change blocks. 
1 lines changed or deleted 12 lines changed or added


 jframe.h   jframe.h 
skipping to change at line 48 skipping to change at line 48
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jframe_button_t { enum jframe_button_t {
FB_MINIMIZE = 1, JFB_MINIMIZE = 1,
FB_MAXIMIZE = 1, JFB_MAXIMIZE = 1,
FB_CLOSE = 2 JFB_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 127 skipping to change at line 127
_old_y, _old_y,
_old_width, _old_width,
_old_height; _old_height;
bool _input_enabled, bool _input_enabled,
_background_visible, _background_visible,
_move_enabled, _move_enabled,
_release_enabled, _release_enabled,
_resize_enabled, _resize_enabled,
_is_maximized; _is_maximized;
jframe_button_t _frame_buttons; jframe_button_t _frame_buttons;
jkey_symbol_t _last_key_code; jkeyevent_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 273 skipping to change at line 273
/** /**
* \brief * \brief
* *
*/ */
virtual void RemoveAllSubtitles(); virtual void RemoveAllSubtitles();
/** /**
* \brief * \brief
* *
*/ */
virtual jkey_symbol_t GetLastKeyCode(); virtual jkeyevent_symbol_t GetLastKeyCode();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetLastKeyCode(jkey_symbol_t key); virtual void SetLastKeyCode(jkeyevent_symbol_t key);
/** /**
* \brief * \brief
* *
*/ */
virtual void Paint(Graphics *g); virtual void Paint(Graphics *g);
/** /**
* \brief * \brief
* *
 End of changes. 4 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jgfxhandler.h   jgfxhandler.h 
skipping to change at line 44 skipping to change at line 44
#define JGUI_MAX_FONTS 30 #define JGUI_MAX_FONTS 30
namespace jgui{ namespace jgui{
/** /**
* \brief * \brief
* *
*/ */
enum jcursor_style_t { enum jcursor_style_t {
DEFAULT_CURSOR, JCS_DEFAULT,
CROSSHAIR_CURSOR, JCS_CROSSHAIR,
EAST_CURSOR, JCS_EAST,
WEST_CURSOR, JCS_WEST,
NORTH_CURSOR, JCS_NORTH,
SOUTH_CURSOR, JCS_SOUTH,
HAND_CURSOR, JCS_HAND,
MOVE_CURSOR, JCS_MOVE,
NS_CURSOR, JCS_NS,
WE_CURSOR, JCS_WE,
NW_CORNER_CURSOR, JCS_NW_CORNER,
NE_CORNER_CURSOR, JCS_NE_CORNER,
SW_CORNER_CURSOR, JCS_SW_CORNER,
SE_CORNER_CURSOR, JCS_SE_CORNER,
TEXT_CURSOR, JCS_TEXT,
WAIT_CURSOR JCS_WAIT
}; };
class Window; class Window;
class WindowManager; class WindowManager;
class Font; class Font;
class Image; class Image;
class InputManager; class InputManager;
/** /**
* \brief * \brief
 End of changes. 1 change blocks. 
16 lines changed or deleted 16 lines changed or added


 jgraphics.h   jgraphics.h 
skipping to change at line 56 skipping to change at line 56
#define SCREEN_TO_SCALE(x, z, y) \ #define SCREEN_TO_SCALE(x, z, y) \
(int)round(((double)x*(double)y)/(double)z) (int)round(((double)x*(double)y)/(double)z)
namespace jgui{ namespace jgui{
/** /**
* \brief * \brief
* *
*/ */
enum jporter_duff_flags_t { enum jporterduff_flags_t {
PDF_NONE = 0x0001, // fs: sa fd: 1.0-sa JPF_NONE = 0x0001, // fs: sa fd: 1.0-sa
(defaults) (defaults)
PDF_CLEAR = 0x0002, // fs: 0.0 fd: 0.0 JPF_CLEAR = 0x0002, // fs: 0.0 fd: 0.0
PDF_SRC = 0x0004, // fs: 1.0 fd: 0.0 JPF_SRC = 0x0004, // fs: 1.0 fd: 0.0
PDF_DST = 0x0008, // fs: 1.0 fd: 0.0 JPF_DST = 0x0008, // fs: 1.0 fd: 0.0
PDF_SRC_OVER = 0x0010, // fs: 1.0 fd: 1.0-sa JPF_SRC_OVER = 0x0010, // fs: 1.0 fd: 1.0-sa
PDF_DST_OVER = 0x0020, // fs: 1.0-da fd: 1.0 JPF_DST_OVER = 0x0020, // fs: 1.0-da fd: 1.0
PDF_SRC_IN = 0x0040, // fs: da fd: 0.0 JPF_SRC_IN = 0x0040, // fs: da fd: 0.0
PDF_DST_IN = 0x0080, // fs: 0.0 fd: sa JPF_DST_IN = 0x0080, // fs: 0.0 fd: sa
PDF_SRC_OUT = 0x0100, // fs: 1.0-da fd: 0.0 JPF_SRC_OUT = 0x0100, // fs: 1.0-da fd: 0.0
PDF_DST_OUT = 0x0200, // fs: 0.0 fd: 1.0-sa JPF_DST_OUT = 0x0200, // fs: 0.0 fd: 1.0-sa
PDF_SRC_ATOP = 0x0400, // fs: da fd: 1.0-sa JPF_SRC_ATOP = 0x0400, // fs: da fd: 1.0-sa
PDF_DST_ATOP = 0x0800, // fs: 1.0-da fd: sa JPF_DST_ATOP = 0x0800, // fs: 1.0-da fd: sa
PDF_ADD = 0x1000, // fs: 1.0 fd: 1.0 JPF_ADD = 0x1000, // fs: 1.0 fd: 1.0
PDF_XOR = 0x2000 // fs: 1.0-da fd: 1. JPF_XOR = 0x2000 // fs: 1.0-da fd: 1.
0-sa 0-sa
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jdrawing_flags_t { enum jdrawing_flags_t {
DF_NOFX = 0x01, JDF_NOFX = 0x01,
DF_BLEND = 0x02, JDF_BLEND = 0x02,
DF_XOR = 0x04 JDF_XOR = 0x04
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jblitting_flags_t { enum jblitting_flags_t {
BF_NOFX = 0x01, JBF_NOFX = 0x01,
BF_ALPHACHANNEL = 0x02, JBF_ALPHACHANNEL = 0x02,
BF_COLORALPHA = 0x04, JBF_COLORALPHA = 0x04,
BF_COLORIZE = 0x08, JBF_COLORIZE = 0x08,
BF_XOR = 0x80 JBF_XOR = 0x80
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jhorizontal_align_t { enum jhorizontal_align_t {
LEFT_HALIGN, JHA_LEFT,
CENTER_HALIGN, JHA_CENTER,
RIGHT_HALIGN, JHA_RIGHT,
JUSTIFY_HALIGN JHA_JUSTIFY
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jvertical_align_t { enum jvertical_align_t {
TOP_VALIGN, JVA_TOP,
CENTER_VALIGN, JVA_CENTER,
BOTTOM_VALIGN, JVA_BOTTOM,
JUSTIFY_VALIGN JVA_JUSTIFY
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jline_join_t { enum jline_join_t {
BEVEL_JOIN = 0x01, JLJ_BEVEL = 0x01,
ROUND_JOIN = 0x02, JLJ_ROUND = 0x02,
MITER_JOIN = 0x04, JLJ_MITER = 0x04,
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jline_style_t { enum jline_style_t {
SOLID_LINE = 0x01, JLS_SOLID = 0x01,
DASH_LINE = 0x02, JLS_DASH = 0x02,
DASH_DOT_LINE = 0x04, JLS_DASH_DOT = 0x04,
DOT_LINE = 0x08 JLS_DOT = 0x08
}; };
/** /**
* \brief * \brief
* *
*/ */
struct jpoint_t { struct jpoint_t {
int x; int x;
int y; int y;
}; };
skipping to change at line 205 skipping to change at line 205
struct jregion_t _clip; struct jregion_t _clip;
struct jpoint_t _translate, struct jpoint_t _translate,
_translate_image; _translate_image;
struct jsize_t _screen; struct jsize_t _screen;
struct jsize_t _scale; struct jsize_t _scale;
jline_join_t _line_join; jline_join_t _line_join;
jline_style_t _line_style; jline_style_t _line_style;
jdrawing_flags_t _draw_flags; jdrawing_flags_t _draw_flags;
jblitting_flags_t _blit_flags; jblitting_flags_t _blit_flags;
jporter_duff_flags_t _porter_duff_flags; jporterduff_flags_t _porterduff_flags;
Font *_font; Font *_font;
Color _color; Color _color;
double _radians; double _radians;
int _line_width; int _line_width;
bool _is_premultiply, bool _is_premultiply,
_antialias_enabled; _antialias_enabled;
private: private:
#ifdef DIRECTFB_UI #ifdef DIRECTFB_UI
IDirectFBSurface *surface; IDirectFBSurface *surface;
skipping to change at line 429 skipping to change at line 429
/** /**
* \brief * \brief
* *
*/ */
virtual void SetAntiAliasEnabled(bool b); virtual void SetAntiAliasEnabled(bool b);
/** /**
* \brief * \brief
* *
*/ */
virtual jporter_duff_flags_t GetPorterDuffFlags(); virtual jporterduff_flags_t GetPorterDuffFlags();
/** /**
* \brief * \brief
* *
*/ */
virtual jdrawing_flags_t GetDrawingFlags(); virtual jdrawing_flags_t GetDrawingFlags();
/** /**
* \brief * \brief
* *
*/ */
virtual jblitting_flags_t GetBlittingFlags(); virtual jblitting_flags_t GetBlittingFlags();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetPorterDuffFlags(jporter_duff_flags_t t); virtual void SetPorterDuffFlags(jporterduff_flags_t t);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetDrawingFlags(jdrawing_flags_t t); virtual void SetDrawingFlags(jdrawing_flags_t t);
/** /**
* \brief * \brief
* *
skipping to change at line 721 skipping to change at line 721
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(Image *img, int sxp, int syp, int swp , int shp, int xp, int yp, int wp, int hp); virtual bool DrawImage(Image *img, int sxp, int syp, int swp , int shp, int xp, int yp, int wp, int hp);
/** /**
* \brief * \brief
* *
*/ */
virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JUSTIFY_HAL IGN); virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JHA_JUSTIFY );
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawString(std::string text, int xp, int yp); virtual void DrawString(std::string text, int xp, int yp);
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawString(std::string text, int xp, int yp, in t wp, int hp, jhorizontal_align_t halign = JUSTIFY_HALIGN, jvertical_align_ t valign = CENTER_VALIGN, bool clipped = true); virtual void DrawString(std::string text, int xp, int yp, in t wp, int hp, jhorizontal_align_t halign = JHA_JUSTIFY, jvertical_align_t v align = JVA_CENTER, bool clipped = true);
/** /**
* \brief * \brief
* *
*/ */
virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000); virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000);
/** /**
* \brief * \brief
* *
 End of changes. 12 change blocks. 
45 lines changed or deleted 45 lines changed or added


 jgridbaglayout.h   jgridbaglayout.h 
skipping to change at line 37 skipping to change at line 37
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
enum jgridbaglayout_constraints_t { enum jgridbaglayout_constraints_t {
// Specifies that this component is the next-to-last component in it s // Specifies that this component is the next-to-last component in it s
// column or row (<code>gridwidth</code>, <code>gridheight</code>), // column or row (<code>gridwidth</code>, <code>gridheight</code>),
// or that this component be placed next to the previously added // or that this component be placed next to the previously added
// component (<code>gridx</code>, <code>gridy</code>). // component (<code>gridx</code>, <code>gridy</code>).
GBLC_RELATIVE = -1, JGC_RELATIVE = -1,
// Specifies that this component is the // Specifies that this component is the
// last component in its column or row. // last component in its column or row.
GBLC_REMAINDER = 0, JGC_REMAINDER = 0,
// Do not resize the component. // Do not resize the component.
GBLC_NONE = 0, JGC_NONE = 0,
// Resize the component both horizontally and vertically. // Resize the component both horizontally and vertically.
GBLC_BOTH = 1, JGC_BOTH = 1,
// Resize the component horizontally but not vertically. // Resize the component horizontally but not vertically.
GBLC_HORIZONTAL = 2, JGC_HORIZONTAL = 2,
// Resize the component vertically but not horizontally. // Resize the component vertically but not horizontally.
GBLC_VERTICAL = 3, JGC_VERTICAL = 3,
// Put the component in the center of its display area. // Put the component in the center of its display area.
GBLC_CENTER = 10, JGC_CENTER = 10,
// Put the component at the top of its display area, centered horizo ntally. // Put the component at the top of its display area, centered horizo ntally.
GBLC_NORTH = 11, JGC_NORTH = 11,
// Put the component at the top-right corner of its display area. // Put the component at the top-right corner of its display area.
GBLC_NORTHEAST = 12, JGC_NORTHEAST = 12,
// Put the component on the right side of its display area, centered vertically. // Put the component on the right side of its display area, centered vertically.
GBLC_EAST = 13, JGC_EAST = 13,
// Put the component at the bottom-right corner of its display area. // Put the component at the bottom-right corner of its display area.
GBLC_SOUTHEAST = 14, JGC_SOUTHEAST = 14,
// Put the component at the bottom of its display area, centered hor izontally. // Put the component at the bottom of its display area, centered hor izontally.
GBLC_SOUTH = 15, JGC_SOUTH = 15,
// Put the component at the bottom-left corner of its display area. // Put the component at the bottom-left corner of its display area.
GBLC_SOUTHWEST = 16, JGC_SOUTHWEST = 16,
// Put the component on the left side of its display area, centered vertically. // Put the component on the left side of its display area, centered vertically.
GBLC_WEST = 17, JGC_WEST = 17,
// Put the component at the top-left corner of its display area. // Put the component at the top-left corner of its display area.
GBLC_NORTHWEST = 18, JGC_NORTHWEST = 18,
// Place the component centered aint64_t the edge of its display are a // Place the component centered aint64_t the edge of its display are a
// associated with the start of a page for the current // associated with the start of a page for the current
// <code>ComponentOrienation</code>. Equal to NORTH for horizontal orientations. // <code>ComponentOrienation</code>. Equal to NORTH for horizontal orientations.
GBLC_PAGE_START = 19, JGC_PAGE_START = 19,
// Place the component centered aint64_t the edge of its display are a // Place the component centered aint64_t the edge of its display are a
// associated with the end of a page for the current // associated with the end of a page for the current
// <code>ComponentOrienation</code>. Equal to SOUTH for horizontal orientations. // <code>ComponentOrienation</code>. Equal to SOUTH for horizontal orientations.
GBLC_PAGE_END = 20, JGC_PAGE_END = 20,
// Place the component centered aint64_t the edge of its display are a where // Place the component centered aint64_t the edge of its display are a where
// lines of text would normally begin for the current // lines of text would normally begin for the current
// <code>ComponentOrienation</code>. Equal to WEST for horizontal, // <code>ComponentOrienation</code>. Equal to WEST for horizontal,
// left-to-right orientations and EAST for horizontal, right-to-left orientations. // left-to-right orientations and EAST for horizontal, right-to-left orientations.
GBLC_LINE_START = 21, JGC_LINE_START = 21,
// Place the component centered aint64_t the edge of its display are a where // Place the component centered aint64_t the edge of its display are a where
// lines of text would normally end for the current // lines of text would normally end for the current
// <code>ComponentOrienation</code>. Equal to EAST for horizontal, // <code>ComponentOrienation</code>. Equal to EAST for horizontal,
// left-to-right orientations and WEST for horizontal, right-to-left orientations. // left-to-right orientations and WEST for horizontal, right-to-left orientations.
GBLC_LINE_END = 22, JGC_LINE_END = 22,
// Place the component in the corner of its display area where // Place the component in the corner of its display area where
// the first line of text on a page would normally begin for the cur rent // the first line of text on a page would normally begin for the cur rent
// <code>ComponentOrienation</code>. Equal to NORTHWEST for horizon tal, // <code>ComponentOrienation</code>. Equal to NORTHWEST for horizon tal,
// left-to-right orientations and NORTHEAST for horizontal, right-to -left orientations. // left-to-right orientations and NORTHEAST for horizontal, right-to -left orientations.
GBLC_FIRST_LINE_START = 23, JGC_FIRST_LINE_START = 23,
// Place the component in the corner of its display area where // Place the component in the corner of its display area where
// the first line of text on a page would normally end for the curre nt // the first line of text on a page would normally end for the curre nt
// <code>ComponentOrienation</code>. Equal to NORTHEAST for horizon tal, // <code>ComponentOrienation</code>. Equal to NORTHEAST for horizon tal,
// left-to-right orientations and NORTHWEST for horizontal, right-to -left // left-to-right orientations and NORTHWEST for horizontal, right-to -left
// orientations. // orientations.
GBLC_FIRST_LINE_END = 24, JGC_FIRST_LINE_END = 24,
// Place the component in the corner of its display area where // Place the component in the corner of its display area where
// the last line of text on a page would normally start for the curr ent // the last line of text on a page would normally start for the curr ent
// <code>ComponentOrienation</code>. Equal to SOUTHWEST for horizon tal, // <code>ComponentOrienation</code>. Equal to SOUTHWEST for horizon tal,
// left-to-right orientations and SOUTHEAST for horizontal, right-to -left // left-to-right orientations and SOUTHEAST for horizontal, right-to -left
// orientations. // orientations.
GBLC_LAST_LINE_START = 25, JGC_LAST_LINE_START = 25,
// Place the component in the corner of its display area where // Place the component in the corner of its display area where
// the last line of text on a page would normally end for the curren t // the last line of text on a page would normally end for the curren t
// <code>ComponentOrienation</code>. Equal to SOUTHEAST for horizon tal, // <code>ComponentOrienation</code>. Equal to SOUTHEAST for horizon tal,
// left-to-right orientations and SOUTHWEST for horizontal, right-to -left // left-to-right orientations and SOUTHWEST for horizontal, right-to -left
// orientations. // orientations.
GBLC_LAST_LINE_END = 26, JGC_LAST_LINE_END = 26,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally centered and // that the component should be horizontally centered and
// vertically aligned aint64_t the baseline of the prevailing row. // vertically aligned aint64_t the baseline of the prevailing row.
// If the component does not have a baseline it will be vertically c entered. // If the component does not have a baseline it will be vertically c entered.
GBLC_BASELINE = 0x100, JGC_BASELINE = 0x100,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally placed aint64_t the // that the component should be horizontally placed aint64_t the
// leading edge. For components with a left-to-right orientation, // leading edge. For components with a left-to-right orientation,
// the leading edge is the left edge. Vertically the component is // the leading edge is the left edge. Vertically the component is
// aligned aint64_t the baseline of the prevailing row. If the // aligned aint64_t the baseline of the prevailing row. If the
// component does not have a baseline it will be vertically centered . // component does not have a baseline it will be vertically centered .
GBLC_BASELINE_LEADING = 0x200, JGC_BASELINE_LEADING = 0x200,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally placed aint64_t the // that the component should be horizontally placed aint64_t the
// trailing edge. For components with a left-to-right // trailing edge. For components with a left-to-right
// orientation, the trailing edge is the right edge. Vertically // orientation, the trailing edge is the right edge. Vertically
// the component is aligned aint64_t the baseline of the prevailing // the component is aligned aint64_t the baseline of the prevailing
// row. If the component does not have a baseline it will be // row. If the component does not have a baseline it will be
// vertically centered. // vertically centered.
GBLC_BASELINE_TRAILING = 0x300, JGC_BASELINE_TRAILING = 0x300,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally centered. Vertically // that the component should be horizontally centered. Vertically
// the component is positioned so that its bottom edge touches // the component is positioned so that its bottom edge touches
// the baseline of the starting row. If the starting row does not // the baseline of the starting row. If the starting row does not
// have a baseline it will be vertically centered. // have a baseline it will be vertically centered.
GBLC_ABOVE_BASELINE = 0x400, JGC_ABOVE_BASELINE = 0x400,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally placed aint64_t the // that the component should be horizontally placed aint64_t the
// leading edge. For components with a left-to-right orientation, // leading edge. For components with a left-to-right orientation,
// the leading edge is the left edge. Vertically the component is // the leading edge is the left edge. Vertically the component is
// positioned so that its bottom edge touches the baseline of the // positioned so that its bottom edge touches the baseline of the
// starting row. If the starting row does not have a baseline it // starting row. If the starting row does not have a baseline it
// will be vertically centered. // will be vertically centered.
GBLC_ABOVE_BASELINE_LEADING = 0x500, JGC_ABOVE_BASELINE_LEADING = 0x500,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally placed aint64_t the // that the component should be horizontally placed aint64_t the
// trailing edge. For components with a left-to-right // trailing edge. For components with a left-to-right
// orientation, the trailing edge is the right edge. Vertically // orientation, the trailing edge is the right edge. Vertically
// the component is positioned so that its bottom edge touches // the component is positioned so that its bottom edge touches
// the baseline of the starting row. If the starting row does not // the baseline of the starting row. If the starting row does not
// have a baseline it will be vertically centered. // have a baseline it will be vertically centered.
GBLC_ABOVE_BASELINE_TRAILING = 0x600, JGC_ABOVE_BASELINE_TRAILING = 0x600,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally centered. Vertically // that the component should be horizontally centered. Vertically
// the component is positioned so that its top edge touches the // the component is positioned so that its top edge touches the
// baseline of the starting row. If the starting row does not // baseline of the starting row. If the starting row does not
// have a baseline it will be vertically centered. // have a baseline it will be vertically centered.
GBLC_BELOW_BASELINE = 0x700, JGC_BELOW_BASELINE = 0x700,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally placed aint64_t the // that the component should be horizontally placed aint64_t the
// leading edge. For components with a left-to-right orientation, // leading edge. For components with a left-to-right orientation,
// the leading edge is the left edge. Vertically the component is // the leading edge is the left edge. Vertically the component is
// positioned so that its top edge touches the baseline of the // positioned so that its top edge touches the baseline of the
// starting row. If the starting row does not have a baseline it // starting row. If the starting row does not have a baseline it
// will be vertically centered. // will be vertically centered.
GBLC_BELOW_BASELINE_LEADING = 0x800, JGC_BELOW_BASELINE_LEADING = 0x800,
// Possible value for the <code>anchor</code> field. Specifies // Possible value for the <code>anchor</code> field. Specifies
// that the component should be horizontally placed aint64_t the // that the component should be horizontally placed aint64_t the
// trailing edge. For components with a left-to-right // trailing edge. For components with a left-to-right
// orientation, the trailing edge is the right edge. Vertically // orientation, the trailing edge is the right edge. Vertically
// the component is positioned so that its top edge touches the // the component is positioned so that its top edge touches the
// baseline of the starting row. If the starting row does not // baseline of the starting row. If the starting row does not
// have a baseline it will be vertically centered. // have a baseline it will be vertically centered.
GBLC_BELOW_BASELINE_TRAILING = 0x900 JGC_BELOW_BASELINE_TRAILING = 0x900
}; };
enum jgridbaglayout_style_t { enum jgridbaglayout_style_t {
GBLS_EMPIRICMULTIPLIER = 2, JGS_EMPIRICMULTIPLIER = 2,
// This field is no int64_ter used to reserve arrays and keeped for backw ard // This field is no int64_ter used to reserve arrays and keeped for backw ard
// compatibility. Previously, this was // compatibility. Previously, this was
// the maximum number of grid positions (both horizontal and // the maximum number of grid positions (both horizontal and
// vertical) that could be laid out by the grid bag layout. // vertical) that could be laid out by the grid bag layout.
// Current implementation doesn't impose any limits on the size of a grid . // Current implementation doesn't impose any limits on the size of a grid .
GBLS_MAXGRIDSIZE = 512, JGS_MAXGRIDSIZE = 512,
// The smallest grid that can be laid out by the grid bag layout. // The smallest grid that can be laid out by the grid bag layout.
GBLS_MINSIZE = 1, JGS_MINSIZE = 1,
// The preferred grid size that can be laid out by the grid bag layout. // The preferred grid size that can be laid out by the grid bag layout.
GBLS_PREFERREDSIZE = 2 JGS_PREFERREDSIZE = 2
}; };
class Container; class Container;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class GridBagConstraints{ class GridBagConstraints{
skipping to change at line 225 skipping to change at line 225
centerPadding, centerPadding,
centerOffset, centerOffset,
gridx, gridx,
gridy, gridy,
gridwidth, gridwidth,
gridheight; gridheight;
jcomponent_behavior_t baselineResizeBehavior; jcomponent_behavior_t baselineResizeBehavior;
GridBagConstraints() GridBagConstraints()
{ {
this->gridx = GBLC_RELATIVE; this->gridx = JGC_RELATIVE;
this->gridy = GBLC_RELATIVE; this->gridy = JGC_RELATIVE;
this->gridwidth = 1; this->gridwidth = 1;
this->gridheight = 1; this->gridheight = 1;
this->weightx = 0; this->weightx = 0;
this->weighty = 0; this->weighty = 0;
this->anchor = GBLC_CENTER; this->anchor = JGC_CENTER;
this->fill = GBLC_NONE; this->fill = JGC_NONE;
this->ipadx = 0; this->ipadx = 0;
this->ipady = 0; this->ipady = 0;
this->insets.left = 0; this->insets.left = 0;
this->insets.right = 0; this->insets.right = 0;
this->insets.top = 0; this->insets.top = 0;
this->insets.bottom = 0; this->insets.bottom = 0;
this->tempX = 0; this->tempX = 0;
this->tempY = 0; this->tempY = 0;
this->tempWidth = 0; this->tempWidth = 0;
this->tempHeight = 0; this->tempHeight = 0;
this->minWidth = 0; this->minWidth = 0;
this->minHeight = 0; this->minHeight = 0;
this->ascent = 0; this->ascent = 0;
this->descent = 0; this->descent = 0;
this->centerPadding = 0; this->centerPadding = 0;
this->centerOffset = 0; this->centerOffset = 0;
this->baselineResizeBehavior = CB_OTHER; this->baselineResizeBehavior = JCB_OTHER;
} }
GridBagConstraints(int gridx, int gridy, int gridwidth, int gridheight, double weightx, double weighty, int anchor, int fill, jinsets_t insets, int ipadx, int ipady) GridBagConstraints(int gridx, int gridy, int gridwidth, int gridheight, double weightx, double weighty, int anchor, int fill, jinsets_t insets, int ipadx, int ipady)
{ {
this->gridx = gridx; this->gridx = gridx;
this->gridy = gridy; this->gridy = gridy;
this->gridwidth = gridwidth; this->gridwidth = gridwidth;
this->gridheight = gridheight; this->gridheight = gridheight;
this->fill = fill; this->fill = fill;
this->ipadx = ipadx; this->ipadx = ipadx;
skipping to change at line 280 skipping to change at line 280
this->tempX = 0; this->tempX = 0;
this->tempY = 0; this->tempY = 0;
this->tempWidth = 0; this->tempWidth = 0;
this->tempHeight = 0; this->tempHeight = 0;
this->minWidth = 0; this->minWidth = 0;
this->minHeight = 0; this->minHeight = 0;
this->ascent = 0; this->ascent = 0;
this->descent = 0; this->descent = 0;
this->centerPadding = 0; this->centerPadding = 0;
this->centerOffset = 0; this->centerOffset = 0;
this->baselineResizeBehavior = CB_OTHER; this->baselineResizeBehavior = JCB_OTHER;
} }
virtual ~GridBagConstraints() virtual ~GridBagConstraints()
{ {
} }
virtual bool IsVerticallyResizable() virtual bool IsVerticallyResizable()
{ {
return (fill == GBLC_BOTH || fill == GBLC_VERTICAL); return (fill == JGC_BOTH || fill == JGC_VERTICAL);
} }
}; };
class GridBagLayoutInfo{ class GridBagLayoutInfo{
public: public:
int width, int width,
height; // number of cells: horizontal and vertical height; // number of cells: horizontal and vertical
int startx, int startx,
starty; // starting point for layout starty; // starting point for layout
 End of changes. 41 change blocks. 
43 lines changed or deleted 43 lines changed or added


 jhtmlparser.h   jhtmlparser.h 
skipping to change at line 33 skipping to change at line 33
#include "jinputstream.h" #include "jinputstream.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <list> #include <list>
#include <map> #include <map>
namespace jcommon { namespace jcommon {
enum jtag_type_t { enum jtag_type_t {
BODY_TAG, JTT_BODY,
TEXT_TAG JTT_TEXT
}; };
class Tag{ class Tag{
private: private:
std::list<Tag *> _childs; std::list<Tag *> _childs;
std::map<std::string, std::string> _attributes; std::map<std::string, std::string> _attributes;
Tag *_parent; Tag *_parent;
std::string _name; std::string _name;
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jhttp.h   jhttp.h 
skipping to change at line 42 skipping to change at line 42
namespace jcommon { namespace jcommon {
/** /**
* \brief Enumeracao para saber o metodo de uma requisicao HTTP. * \brief Enumeracao para saber o metodo de uma requisicao HTTP.
* *
* \author Tiago Salmito (Braw) * \author Tiago Salmito (Braw)
* *
*/ */
enum jhttp_method_t { enum jhttp_method_t {
GET, JHM_GET,
POST, JHM_POST,
HEAD, JHM_HEAD,
OPTIONS, JHM_OPTIONS,
ERRO JHM_ERROR
}; };
/** \brief Enumera /** \brief Enumera
* pelo analizador l * pelo analizador l
* *
*/ */
enum jhttp_token_t { enum jhttp_token_t {
ERROR = -1, JHT_ERROR = -1,
CRLF = 256, JHT_CRLF = 256,
LWS, JHT_LWS,
TOKEN, JHT_TOKEN,
STRING, JHT_STRING,
QUERYVAL, JHT_QUERYVAL,
HEADERVAL, JHT_HEADERVAL,
EOB, JHT_EOB,
SP = ' ', JHT_SP = ' ',
WT = '\t', JHT_WT = '\t',
CR = '\r', JHT_CR = '\r',
LF = '\n' JHT_LF = '\n'
}; };
/** /**
* \brief Estrutura interna para abstra * \brief Estrutura interna para abstra
* query strings de uma requisi * query strings de uma requisi
* *
*/ */
class Header { class Header {
public: public:
skipping to change at line 141 skipping to change at line 141
/** \brief Vetor de cabe /** \brief Vetor de cabe
* cliente. */ * cliente. */
std::vector<Header *> cabecalho; std::vector<Header *> cabecalho;
/** \brief Caso o metodo usado seja o POST, aqui sera coloca do os dados passados no corpo da requisi /** \brief Caso o metodo usado seja o POST, aqui sera coloca do os dados passados no corpo da requisi
char * body; char * body;
Request() Request()
{ {
codigo = 0; //se td OK retorna 200 codigo = 0; //se td OK retorna 200
versao = '1'; versao = '1';
metodo = ERRO; metodo = JHM_ERROR;
arquivo[0] = 0; arquivo[0] = 0;
body = NULL; body = NULL;
} }
virtual ~Request() virtual ~Request()
{ {
} }
}; };
/** /**
 End of changes. 3 change blocks. 
18 lines changed or deleted 18 lines changed or added


 jimage.h   jimage.h 
skipping to change at line 33 skipping to change at line 33
#include "jgraphics.h" #include "jgraphics.h"
#include "jfile.h" #include "jfile.h"
#include "jinputstream.h" #include "jinputstream.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
namespace jgui{ namespace jgui{
enum jsurface_pixelformat_t { enum jsurface_pixelformat_t {
SPF_UNKNOWN, // 0x00000000 unknown or unspecified format JSP_UNKNOWN, // 0x00000000 unknown or unspecified format
SPF_ARGB1555, // DFB_SURFACE_PIXELFORMAT(0, 15, 1, 1, 0, 2, 0, 0, JSP_ARGB1555, // SURFACE_PIXELFORMAT(0, 15, 1, 1, 0, 2, 0, 0, 0, 0
0, 0, 0) 16 bit ARGB (2 byte, alpha 1@15, red 5@10, green 5@5, blue 5@0) , 0) 16 bit ARGB (2 byte, alpha 1@15, red 5@10, green 5@5, blue 5@0)
SPF_RGB16, // DFB_SURFACE_PIXELFORMAT(1, 16, 0, 0, 0, 2 JSP_RGB16, // SURFACE_PIXELFORMAT(1, 16, 0, 0, 0, 2, 0,
, 0, 0, 0, 0, 0) 16 bit RGB (2 byte, red 5@11, green 6@5, blue 5@0) 0, 0, 0, 0) 16 bit RGB (2 byte, red 5@11, green 6@5, blue 5@0)
SPF_RGB24, // DFB_SURFACE_PIXELFORMAT(2, 24, 0, 0, 0, 3 JSP_RGB24, // SURFACE_PIXELFORMAT(2, 24, 0, 0, 0, 3, 0,
, 0, 0, 0, 0, 0) 24 bit RGB (3 byte, red 8@16, green 8@8, blue 8@0) 0, 0, 0, 0) 24 bit RGB (3 byte, red 8@16, green 8@8, blue 8@0)
SPF_RGB32, // DFB_SURFACE_PIXELFORMAT(3, 24, 0, 0, 0, 4 JSP_RGB32, // SURFACE_PIXELFORMAT(3, 24, 0, 0, 0, 4, 0,
, 0, 0, 0, 0, 0) 24 bit RGB (4 byte, nothing@24, red 8@16, green 8@8, bl 0, 0, 0, 0) 24 bit RGB (4 byte, nothing@24, red 8@16, green 8@8, bl
ue 8@0) ue 8@0)
SPF_ARGB, // DFB_SURFACE_PIXELFORMAT(4, 24, 8, JSP_ARGB, // SURFACE_PIXELFORMAT(4, 24, 8, 1,
1, 0, 4, 0, 0, 0, 0, 0) 32 bit ARGB (4 byte, alpha 8@24, red 8@16, gree 0, 4, 0, 0, 0, 0, 0) 32 bit ARGB (4 byte, alpha 8@24, red 8@16, gree
n 8@8, blue 8@0) n 8@8, blue 8@0)
SPF_A8, // DFB_SURFACE_PIXELFORMAT(5, 0, 8, JSP_A8, // SURFACE_PIXELFORMAT(5, 0, 8, 1, 0
1, 0, 1, 0, 0, 0, 0, 0) 8 bit alpha (1 byte, alpha 8@0), e.g. anti-alia , 1, 0, 0, 0, 0, 0) 8 bit alpha (1 byte, alpha 8@0), e.g. anti-alia
sed glyphs sed glyphs
SPF_YUY2, // DFB_SURFACE_PIXELFORMAT(6, 16, 0, JSP_YUY2, // SURFACE_PIXELFORMAT(6, 16, 0, 0,
0, 0, 2, 0, 0, 0, 0, 0) 16 bit YUV (4 byte/ 2 pixel, macropixel contain 0, 2, 0, 0, 0, 0, 0) 16 bit YUV (4 byte/ 2 pixel, macropixel contain
s CbYCrY [31:0]) s CbYCrY [31:0])
SPF_RGB332, // DFB_SURFACE_PIXELFORMAT(7, 8, 0, 0, 0, 1, JSP_RGB332, // SURFACE_PIXELFORMAT(7, 8, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0) 8 bit RGB (1 byte, red 3@5, green 3@2, blue 2@0) 0, 0, 0, 0) 8 bit RGB (1 byte, red 3@5, green 3@2, blue 2@0)
SPF_UYVY, // DFB_SURFACE_PIXELFORMAT(8, 16, 0, JSP_UYVY, // SURFACE_PIXELFORMAT(8, 16, 0, 0,
0, 0, 2, 0, 0, 0, 0, 0) 16 bit YUV (4 byte/ 2 pixel, macropixel contain 0, 2, 0, 0, 0, 0, 0) 16 bit YUV (4 byte/ 2 pixel, macropixel contain
s YCbYCr [31:0]) s YCbYCr [31:0])
SPF_I420, // DFB_SURFACE_PIXELFORMAT(9, 12, 0, JSP_I420, // SURFACE_PIXELFORMAT(9, 12, 0, 0,
0, 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by 8 bit qua 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by 8 bit qua
rter size U/V planes) rter size U/V planes)
SPF_YV12, // DFB_SURFACE_PIXELFORMAT(10, 12, 0 JSP_YV12, // SURFACE_PIXELFORMAT(10, 12, 0, 0,
, 0, 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by 8 bit qua 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by 8 bit qua
rter size V/U planes) rter size V/U planes)
SPF_LUT8, // DFB_SURFACE_PIXELFORMAT(11, 8, 0, JSP_LUT8, // SURFACE_PIXELFORMAT(11, 8, 0, 1,
1, 0, 1, 0, 0, 0, 1, 0) 8 bit LUT (8 bit color and alpha lookup from pa 0, 1, 0, 0, 0, 1, 0) 8 bit LUT (8 bit color and alpha lookup from pa
lette) lette)
SPF_ALUT44, // DFB_SURFACE_PIXELFORMAT(12, 4, 4, 1, 0, 1 JSP_ALUT44, // SURFACE_PIXELFORMAT(12, 4, 4, 1, 0, 1, 0,
, 0, 0, 0, 1, 0) 8 bit ALUT (1 byte, alpha 4@4, color lookup 4@0) 0, 0, 1, 0) 8 bit ALUT (1 byte, alpha 4@4, color lookup 4@0)
SPF_AiRGB, // DFB_SURFACE_PIXELFORMAT(13, 24, 8, 1, 0, JSP_AiRGB, // SURFACE_PIXELFORMAT(13, 24, 8, 1, 0, 4, 0
4, 0, 0, 0, 0, 1) 32 bit ARGB (4 byte, inv. alpha 8@24, red 8@16, green 8 , 0, 0, 0, 1) 32 bit ARGB (4 byte, inv. alpha 8@24, red 8@16, green 8
@8, blue 8@0) @8, blue 8@0)
SPF_A1, // DFB_SURFACE_PIXELFORMAT(14, 0, 1, JSP_A1, // SURFACE_PIXELFORMAT(14, 0, 1, 1,
1, 1, 0, 7, 0, 0, 0, 0) 1 bit alpha (1 byte/ 8 pixel, most significant 1, 0, 7, 0, 0, 0, 0) 1 bit alpha (1 byte/ 8 pixel, most significant
bit used first) bit used first)
SPF_NV12, // DFB_SURFACE_PIXELFORMAT(15, 12, 0 JSP_NV12, // SURFACE_PIXELFORMAT(15, 12, 0, 0,
, 0, 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by one 16 bi 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by one 16 bi
t quarter size Cb|Cr [7:0|7:0] plane) t quarter size Cb|Cr [7:0|7:0] plane)
SPF_NV16, // DFB_SURFACE_PIXELFORMAT(16, 24, 0 JSP_NV16, // SURFACE_PIXELFORMAT(16, 24, 0, 0,
, 0, 0, 1, 0, 0, 1, 0, 0) 16 bit YUV (8 bit Y plane followed by one 16 bi 0, 1, 0, 0, 1, 0, 0) 16 bit YUV (8 bit Y plane followed by one 16 bi
t half width Cb|Cr [7:0|7:0] plane) t half width Cb|Cr [7:0|7:0] plane)
SPF_ARGB2554, // DFB_SURFACE_PIXELFORMAT(17, 14, 2, 1, 0, 2, 0, 0, JSP_ARGB2554, // SURFACE_PIXELFORMAT(17, 14, 2, 1, 0, 2, 0, 0, 0,
0, 0, 0) 16 bit ARGB (2 byte, alpha 2@14, red 5@9, green 5@4, blue 4@0) 0, 0) 16 bit ARGB (2 byte, alpha 2@14, red 5@9, green 5@4, blue 4@0)
SPF_ARGB4444, // DFB_SURFACE_PIXELFORMAT(18, 12, 4, 1, 0, 2, 0, 0, JSP_ARGB4444, // SURFACE_PIXELFORMAT(18, 12, 4, 1, 0, 2, 0, 0, 0,
0, 0, 0) 16 bit ARGB (2 byte, alpha 4@12, red 4@8, green 4@4, blue 4@0) 0, 0) 16 bit ARGB (2 byte, alpha 4@12, red 4@8, green 4@4, blue 4@0)
SPF_RGBA4444, // DFB_SURFACE_PIXELFORMAT(19, 12, 4, 1, 0, 2, 0, 0, JSP_RGBA4444, // SURFACE_PIXELFORMAT(19, 12, 4, 1, 0, 2, 0, 0, 0,
0, 0, 0) 16 bit RGBA (2 byte, red 4@12, green 4@8, blue 4@4, alpha 4@0) 0, 0) 16 bit RGBA (2 byte, red 4@12, green 4@8, blue 4@4, alpha 4@0)
SPF_NV21, // DFB_SURFACE_PIXELFORMAT(20, 12, 0 JSP_NV21, // SURFACE_PIXELFORMAT(20, 12, 0, 0,
, 0, 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by one 16 bi 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by one 16 bi
t quarter size Cr|Cb [7:0|7:0] plane) t quarter size Cr|Cb [7:0|7:0] plane)
SPF_AYUV, // DFB_SURFACE_PIXELFORMAT(21, 24, 8 JSP_AYUV, // SURFACE_PIXELFORMAT(21, 24, 8, 1,
, 1, 0, 4, 0, 0, 0, 0, 0) 32 bit AYUV (4 byte, alpha 8@24, Y 8@16, Cb 8@8 0, 4, 0, 0, 0, 0, 0) 32 bit AYUV (4 byte, alpha 8@24, Y 8@16, Cb 8@8
, Cr 8@0) , Cr 8@0)
SPF_A4, // DFB_SURFACE_PIXELFORMAT(22, 0, 4, JSP_A4, // SURFACE_PIXELFORMAT(22, 0, 4, 1,
1, 4, 0, 1, 0, 0, 0, 0) 4 bit alpha (1 byte/ 2 pixel, more significant 4, 0, 1, 0, 0, 0, 0) 4 bit alpha (1 byte/ 2 pixel, more significant
nibble used first) nibble used first)
SPF_ARGB1666, // DFB_SURFACE_PIXELFORMAT(23, 18, 1, 1, 0, 3, 0, 0, JSP_ARGB1666, // SURFACE_PIXELFORMAT(23, 18, 1, 1, 0, 3, 0, 0, 0,
0, 0, 0) 1 bit alpha (3 byte/ alpha 1@18, red 6@12, green 6@6, blue 6@0) 0, 0) 1 bit alpha (3 byte/ alpha 1@18, red 6@12, green 6@6, blue 6@0)
SPF_ARGB6666, // DFB_SURFACE_PIXELFORMAT(24, 18, 6, 1, 0, 3, 0, 0, JSP_ARGB6666, // SURFACE_PIXELFORMAT(24, 18, 6, 1, 0, 3, 0, 0, 0,
0, 0, 0) 6 bit alpha (3 byte/ alpha 6@18, red 6@12, green 6@6, blue 6@0) 0, 0) 6 bit alpha (3 byte/ alpha 6@18, red 6@12, green 6@6, blue 6@0)
SPF_RGB18, // DFB_SURFACE_PIXELFORMAT(25, 18, 0, 0, 0, JSP_RGB18, // SURFACE_PIXELFORMAT(25, 18, 0, 0, 0, 3, 0
3, 0, 0, 0, 0, 0) 6 bit RGB (3 byte/ red 6@12, green 6@6, blue 6@0) , 0, 0, 0, 0) 6 bit RGB (3 byte/ red 6@12, green 6@6, blue 6@0)
SPF_LUT2, // DFB_SURFACE_PIXELFORMAT(26, 2, 0, JSP_LUT2, // SURFACE_PIXELFORMAT(26, 2, 0, 1,
1, 2, 0, 3, 0, 0, 1, 0) 2 bit LUT (1 byte/ 4 pixel, 2 bit color and alp 2, 0, 3, 0, 0, 1, 0) 2 bit LUT (1 byte/ 4 pixel, 2 bit color and alp
ha lookup from palette) ha lookup from palette)
SPF_RGB444, // DFB_SURFACE_PIXELFORMAT(27, 12, 0, 0, 0, JSP_RGB444, // SURFACE_PIXELFORMAT(27, 12, 0, 0, 0, 2, 0
2, 0, 0, 0, 0, 0) 16 bit RGB (2 byte, nothing @12, red 4@8, green 4@4, bl , 0, 0, 0, 0) 16 bit RGB (2 byte, nothing @12, red 4@8, green 4@4, bl
ue 4@0) ue 4@0)
SPF_RGB555, // DFB_SURFACE_PIXELFORMAT(28, 15, 0, 0, 0, JSP_RGB555, // SURFACE_PIXELFORMAT(28, 15, 0, 0, 0, 2, 0
2, 0, 0, 0, 0, 0) 16 bit RGB (2 byte, nothing @15, red 5@10, green 5@5, b , 0, 0, 0, 0) 16 bit RGB (2 byte, nothing @15, red 5@10, green 5@5, b
lue 5@0) lue 5@0)
SPF_BGR555, // DFB_SURFACE_PIXELFORMAT(29, 15, 0, 0, 0, JSP_BGR555, // SURFACE_PIXELFORMAT(29, 15, 0, 0, 0, 2, 0
2, 0, 0, 0, 0, 0) 16 bit BGR (2 byte, nothing @15, blue 5@10, green 5@5, , 0, 0, 0, 0) 16 bit BGR (2 byte, nothing @15, blue 5@10, green 5@5,
red 5@0) red 5@0)
SPF_RGBA5551, // DFB_SURFACE_PIXELFORMAT(30, 15, 1, 1, 0, 2, 0, 0, JSP_RGBA5551, // SURFACE_PIXELFORMAT(30, 15, 1, 1, 0, 2, 0, 0, 0,
0, 0, 0) 16 bit RGBA (2 byte, red 5@11, green 5@6, blue 5@1, alpha 1@0) 0, 0) 16 bit RGBA (2 byte, red 5@11, green 5@6, blue 5@1, alpha 1@0)
SPF_AVYU, // DFB_SURFACE_PIXELFORMAT(31, 24, 8 JSP_AVYU, // SURFACE_PIXELFORMAT(31, 24, 8, 1,
, 1, 0, 4, 0, 0, 0, 0, 0) 32 bit AVYU 4:4:4 (4 byte, alpha 8@24, Cr 8@16, 0, 4, 0, 0, 0, 0, 0) 32 bit AVYU 4:4:4 (4 byte, alpha 8@24, Cr 8@16,
Y 8@8, Cb 8@0) Y 8@8, Cb 8@0)
SPF_VYU, // DFB_SURFACE_PIXELFORMAT(32, 24, 0 JSP_VYU, // SURFACE_PIXELFORMAT(32, 24, 0, 0,
, 0, 0, 3, 0, 0, 0, 0, 0) 0, 3, 0, 0, 0, 0, 0)
}; };
class Graphics; class Graphics;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Image : public virtual jcommon::Object{ class Image : public virtual jcommon::Object{
skipping to change at line 93 skipping to change at line 93
struct jsize_t _size; struct jsize_t _size;
struct jsize_t _screen; struct jsize_t _screen;
struct jsize_t _scale; struct jsize_t _scale;
jsurface_pixelformat_t _pixelformat; jsurface_pixelformat_t _pixelformat;
private: private:
/** /**
* \brief * \brief
* *
*/ */
Image(int width, int height, jsurface_pixelformat_t pixelfor mat = SPF_ARGB, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = D EFAULT_SCALE_HEIGHT); Image(int width, int height, jsurface_pixelformat_t pixelfor mat = JSP_ARGB, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = D EFAULT_SCALE_HEIGHT);
protected: protected:
/** /**
* \brief * \brief
* *
*/ */
Image(int width, int height, int scale_width = DEFAULT_SCALE _WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT); Image(int width, int height, int scale_width = DEFAULT_SCALE _WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT);
public: public:
/** /**
skipping to change at line 119 skipping to change at line 119
/** /**
* \brief * \brief
* *
*/ */
static bool GetImageSize(std::string img, int *width, int *h eight); static bool GetImageSize(std::string img, int *width, int *h eight);
/** /**
* \brief * \brief
* *
*/ */
static Image * CreateImage(int width, int height, jsurface_p ixelformat_t pixelformat = SPF_ARGB, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT); static Image * CreateImage(int width, int height, jsurface_p ixelformat_t pixelformat = JSP_ARGB, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT);
/** /**
* \brief * \brief
* *
*/ */
static Image * CreateImage(uint32_t *data, int width, int he ight); static Image * CreateImage(uint32_t *data, int width, int he ight);
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
89 lines changed or deleted 89 lines changed or added


 jinputmanager.h   jinputmanager.h 
skipping to change at line 38 skipping to change at line 38
#include "jautolock.h" #include "jautolock.h"
#include "jcondition.h" #include "jcondition.h"
#include <vector> #include <vector>
#include <map> #include <map>
#include <list> #include <list>
namespace jgui { namespace jgui {
enum jbroadcaster_event_t { enum jbroadcaster_event_t {
JBROADCAST_UNKNOWN = 0x00, JBE_UNKNOWN = 0x00,
JBROADCAST_KEYEVENT = 0x01, JBE_KEYEVENT = 0x01,
JBROADCAST_MOUSEEVENT = 0x02 JBE_MOUSEEVENT = 0x02
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class EventBroadcaster : public jthread::Thread { class EventBroadcaster : public jthread::Thread {
private: private:
skipping to change at line 145 skipping to change at line 145
/** /**
* \brief * \brief
* *
*/ */
int TranslateToDFBKeyID(DFBInputDeviceKeyIdentifier id); int TranslateToDFBKeyID(DFBInputDeviceKeyIdentifier id);
/** /**
* \brief * \brief
* *
*/ */
jkey_symbol_t TranslateToDFBKeySymbol(DFBInputDeviceKeySymbo l symbol); jkeyevent_symbol_t TranslateToDFBKeySymbol(DFBInputDeviceKey Symbol symbol);
/** /**
* \brief * \brief
* *
*/ */
void ProcessInputEvent(DFBInputEvent event); void ProcessInputEvent(DFBInputEvent event);
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jioexception.h   jioexception.h 
skipping to change at line 31 skipping to change at line 31
#define J_IOEXCEPTION_H #define J_IOEXCEPTION_H
#include "jruntimeexception.h" #include "jruntimeexception.h"
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
namespace jio { namespace jio {
/** /**
* \brief SocketException. * \brief IOException.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class IOException : public jcommon::RuntimeException{ class IOException : public jcommon::RuntimeException{
private: private:
public: public:
/** /**
* \brief Construtor. * \brief Construtor.
* *
*/ */
IOException(std::string); IOException(std::string);
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
*/ */
virtual ~IOException() throw(); virtual ~IOException() throw();
}; };
} }
#endif #endif
 End of changes. 3 change blocks. 
11 lines changed or deleted 11 lines changed or added


 jitemcomponent.h   jitemcomponent.h 
skipping to change at line 40 skipping to change at line 40
#define DEFAULT_ITEM_SIZE 48 #define DEFAULT_ITEM_SIZE 48
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jmenuitem_type_t { enum jmenuitem_type_t {
TEXT_MENU_ITEM, JMT_EMPTY,
IMAGE_MENU_ITEM, JMT_TEXT,
CHECK_MENU_ITEM, JMT_IMAGE,
EMPTY_MENU_ITEM JMT_CHECK
}; };
class SelectEvent; class SelectEvent;
class SelectListener; class SelectListener;
class Item : public virtual jcommon::Object{ class Item : public virtual jcommon::Object{
private: private:
std::vector<Item *> _childs; std::vector<Item *> _childs;
Image *_prefetch; Image *_prefetch;
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jkeyboard.h   jkeyboard.h 
skipping to change at line 46 skipping to change at line 46
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jkeyboard_type_t { enum jkeyboard_type_t {
FULL_ALPHA_NUMERIC_KEYBOARD, JKB_QWERTY,
SMALL_ALPHA_NUMERIC_KEYBOARD, JKB_ALPHA_NUMERIC,
FULL_NUMERIC_KEYBOARD, JKB_NUMERIC,
SMALL_NUMERIC_KEYBOARD, JKB_PHONE,
FULL_WEB_KEYBOARD JKB_INTERNET
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Keyboard : public jgui::Frame, public jgui::ButtonListener, public jg ui::TextListener { class Keyboard : public jgui::Frame, public jgui::ButtonListener, public jg ui::TextListener {
private: private:
skipping to change at line 88 skipping to change at line 88
_show_text, _show_text,
_response, _response,
_input_locked, _input_locked,
_is_password; _is_password;
private: private:
/** /**
* \brief * \brief
* *
*/ */
void BuildWebKeyboard(); void BuildQWERTYKeyboard();
/** /**
* \brief * \brief
* *
*/ */
void BuildFullAlphaNumericKeyboard(); void BuildAlphaNumericKeyboard();
/** /**
* \brief * \brief
* *
*/ */
void BuildSmallAlphaNumericKeyboard(); void BuildNumericKeyboard();
/** /**
* \brief * \brief
* *
*/ */
void BuildFullNumericKeyboard(); void BuildPhoneKeyboard();
/** /**
* \brief * \brief
* *
*/ */
void BuildSmallNumericKeyboard(); void BuildInternetKeyboard();
public: public:
/** /**
* \brief * \brief
* *
*/ */
Keyboard(int x, int y, jkeyboard_type_t type, bool text_visi ble = true, bool is_password = false); Keyboard(int x, int y, jkeyboard_type_t type, bool text_visi ble = true, bool is_password = false);
/** /**
* \brief * \brief
 End of changes. 6 change blocks. 
10 lines changed or deleted 10 lines changed or added


 jkeyevent.h   jkeyevent.h 
skipping to change at line 41 skipping to change at line 41
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jkey_type_t { enum jkeyevent_type_t {
JKEY_PRESSED, JKT_PRESSED,
JKEY_RELEASED, JKT_RELEASED,
JKEY_TYPED JKT_TYPED
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jinput_modifiers_t { enum jkeyevent_modifiers_t {
JMOD_SHIFT = 0x0001, JKM_SHIFT = 0x0001,
JMOD_CONTROL = 0x0002, JKM_CONTROL = 0x0002,
JMOD_ALT = 0x0004, JKM_ALT = 0x0004,
JMOD_ALTGR = 0x0008, JKM_ALTGR = 0x0008,
JMOD_META = 0x0010, JKM_META = 0x0010,
JMOD_SUPER = 0x0020, JKM_SUPER = 0x0020,
JMOD_HYPER = 0x0040, JKM_HYPER = 0x0040,
JMOD_CAPS_LOCK = 0x0080, JKM_CAPS_LOCK = 0x0080,
JMOD_NUM_LOCK = 0x0100, JKM_NUM_LOCK = 0x0100,
JMOD_SCROLL_LOCK = 0x0200 JKM_SCROLL_LOCK = 0x0200
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jkey_symbol_t { enum jkeyevent_symbol_t {
JKEY_UNKNOWN, JKS_UNKNOWN,
JKEY_EXIT, JKS_EXIT,
JKEY_BACKSPACE, JKS_BACKSPACE,
JKEY_TAB, JKS_TAB,
JKEY_ENTER, JKS_ENTER,
JKEY_CANCEL, JKS_CANCEL,
JKEY_ESCAPE, JKS_ESCAPE,
JKEY_SPACE, JKS_SPACE,
JKEY_EXCLAMATION_MARK, JKS_EXCLAMATION_MARK,
JKEY_QUOTATION, JKS_QUOTATION,
JKEY_NUMBER_SIGN, JKS_NUMBER_SIGN,
JKEY_DOLLAR_SIGN, JKS_DOLLAR_SIGN,
JKEY_PERCENT_SIGN, JKS_PERCENT_SIGN,
JKEY_AMPERSAND, JKS_AMPERSAND,
JKEY_APOSTROPHE, JKS_APOSTROPHE,
JKEY_PARENTHESIS_LEFT, JKS_PARENTHESIS_LEFT,
JKEY_PARENTHESIS_RIGHT, JKS_PARENTHESIS_RIGHT,
JKEY_STAR, JKS_STAR,
JKEY_SHARP, JKS_SHARP,
JKEY_PLUS_SIGN, JKS_PLUS_SIGN,
JKEY_COMMA, JKS_COMMA,
JKEY_MINUS_SIGN, JKS_MINUS_SIGN,
JKEY_PERIOD, JKS_PERIOD,
JKEY_SLASH, JKS_SLASH,
JKEY_0, JKS_0,
JKEY_1, JKS_1,
JKEY_2, JKS_2,
JKEY_3, JKS_3,
JKEY_4, JKS_4,
JKEY_5, JKS_5,
JKEY_6, JKS_6,
JKEY_7, JKS_7,
JKEY_8, JKS_8,
JKEY_9, JKS_9,
JKEY_COLON, JKS_COLON,
JKEY_SEMICOLON, JKS_SEMICOLON,
JKEY_LESS_THAN_SIGN, JKS_LESS_THAN_SIGN,
JKEY_EQUALS_SIGN, JKS_EQUALS_SIGN,
JKEY_GREATER_THAN_SIGN, JKS_GREATER_THAN_SIGN,
JKEY_QUESTION_MARK, JKS_QUESTION_MARK,
JKEY_AT, JKS_AT,
JKEY_A, JKS_A,
JKEY_B, JKS_B,
JKEY_C, JKS_C,
JKEY_D, JKS_D,
JKEY_E, JKS_E,
JKEY_F, JKS_F,
JKEY_G, JKS_G,
JKEY_H, JKS_H,
JKEY_I, JKS_I,
JKEY_J, JKS_J,
JKEY_K, JKS_K,
JKEY_L, JKS_L,
JKEY_M, JKS_M,
JKEY_N, JKS_N,
JKEY_O, JKS_O,
JKEY_P, JKS_P,
JKEY_Q, JKS_Q,
JKEY_R, JKS_R,
JKEY_S, JKS_S,
JKEY_T, JKS_T,
JKEY_U, JKS_U,
JKEY_V, JKS_V,
JKEY_W, JKS_W,
JKEY_X, JKS_X,
JKEY_Y, JKS_Y,
JKEY_Z, JKS_Z,
JKEY_a, JKS_a,
JKEY_b, JKS_b,
JKEY_c, JKS_c,
JKEY_d, JKS_d,
JKEY_e, JKS_e,
JKEY_f, JKS_f,
JKEY_g, JKS_g,
JKEY_h, JKS_h,
JKEY_i, JKS_i,
JKEY_j, JKS_j,
JKEY_k, JKS_k,
JKEY_l, JKS_l,
JKEY_m, JKS_m,
JKEY_n, JKS_n,
JKEY_o, JKS_o,
JKEY_p, JKS_p,
JKEY_q, JKS_q,
JKEY_r, JKS_r,
JKEY_s, JKS_s,
JKEY_t, JKS_t,
JKEY_u, JKS_u,
JKEY_v, JKS_v,
JKEY_w, JKS_w,
JKEY_x, JKS_x,
JKEY_y, JKS_y,
JKEY_z, JKS_z,
JKEY_SQUARE_BRACKET_LEFT, JKS_SQUARE_BRACKET_LEFT,
JKEY_BACKSLASH, JKS_BACKSLASH,
JKEY_SQUARE_BRACKET_RIGHT, JKS_SQUARE_BRACKET_RIGHT,
JKEY_CIRCUMFLEX_ACCENT, JKS_CIRCUMFLEX_ACCENT,
JKEY_UNDERSCORE, JKS_UNDERSCORE,
JKEY_GRAVE_ACCENT, JKS_GRAVE_ACCENT,
JKEY_CURLY_BRACKET_LEFT, JKS_CURLY_BRACKET_LEFT,
JKEY_VERTICAL_BAR, JKS_VERTICAL_BAR,
JKEY_CURLY_BRACKET_RIGHT, JKS_CURLY_BRACKET_RIGHT,
JKEY_TILDE, JKS_TILDE,
JKEY_DELETE, JKS_DELETE,
JKEY_INSERT, JKS_INSERT,
JKEY_HOME, JKS_HOME,
JKEY_END, JKS_END,
JKEY_PAGE_UP, JKS_PAGE_UP,
JKEY_PAGE_DOWN, JKS_PAGE_DOWN,
JKEY_PRINT, JKS_PRINT,
JKEY_PAUSE, JKS_PAUSE,
JKEY_CURSOR_LEFT, JKS_CURSOR_LEFT,
JKEY_CURSOR_RIGHT, JKS_CURSOR_RIGHT,
JKEY_CURSOR_UP, JKS_CURSOR_UP,
JKEY_CURSOR_DOWN, JKS_CURSOR_DOWN,
JKEY_CURSOR_LEFT_UP, JKS_CURSOR_LEFT_UP,
JKEY_CURSOR_LEFT_DOWN, JKS_CURSOR_LEFT_DOWN,
JKEY_CURSOR_UP_RIGHT, JKS_CURSOR_UP_RIGHT,
JKEY_CURSOR_DOWN_RIGHT, JKS_CURSOR_DOWN_RIGHT,
JKEY_RED, JKS_RED,
JKEY_GREEN, JKS_GREEN,
JKEY_YELLOW, JKS_YELLOW,
JKEY_BLUE, JKS_BLUE,
JKEY_F1, JKS_F1,
JKEY_F2, JKS_F2,
JKEY_F3, JKS_F3,
JKEY_F4, JKS_F4,
JKEY_F5, JKS_F5,
JKEY_F6, JKS_F6,
JKEY_F7, JKS_F7,
JKEY_F8, JKS_F8,
JKEY_F9, JKS_F9,
JKEY_F10, JKS_F10,
JKEY_F11, JKS_F11,
JKEY_F12, JKS_F12,
JKEY_SHIFT, JKS_SHIFT,
JKEY_CONTROL, JKS_CONTROL,
JKEY_ALT, JKS_ALT,
JKEY_ALTGR, JKS_ALTGR,
JKEY_META, JKS_META,
JKEY_SUPER, JKS_SUPER,
JKEY_HYPER, JKS_HYPER,
JKEY_POWER, JKS_POWER,
JKEY_MENU, JKS_MENU,
JKEY_FILE, JKS_FILE,
JKEY_INFO, JKS_INFO,
JKEY_BACK, JKS_BACK,
JKEY_GUIDE, JKS_GUIDE,
JKEY_CHANNEL_UP, JKS_CHANNEL_UP,
JKEY_CHANNEL_DOWN, JKS_CHANNEL_DOWN,
JKEY_VOLUME_UP, JKS_VOLUME_UP,
JKEY_VOLUME_DOWN, JKS_VOLUME_DOWN,
JKEY_PLAY, JKS_PLAY,
JKEY_STOP, JKS_STOP,
JKEY_EJECT, JKS_EJECT,
JKEY_REWIND, JKS_REWIND,
JKEY_RECORD, JKS_RECORD,
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class KeyEvent : public jcommon::EventObject{ class KeyEvent : public jcommon::EventObject{
private: private:
int _code; int _code;
jkey_symbol_t _symbol; jkeyevent_symbol_t _symbol;
jkey_type_t _type; jkeyevent_type_t _type;
jinput_modifiers_t _mod; jkeyevent_modifiers_t _mod;
public: public:
/** /**
* \brief * \brief
* *
*/ */
KeyEvent(void *source, jkey_type_t type, jinput_modifiers_t mod, int code, jkey_symbol_t symbol); KeyEvent(void *source, jkeyevent_type_t type, jkeyevent_modi fiers_t mod, int code, jkeyevent_symbol_t symbol);
/** /**
* \brief * \brief
* *
*/ */
virtual ~KeyEvent(); virtual ~KeyEvent();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetKeyCode(); virtual int GetKeyCode();
/** /**
* \brief * \brief
* *
*/ */
virtual jkey_symbol_t GetSymbol(); virtual jkeyevent_symbol_t GetSymbol();
/** /**
* \brief * \brief
* *
*/ */
virtual jkey_type_t GetType(); virtual jkeyevent_type_t GetType();
/** /**
* \brief * \brief
* *
*/ */
virtual jinput_modifiers_t GetModifiers(); virtual jkeyevent_modifiers_t GetModifiers();
}; };
} }
#endif #endif
 End of changes. 22 change blocks. 
180 lines changed or deleted 180 lines changed or added


 jlistbox.h   jlistbox.h 
skipping to change at line 43 skipping to change at line 43
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jlist_scroll_type_t { enum jlistbox_scroll_t {
NONE_SCROLL, JLS_NONE,
SCROLL_ARROW, JLS_ARROW,
SCROLL_BAR JLS_BAR
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jlist_selection_type_t { enum jlistbox_mode_t {
NONE_SELECTION, JLM_NONE_SELECTION,
SINGLE_SELECTION, JLM_SINGLE_SELECTION,
MULTI_SELECTION JLM_MULTI_SELECTION
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ListBox : public jgui::ItemComponent{ class ListBox : public jgui::ItemComponent{
private: private:
jlist_scroll_type_t _scroll; jlistbox_scroll_t _scroll;
jlist_selection_type_t _selection; jlistbox_mode_t _selection;
int _item_size, int _item_size,
_top_index, _top_index,
_selected_index, _selected_index,
_stone_size, _stone_size,
_scroll_width; _scroll_width;
bool _pressed, bool _pressed,
_centered_interaction; _centered_interaction;
private: private:
/** /**
skipping to change at line 125 skipping to change at line 125
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCenteredInteraction(bool b); virtual void SetCenteredInteraction(bool b);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetScrollType(jlist_scroll_type_t type); virtual void SetScrollType(jlistbox_scroll_t type);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetSelectionType(jlist_selection_type_t type); virtual void SetSelectionType(jlistbox_mode_t type);
/** /**
* \brief * \brief
* *
*/ */
void AddEmptyItem(); void AddEmptyItem();
/** /**
* \brief * \brief
* *
 End of changes. 5 change blocks. 
12 lines changed or deleted 12 lines changed or added


 jlogrecord.h   jlogrecord.h 
skipping to change at line 30 skipping to change at line 30
#ifndef J_LOGGERLOGRECORD_H #ifndef J_LOGGERLOGRECORD_H
#define J_LOGGERLOGRECORD_H #define J_LOGGERLOGRECORD_H
#include "jobject.h" #include "jobject.h"
#include <string> #include <string>
namespace jlogger { namespace jlogger {
enum jrecord_type_t { enum jrecord_type_t {
INFO_LOGGER = 0x00000001, JRT_INFO = 0x00000001,
WARNNING_LOGGER = 0x00000002, JRT_WARNNING = 0x00000002,
ERROR_LOGGER = 0x00000004, JRT_ERROR = 0x00000004,
CRITICAL_LOGGER = 0x00000008, JRT_CRITICAL = 0x00000008,
UNKNOWN_LOGGER = 0x00000010 JRT_UNKNOWN = 0x00000010
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class LogRecord : public virtual jcommon::Object{ class LogRecord : public virtual jcommon::Object{
private: private:
 End of changes. 1 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jmarquee.h   jmarquee.h 
skipping to change at line 45 skipping to change at line 45
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jmarquee_type_t { enum jmarquee_mode_t {
LOOP_TEXT, JMM_LOOP,
BOUNCE_TEXT JMM_BOUNCE
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Marquee : public Component, public jthread::Thread{ class Marquee : public Component, public jthread::Thread{
private: private:
std::string _text; std::string _text;
jmarquee_type_t _type; jmarquee_mode_t _type;
int _position, int _position,
_interval, _interval,
_index, _index,
_step; _step;
bool _running; bool _running;
public: public:
/** /**
* \brief * \brief
* *
skipping to change at line 89 skipping to change at line 89
/** /**
* \brief * \brief
* *
*/ */
virtual void SetVisible(bool b); virtual void SetVisible(bool b);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetType(jmarquee_type_t type); virtual void SetType(jmarquee_mode_t type);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetStep(int i); virtual void SetStep(int i);
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jmemorymap.h   jmemorymap.h 
skipping to change at line 38 skipping to change at line 38
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <stdint.h> #include <stdint.h>
namespace jshared { namespace jshared {
enum jmemory_perms_t { enum jmemory_permission_t {
MEM_EXEC = 0x01, JMP_NONE = 0x00,
MEM_READ = 0x02, JMP_EXEC = 0x01,
MEM_WRITE = 0x04, JMP_READ = 0x02,
MEM_READ_WRITE = 0x08, JMP_WRITE = 0x04,
MEM_NONE = 0x10 JMP_READ_WRITE = 0x08,
}; };
enum jmemory_flags_t { enum jmemory_flags_t {
MEM_OPEN = 0x01, JMF_OPEN = 0x01,
MEM_CREAT = 0x02 JMF_CREAT = 0x02
}; };
/** /**
* \brief Socket. * \brief Socket.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class MemoryMap : public virtual jcommon::Object{ class MemoryMap : public virtual jcommon::Object{
private: private:
skipping to change at line 75 skipping to change at line 75
#endif #endif
/** \brief */ /** \brief */
struct stat _stats; struct stat _stats;
/** \brief */ /** \brief */
void *_start; void *_start;
/** \brief */ /** \brief */
std::string _filename; std::string _filename;
/** \brief */ /** \brief */
int _timeout; int _timeout;
/** \brief */ /** \brief */
jmemory_perms_t _perms; jmemory_permission_t _permission;
/** \brief */ /** \brief */
bool _is_open; bool _is_open;
public: public:
/** /**
* \brief Constructor. * \brief Constructor.
* *
*/ */
MemoryMap(std::string sharedfile_, jmemory_flags_t f lags_ = MEM_OPEN, jmemory_perms_t perms_ = MEM_READ_WRITE, bool private_ = true); MemoryMap(std::string sharedfile_, jmemory_flags_t f lags_ = JMF_OPEN, jmemory_permission_t perms_ = JMP_READ_WRITE, bool privat e_ = true);
/** /**
* \brief Constructor. * \brief Constructor.
* *
*/ */
MemoryMap(std::string sharedfile_); MemoryMap(std::string sharedfile_);
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
skipping to change at line 114 skipping to change at line 114
/** /**
* \brief * \brief
* *
*/ */
int64_t Put(const char *data_, int64_t size_, int64_ t offset_); int64_t Put(const char *data_, int64_t size_, int64_ t offset_);
/** /**
* \brief * \brief
* *
*/ */
void SetPermission(jmemory_perms_t perms_); jmemory_permission_t GetPermission();
/**
* \brief
*
*/
void SetPermission(jmemory_permission_t perms_);
/** /**
* \brief * \brief
* *
*/ */
int64_t GetSize(); int64_t GetSize();
/** /**
* \brief * \brief
* *
 End of changes. 5 change blocks. 
11 lines changed or deleted 17 lines changed or added


 jmenu.h   jmenu.h 
skipping to change at line 42 skipping to change at line 42
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jmenu_align_t { enum jmenu_align_t {
MENU_ALIGN, JMA_TITLE,
SUBMENU_ALIGN JMA_ITEM,
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Menu : public KeyListener, public MouseListener, public jgui::ItemCom ponent, public jgui::ThemeListener{ class Menu : public KeyListener, public MouseListener, public jgui::ItemCom ponent, public jgui::ThemeListener{
private: private:
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jmouseevent.h   jmouseevent.h 
skipping to change at line 42 skipping to change at line 42
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jmouse_event_t { enum jmouse_event_t {
JMOUSE_UNKNOWN_EVENT, JME_UNKNOWN,
JMOUSE_PRESSED_EVENT, JME_PRESSED,
JMOUSE_RELEASED_EVENT, JME_RELEASED,
JMOUSE_MOVED_EVENT, JME_MOVED,
JMOUSE_WHEEL_EVENT JME_WHEEL
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jmouse_button_t { enum jmouse_button_t {
JMOUSE_UNKNOWN = 0x0, JMB_UNKNOWN = 0x0,
JMOUSE_BUTTON1 = 0x1, JMB_BUTTON1 = 0x1,
JMOUSE_BUTTON2 = 0x2, JMB_BUTTON2 = 0x2,
JMOUSE_BUTTON3 = 0x4, JMB_BUTTON3 = 0x4,
JMOUSE_WHEEL = 0x08 JMB_WHEEL = 0x08
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class MouseEvent : public jcommon::EventObject{ class MouseEvent : public jcommon::EventObject{
private: private:
 End of changes. 2 change blocks. 
10 lines changed or deleted 10 lines changed or added


 jmutex.h   jmutex.h 
skipping to change at line 37 skipping to change at line 37
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>
#endif #endif
namespace jthread { namespace jthread {
enum jmutex_type_t { enum jmutex_type_t {
FAST_MUTEX, JMT_FAST,
RECURSIVE_MUTEX, JMT_RECURSIVE,
ERROR_CHECK_MUTEX JMT_ERROR_CHECK
}; };
enum jmutex_protocol_t { enum jmutex_protocol_t {
NONE_PROT_MUTEX, JMP_NONE,
INHERIT_PROT_MUTEX, JMP_INHERIT,
PROTECT_PROT_MUTEX JMP_PROTECT
}; };
/** /**
* \brief Monitor. * \brief Monitor.
* *
* @author Jeff Ferr * @author Jeff Ferr
*/ */
class Mutex : public virtual jcommon::Object{ class Mutex : public virtual jcommon::Object{
friend class Condition; friend class Condition;
skipping to change at line 75 skipping to change at line 75
/** \brief */ /** \brief */
jmutex_type_t _type; jmutex_type_t _type;
/** \brief */ /** \brief */
int _lock_count; int _lock_count;
public: public:
/** /**
* \brief Construtor. * \brief Construtor.
* *
*/ */
Mutex(jmutex_type_t = ERROR_CHECK_MUTEX, jmutex_protocol_t p rotocol_ = NONE_PROT_MUTEX, bool block_in_death = false); Mutex(jmutex_type_t = JMT_ERROR_CHECK, jmutex_protocol_t pro tocol_ = JMP_NONE, bool block_in_death = false);
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
*/ */
virtual ~Mutex(); virtual ~Mutex();
/** /**
* \brief Verify if a section is locked. * \brief Verify if a section is locked.
* *
 End of changes. 3 change blocks. 
7 lines changed or deleted 7 lines changed or added


 jnullgraphics.h   jnullgraphics.h 
skipping to change at line 221 skipping to change at line 221
/** /**
* \brief * \brief
* *
*/ */
virtual void SetAntiAliasEnabled(bool b); virtual void SetAntiAliasEnabled(bool b);
/** /**
* \brief * \brief
* *
*/ */
virtual jporter_duff_flags_t GetPorterDuffFlags(); virtual jporterduff_flags_t GetPorterDuffFlags();
/** /**
* \brief * \brief
* *
*/ */
virtual jdrawing_flags_t GetDrawingFlags(); virtual jdrawing_flags_t GetDrawingFlags();
/** /**
* \brief * \brief
* *
*/ */
virtual jblitting_flags_t GetBlittingFlags(); virtual jblitting_flags_t GetBlittingFlags();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetPorterDuffFlags(jporter_duff_flags_t t); virtual void SetPorterDuffFlags(jporterduff_flags_t t);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetDrawingFlags(jdrawing_flags_t t); virtual void SetDrawingFlags(jdrawing_flags_t t);
/** /**
* \brief * \brief
* *
skipping to change at line 513 skipping to change at line 513
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(Image *img, int sxp, int syp, int swp , int shp, int xp, int yp, int wp, int hp); virtual bool DrawImage(Image *img, int sxp, int syp, int swp , int shp, int xp, int yp, int wp, int hp);
/** /**
* \brief * \brief
* *
*/ */
virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JUSTIFY_HAL IGN); virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JHA_JUSTIFY );
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawString(std::string text, int xp, int yp); virtual void DrawString(std::string text, int xp, int yp);
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawString(std::string text, int xp, int yp, in t wp, int hp, jhorizontal_align_t halign = JUSTIFY_HALIGN, jvertical_align_ t valign = CENTER_VALIGN, bool clipped = true); virtual void DrawString(std::string text, int xp, int yp, in t wp, int hp, jhorizontal_align_t halign = JHA_JUSTIFY, jvertical_align_t v align = JVA_CENTER, bool clipped = true);
/** /**
* \brief * \brief
* *
*/ */
virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000); virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000);
/** /**
* \brief * \brief
* *
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jprocess.h   jprocess.h 
skipping to change at line 42 skipping to change at line 42
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#endif #endif
#include <stdint.h> #include <stdint.h>
namespace jshared { namespace jshared {
enum jprocess_type_t { enum jprocess_type_t {
CHILD_PROCESS, JPT_CHILD,
PARENT_PROCESS JPT_PARENT
}; };
enum jprocess_mode_t { enum jprocess_mode_t {
AUTO_FLUSH_MODE, JPM_AUTO_FLUSH,
WAIT_ANY_INPUT_MODE, JPM_WAIT_ANY_INPUT,
WAIT_ALL_INPUT_MODE, JPM_WAIT_ALL_INPUT,
TRY_ONCE_MODE JPM_TRY_ONCE
}; };
enum jprocess_flag_t { enum jprocess_flag_t {
CREATE_PROCESS, // \brief Create a new process JPF_CREATE, // \brief Create a new process
LOCK_PROCESS // \brief Create a new process and block par JPF_LOCK // \brief Create a new process and block par
ent ent
}; };
/** /**
* \brief Socket. * \brief Socket.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Process : public virtual jcommon::Object{ class Process : public virtual jcommon::Object{
private: private:
 End of changes. 3 change blocks. 
9 lines changed or deleted 9 lines changed or added


 jprogramelementarystreamsection.h   jprogramelementarystreamsection.h 
skipping to change at line 28 skipping to change at line 28
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
************************************************************************** */ ************************************************************************** */
#ifndef J_PESPACKET_H #ifndef J_PESPACKET_H
#define J_PESPACKET_H #define J_PESPACKET_H
#include <stdint.h> #include <stdint.h>
namespace jmpeg { namespace jmpeg {
enum jstream_id_t { enum jstream_id_t {
PROGRAM_STREAM_MAP, JSI_PROGRAM_STREAM_MAP,
PRIVATE_STREAM_1, JSI_PRIVATE_STREAM_1,
PADDING_STREAM, JSI_PADDING_STREAM,
PRIVATE_STREAM_2, JSI_PRIVATE_STREAM_2,
ECM_STREAM, JSI_ECM_STREAM,
EMM_STREAM, JSI_EMM_STREAM,
DSMCC_STREAM, JSI_DSMCC_STREAM,
ISO_IEC_12522_STREAM, JSI_ISO_IEC_12522_STREAM,
ITU_T_TYPE_A, JSI_ITU_T_TYPE_A,
ITU_T_TYPE_B, JSI_ITU_T_TYPE_B,
ITU_T_TYPE_C, JSI_ITU_T_TYPE_C,
ITU_T_TYPE_D, JSI_ITU_T_TYPE_D,
ITU_T_TYPE_E, JSI_ITU_T_TYPE_E,
ANCILLARY_STREAM, JSI_ANCILLARY_STREAM,
PACKETIZED_STREAM, JSI_PACKETIZED_STREAM,
FLEX_MUX_STREAM, JSI_FLEX_MUX_STREAM,
PROGRAM_STREAM_DIRECTORY JSI_PROGRAM_STREAM_DIRECTORY
}; };
class ProgramElementaryStreamSection class ProgramElementaryStreamSection
{ {
private: private:
/** \brief */ /** \brief */
uint8_t *_data; uint8_t *_data;
/** \brief */ /** \brief */
uint32_t _size; uint32_t _size;
/** \brief */ /** \brief */
 End of changes. 1 change blocks. 
17 lines changed or deleted 17 lines changed or added


 jprogressbar.h   jprogressbar.h 
skipping to change at line 23 skipping to change at line 23
* GNU General Public License for more details. * * GNU General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the * * along with this program; if not, write to the *
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
************************************************************************** */ ************************************************************************** */
#ifndef J_PROGRESSBAR_H #ifndef J_PROGRESSBAR_H
#define J_PROGRESSBAR_H #define J_PROGRESSBAR_H
#include "jcomponent.h" #include "jslidercomponent.h"
#include "jthread.h" #include "jthread.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/**
* \brief
*
*/
enum jprogress_type_t {
BOTTOM_UP_DIRECTION,
LEFT_RIGHT_DIRECTION
};
class ButtonListener; class ButtonListener;
class ButtonEvent; class ButtonEvent;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ProgressBar : public jgui::Component, public jthread::Thread{ class ProgressBar : public jgui::Component, public jthread::Thread{
private: private:
jprogress_type_t _type; jscroll_orientation_t _type;
int _value, int _value,
_index, _index,
_delta, _delta,
_fixe_delta; _fixe_delta;
bool _label_visible, bool _label_visible,
_indeterminate, _indeterminate,
_running; _running;
public: public:
/** /**
* \brief * \brief
* *
*/ */
ProgressBar(int x = 0, int y = 0, int width = DEFAULT_COMPON ENT_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT, jprogress_type_t type = L EFT_RIGHT_DIRECTION); ProgressBar(int x = 0, int y = 0, int width = DEFAULT_COMPON ENT_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT, jscroll_orientation_t typ e = JSO_HORIZONTAL);
/** /**
* \brief * \brief
* *
*/ */
virtual ~ProgressBar(); virtual ~ProgressBar();
/** /**
* \brief * \brief
* *
*/ */
virtual jscroll_orientation_t GetScrollOrientation();
/**
* \brief
*
*/
virtual void SetScrollOrientation(jscroll_orientation_t type
);
/**
* \brief
*
*/
virtual double GetValue(); virtual double GetValue();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetValue(double i); virtual void SetValue(double i);
/** /**
* \brief * \brief
 End of changes. 5 change blocks. 
12 lines changed or deleted 16 lines changed or added


 jresourcestatusevent.h   jresourcestatusevent.h 
skipping to change at line 29 skipping to change at line 29
************************************************************************** */ ************************************************************************** */
#ifndef J_RESOURCESTATUSEVENT_H #ifndef J_RESOURCESTATUSEVENT_H
#define J_RESOURCESTATUSEVENT_H #define J_RESOURCESTATUSEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <string> #include <string>
namespace jresource { namespace jresource {
enum jresource_event_type_t { enum jresourceevent_type_t {
UNKNOWN_RESOURCE_EVENT JRT_UNKNOWN
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ResourceStatusEvent : public jcommon::EventObject{ class ResourceStatusEvent : public jcommon::EventObject{
private: private:
jresource_event_type_t _type; jresourceevent_type_t _type;
public: public:
/** /**
* \brief * \brief
* *
*/ */
ResourceStatusEvent(void *source); ResourceStatusEvent(void *source);
/** /**
* \brief * \brief
* *
*/ */
virtual ~ResourceStatusEvent(); virtual ~ResourceStatusEvent();
/** /**
* \brief * \brief
* *
*/ */
jresource_event_type_t GetType(); jresourceevent_type_t GetType();
}; };
} }
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jschedule.h   jschedule.h 
skipping to change at line 46 skipping to change at line 46
#include <stdint.h> #include <stdint.h>
namespace jshared { namespace jshared {
/** /**
* \brief Prioridade do escalonamento * \brief Prioridade do escalonamento
* *
*/ */
enum jschedule_policy_t { enum jschedule_policy_t {
SCHEDULE_FIFO, JSP_FIFO,
SCHEDULE_ROUND_ROBIN, JSP_ROUND_ROBIN,
SCHEDULE_OTHER JSP_OTHER
}; };
/** /**
* \brief Prioridade do escalonamento * \brief Prioridade do escalonamento
* *
*/ */
enum jschedule_type_t { enum jschedule_type_t {
#ifdef _WIN32 #ifdef _WIN32
PRIORITY_PROCESS = 0, PRIORITY_PROCESS = 0,
PRIORITY_GROUP = 0, PRIORITY_GROUP = 0,
PRIORITY_USER = 0 PRIORITY_USER = 0
#else #else
PRIORITY_PROCESS = PRIO_PROCESS, PRIORITY_PROCESS = PRIO_PROCESS,
PRIORITY_GROUP = PRIO_PGRP, PRIORITY_GROUP = PRIO_PGRP,
PRIORITY_USER = PRIO_USER PRIORITY_USER = PRIO_USER
#endif #endif
}; };
/** /**
* \brief Parametros de escalonamento * \brief Parametros de escalonamento
* *
*/ */
struct jschedule_param_t { struct jschedule_param_t {
int priority; int priority;
}; };
 End of changes. 3 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jscrollbar.h   jscrollbar.h 
skipping to change at line 40 skipping to change at line 40
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ScrollBar : public jgui::SliderComponent{ class ScrollBar : public jgui::SliderComponent{
private: private:
std::vector<AdjustmentListener *> _adjust_listeners; std::vector<AdjustmentListener *> _adjust_listeners;
jscroll_orientation_t _type;
int _index, int _index,
_stone_size, _stone_size,
_count_paint; _count_paint;
bool _pressed, bool _pressed,
_label_visible; _label_visible;
public: public:
/** /**
* \brief * \brief
* *
*/ */
ScrollBar(int x = 0, int y = 0, int width = DEFAULT_COMPONEN T_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT); ScrollBar(int x = 0, int y = 0, int width = DEFAULT_COMPONEN T_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT);
/** /**
* \brief * \brief
* *
*/ */
virtual ~ScrollBar(); virtual ~ScrollBar();
/** /**
* \brief * \brief
* *
*/ */
virtual jscroll_orientation_t GetScrollOrientation();
/**
* \brief
*
*/
virtual void SetScrollOrientation(jscroll_orientation_t type
);
/**
* \brief
*
*/
virtual int GetStoneSize(); virtual int GetStoneSize();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetStoneSize(int size); virtual void SetStoneSize(int size);
/** /**
* \brief * \brief
 End of changes. 4 change blocks. 
3 lines changed or deleted 17 lines changed or added


 jscrollpane.h   jscrollpane.h 
skipping to change at line 39 skipping to change at line 39
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jscrollpane_type_t { enum jscrollpane_type_t {
HORIZONTAL_SCROLL, JST_HORIZONTAL_ONLY,
VERTICAL_SCROLL, JST_VERTICAL_ONLY,
BOTH_SCROLL JST_BOTH
}; };
class Layout; class Layout;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ScrollPane : public jgui::Container{ class ScrollPane : public jgui::Container{
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 lines changed or added


 jselectevent.h   jselectevent.h 
skipping to change at line 32 skipping to change at line 32
#include "jeventobject.h" #include "jeventobject.h"
#include "jitemcomponent.h" #include "jitemcomponent.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jselect_type_t { enum jselectevent_type_t {
LEFT_ITEM, JST_LEFT,
RIGHT_ITEM, JST_RIGHT,
UP_ITEM, JST_UP,
DOWN_ITEM, JST_DOWN,
ACTION_ITEM JST_ACTION
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class SelectEvent : public jcommon::EventObject{ class SelectEvent : public jcommon::EventObject{
private: private:
jgui::Item *_item; jgui::Item *_item;
jselect_type_t _type; jselectevent_type_t _type;
int _index; int _index;
public: public:
/** /**
* \brief * \brief
* *
*/ */
SelectEvent(void *source, jgui::Item *item, int index, jsele ct_type_t type); SelectEvent(void *source, jgui::Item *item, int index, jsele ctevent_type_t type);
/** /**
* \brief * \brief
* *
*/ */
virtual ~SelectEvent(); virtual ~SelectEvent();
/** /**
* \brief * \brief
* *
skipping to change at line 81 skipping to change at line 81
/** /**
* \brief * \brief
* *
*/ */
virtual int GetIndex(); virtual int GetIndex();
/** /**
* \brief * \brief
* *
*/ */
virtual jselect_type_t GetType(); virtual jselectevent_type_t GetType();
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
9 lines changed or deleted 9 lines changed or added


 jsharedmutex.h   jsharedmutex.h 
skipping to change at line 38 skipping to change at line 38
#include <windows.h> #include <windows.h>
#else #else
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ipc.h> #include <sys/ipc.h>
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#endif #endif
namespace jshared { namespace jshared {
// MCL_CURRENT, enum jsharedmutex_flags_t {
// MCL_FUTURE JSF_CURRENT = 1,
enum jmutex_flags_t { JSF_FUTURE = 2
MUTEX_CURRENT = 1,
MUTEX_FUTURE = 2
}; };
/** /**
* \brief SharedMutex. * \brief SharedMutex.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class SharedMutex : public virtual jcommon::Object{ class SharedMutex : public virtual jcommon::Object{
private: private:
skipping to change at line 66 skipping to change at line 64
#else #else
key_t _id; key_t _id;
#endif #endif
/** \brief */ /** \brief */
int64_t _size; int64_t _size;
/** \brief */ /** \brief */
char *_shmp; char *_shmp;
/** \brief */ /** \brief */
bool _is_open; bool _is_open;
/** \brief */ /** \brief */
jmutex_flags_t _flags; jsharedmutex_flags_t _flags;
public: public:
/** /**
* \brief Constructor. * \brief Constructor.
* *
*/ */
SharedMutex(jmutex_flags_t flags_ = jmutex_flags_t(M UTEX_CURRENT | MUTEX_FUTURE)); SharedMutex(jsharedmutex_flags_t flags_ = jsharedmut ex_flags_t(JSF_CURRENT | JSF_FUTURE));
/** /**
* \brief Constructor. * \brief Constructor.
* *
*/ */
SharedMutex(void *data_, int64_t size_); SharedMutex(void *data_, int64_t size_);
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
 End of changes. 3 change blocks. 
7 lines changed or deleted 5 lines changed or added


 jslidercomponent.h   jslidercomponent.h 
skipping to change at line 23 skipping to change at line 23
* GNU General Public License for more details. * * GNU General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the * * along with this program; if not, write to the *
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
************************************************************************** */ ************************************************************************** */
#ifndef J_SLIDERCOMPONENT_H #ifndef J_SLIDERCOMPONENT_H
#define J_SLIDERCOMPONENT_H #define J_SLIDERCOMPONENT_H
#include "jcomponent.h"
#include "jadjustmentlistener.h" #include "jadjustmentlistener.h"
#include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/**
* \brief
*
*/
enum jscroll_orientation_t { enum jscroll_orientation_t {
LEFT_RIGHT_SCROLL, JSO_HORIZONTAL,
BOTTOM_UP_SCROLL JSO_VERTICAL
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class SliderComponent : public jgui::Component{ class SliderComponent : public jgui::Component{
protected: protected:
skipping to change at line 75 skipping to change at line 71
/** /**
* \brief * \brief
* *
*/ */
virtual ~SliderComponent(); virtual ~SliderComponent();
/** /**
* \brief * \brief
* *
*/ */
virtual jscroll_orientation_t GetOrientation(); virtual jscroll_orientation_t GetScrollOrientation();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetOrientation(jscroll_orientation_t type); virtual void SetScrollOrientation(jscroll_orientation_t type );
/** /**
* \brief * \brief
* *
*/ */
virtual int GetValue(); virtual int GetValue();
/** /**
* \brief * \brief
* *
 End of changes. 6 change blocks. 
9 lines changed or deleted 5 lines changed or added


 jsocketlib.h   jsocketlib.h 
skipping to change at line 27 skipping to change at line 27
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
************************************************************************** */ ************************************************************************** */
#ifndef J_SOCKLIB_H #ifndef J_SOCKLIB_H
#define J_SOCKLIB_H #define J_SOCKLIB_H
#include <string> #include <string>
#include <vector> #include <vector>
enum jaddress_family_t { enum jaddress_family_t {
AIF_UNKNOWN, JAF_UNKNOWN,
AIF_INET, JAF_INET,
AIF_INET6, JAF_INET6,
AIF_NETBIOS JAF_NETBIOS
}; };
enum jaddress_type_t { enum jaddress_type_t {
AIT_UNKNOW, JAT_UNKNOW,
AIT_STREAM, JAT_STREAM,
AIT_DGRAM, JAT_DGRAM,
AIT_RAW, JAT_RAW,
AIT_RDM, JAT_RDM,
AIT_SEQPACKET JAT_SEQPACKET
}; };
enum jaddress_protocol_t { enum jaddress_protocol_t {
AIP_UNKNOWN, JAP_UNKNOWN,
AIP_TCP, JAP_TCP,
AIP_UDP JAP_UDP
}; };
struct jaddress_info_t { struct jaddress_info_t {
jaddress_family_t family; jaddress_family_t family;
jaddress_type_t type; jaddress_type_t type;
jaddress_protocol_t protocol; jaddress_protocol_t protocol;
std::string name; std::string name;
std::string address; std::string address;
}; };
 End of changes. 3 change blocks. 
13 lines changed or deleted 13 lines changed or added


 jspin.h   jspin.h 
skipping to change at line 25 skipping to change at line 25
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the * * along with this program; if not, write to the *
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
************************************************************************** */ ************************************************************************** */
#ifndef J_SPIN_H #ifndef J_SPIN_H
#define J_SPIN_H #define J_SPIN_H
#include "jselectlistener.h" #include "jselectlistener.h"
#include "jitemcomponent.h" #include "jitemcomponent.h"
#include "jslidercomponent.h"
#include <vector> #include <vector>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/
enum jspin_type_t {
HORIZONTAL_SPIN,
VERTICAL_SPIN
};
/**
* \brief
*
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Spin : public jgui::ItemComponent{ class Spin : public jgui::ItemComponent{
private: private:
std::vector<SelectListener *> _select_listeners; std::vector<SelectListener *> _select_listeners;
jspin_type_t _type; jscroll_orientation_t _type;
private: private:
void NextItem(); void NextItem();
void PreviousItem(); void PreviousItem();
public: public:
/** /**
* \brief * \brief
* *
*/ */
skipping to change at line 71 skipping to change at line 63
/** /**
* \brief * \brief
* *
*/ */
virtual ~Spin(); virtual ~Spin();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetType(jspin_type_t type); virtual jscroll_orientation_t GetScrollOrientation();
/** /**
* \brief * \brief
* *
*/ */
virtual jspin_type_t GetType(); virtual void SetScrollOrientation(jscroll_orientation_t type );
/** /**
* \brief * \brief
* *
*/ */
virtual void AddEmptyItem(); virtual void AddEmptyItem();
/** /**
* \brief * \brief
* *
 End of changes. 5 change blocks. 
12 lines changed or deleted 4 lines changed or added


 jstringtokenizer.h   jstringtokenizer.h 
skipping to change at line 32 skipping to change at line 32
#include "jobject.h" #include "jobject.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdint.h> #include <stdint.h>
namespace jcommon { namespace jcommon {
enum jtoken_flag_t { enum jtoken_type_t {
TOKEN_FLAG, JTT_CHAR,
SPLIT_FLAG JTT_STRING,
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class StringTokenizer : public virtual jcommon::Object{ class StringTokenizer : public virtual jcommon::Object{
private: private:
/** \brief Comment */ /** \brief Comment */
std::vector<std::string> _tokens; std::vector<std::string> _tokens;
/** /**
* \brief * \brief
* *
*/ */
void BuildTokens(std::string string_, std::string token_, jt oken_flag_t flag_, bool return_token_); void BuildTokens(std::string string_, std::string token_, jt oken_type_t flag_, bool return_token_);
public: public:
/** /**
* \brief Para TOKEN_FLAG, o parametro token_ eh utilizado d e tal modo que todos os chars * \brief Para TOKEN_FLAG, o parametro token_ eh utilizado d e tal modo que todos os chars
* saum utilizados como token. Para SPLIT_FLAG, o parametro token_ eh tratado como um token * saum utilizados como token. Para SPLIT_FLAG, o parametro token_ eh tratado como um token
* completo, e naum como uma lista de tokens. * completo, e naum como uma lista de tokens.
* *
*/ */
StringTokenizer(std::string string_, std::string token_, jto ken_flag_t flag_ = TOKEN_FLAG, bool return_token_ = false); StringTokenizer(std::string string_, std::string token_, jto ken_type_t flag_ = JTT_STRING, bool return_token_ = false);
/** /**
* \brief * \brief
* *
*/ */
virtual ~StringTokenizer(); virtual ~StringTokenizer();
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jtextcomponent.h   jtextcomponent.h 
skipping to change at line 37 skipping to change at line 37
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jcursor_type_t { enum jcaret_type_t {
NONE_CURSOR, JCT_NONE,
UNDERSCORE_CURSOR, JCT_UNDERSCORE,
STICK_CURSOR, JCT_STICK,
BLOCK_CURSOR JCT_BLOCK
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class TextComponent : public jgui::Component{ class TextComponent : public jgui::Component{
protected: protected:
std::vector<TextListener *> _text_listeners; std::vector<TextListener *> _text_listeners;
jhorizontal_align_t _halign; jhorizontal_align_t _halign;
jvertical_align_t _valign; jvertical_align_t _valign;
jcursor_type_t _caret_type; jcaret_type_t _caret_type;
std::string _text; std::string _text;
int _caret_position, int _caret_position,
_selection_start, _selection_start,
_selection_end, _selection_end,
_max_text_length; _max_text_length;
bool _is_editable, bool _is_editable,
_caret_visible; _caret_visible;
char _echo_char; char _echo_char;
public: public:
skipping to change at line 112 skipping to change at line 112
/** /**
* \brief * \brief
* *
*/ */
virtual bool EchoCharIsSet(); virtual bool EchoCharIsSet();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCaretType(jcursor_type_t t); virtual void SetCaretType(jcaret_type_t t);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCaretVisible(bool visible); virtual void SetCaretVisible(bool visible);
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
7 lines changed or deleted 7 lines changed or added


 jthread.h   jthread.h 
skipping to change at line 40 skipping to change at line 40
#include <cstdlib> #include <cstdlib>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#endif #endif
namespace jthread{ namespace jthread{
enum jthread_type_t { enum jthread_type_t {
DETACH_THREAD, JTT_DETACH,
JOINABLE_THREAD JTT_JOINABLE
}; };
enum jthread_priority_t { enum jthread_priority_t {
LOW_PRIORITY, JTP_LOW,
NORMAL_PRIORITY, JTP_NORMAL,
HIGH_PRIORITY JTP_HIGH
}; };
enum jthread_policy_t { enum jthread_policy_t {
POLICY_OTHER, // Normal thread JTP_OTHER, // Normal thread
POLICY_FIFO, // Real-time thread fifo JTP_FIFO, // Real-time thread fifo
POLICY_ROUND_ROBIN // Round robin thread round robin JTP_ROUND_ROBIN // Round robin thread round robin
}; };
#ifdef _WIN32 #ifdef _WIN32
typedef HANDLE jthread_t; typedef HANDLE jthread_t;
#else #else
typedef pthread_t jthread_t; typedef pthread_t jthread_t;
#endif #endif
struct jthread_map_t { struct jthread_map_t {
jthread_t thread; jthread_t thread;
skipping to change at line 153 skipping to change at line 153
* \brief * \brief
* *
*/ */
virtual int CleanUp(); virtual int CleanUp();
public: public:
/** /**
* \brief Construtor. * \brief Construtor.
* *
*/ */
Thread(jthread_type_t type = JOINABLE_THREAD, ThreadGroup *g roup = NULL); Thread(jthread_type_t type = JTT_JOINABLE, ThreadGroup *grou p = NULL);
/** /**
* \brief Construtor. * \brief Construtor.
* *
*/ */
Thread(Runnable *runnable, jthread_type_t type = JOINABLE_TH READ, ThreadGroup *group = NULL); Thread(Runnable *runnable, jthread_type_t type = JTT_JOINABL E, ThreadGroup *group = NULL);
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
*/ */
virtual ~Thread(); virtual ~Thread();
/** /**
* \brief * \brief
* *
 End of changes. 5 change blocks. 
10 lines changed or deleted 10 lines changed or added


 jthreadpool.h   jthreadpool.h 
skipping to change at line 38 skipping to change at line 38
#include <map> #include <map>
#include <queue> #include <queue>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#endif #endif
namespace jthread{ namespace jthread{
enum jthread_pool_priority_t { enum jthreadpool_priority_t {
THREAD_GROUP_LOW, JTP_GROUP_LOW,
THREAD_GROUP_MEDIUM, JTP_GROUP_MEDIUM,
THREAD_GROUP_HIGH JTP_GROUP_HIGH
}; };
class ThreadPool; class ThreadPool;
class WorkerThread : public jthread::Thread{ class WorkerThread : public jthread::Thread{
private: private:
/** \brief */ /** \brief */
ThreadPool *_group; ThreadPool *_group;
/** \brief */ /** \brief */
skipping to change at line 145 skipping to change at line 145
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
*/ */
virtual ~ThreadPool(); virtual ~ThreadPool();
/** /**
* \brief * \brief
* *
*/ */
bool AttachThread(Runnable *r, jthread_pool_priority_t t = T HREAD_GROUP_MEDIUM); bool AttachThread(Runnable *r, jthreadpool_priority_t t = JT P_GROUP_MEDIUM);
/** /**
* \brief * \brief
* *
*/ */
bool DetachThread(Runnable *r); bool DetachThread(Runnable *r);
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jtimer.h   jtimer.h 
skipping to change at line 38 skipping to change at line 38
#include <map> #include <map>
namespace jthread{ namespace jthread{
/** /**
* \brief Thread. * \brief Thread.
* *
* @author Jeff Ferr * @author Jeff Ferr
*/ */
enum jtimertask_t { enum jtimertask_state_t {
VIRGIN, // The state of this task, chosen from the c JTS_VIRGIN, // The state of this task, chosen fr
onstants below. This task has not yet been scheduled. om the constants below. This task has not yet been scheduled.
SCHEDULED, // This task is scheduled for execution. If it is a JTS_SCHEDULED, // This task is scheduled for execution. If it is a
non-repeating task, it has not yet been executed. non-repeating task, it has not yet been executed.
EXECUTED, // This non-repeating task has already execu JTS_EXECUTED, // This non-repeating task has already execu
ted (or is currently executing) and has not been cancelled. ted (or is currently executing) and has not been cancelled.
CANCELLED // This task has been cancelled (with a call JTS_CANCELLED // This task has been cancelled (with a call
to TimerTask.cancel). to TimerTask.cancel).
}; };
class Timer; class Timer;
class TimerThread; class TimerThread;
class TaskQueue; class TaskQueue;
class TimerTask : public jthread::Runnable { class TimerTask : public jthread::Runnable {
friend class Timer; friend class Timer;
friend class TimerThread; friend class TimerThread;
friend class TaskQueue; friend class TaskQueue;
private: private:
jthread::Mutex _mutex; jthread::Mutex _mutex;
jtimertask_t state; jtimertask_state_t _state;
uint64_t _delay;
bool _push_time;
protected: protected:
/** /**
* \brief Creates a new timer task. * \brief Creates a new timer task.
* *
*/ */
TimerTask(); TimerTask();
public: public:
uint64_t period, uint64_t _next_execution_time;
nextExecutionTime;
bool delay;
public: public:
/** /**
* \brief * \brief
* *
*/ */
virtual ~TimerTask(); virtual ~TimerTask();
/**
* \brief
*
*/
virtual uint64_t GetDelay();
/**
* \brief
*
*/
virtual void SetDelay(uint64_t delay);
/** /**
* Cancels this timer task. If the task has been scheduled for one-tim e execution and has not yet run, or * Cancels this timer task. If the task has been scheduled for one-tim e execution and has not yet run, or
* has not yet been scheduled, it will never run. If the ta sk has been scheduled for repeated execution, * has not yet been scheduled, it will never run. If the ta sk has been scheduled for repeated execution,
* it will never run again. (If the task is running when th is call occurs, the task will run to completion, * it will never run again. (If the task is running when th is call occurs, the task will run to completion,
* but will never run again.) * but will never run again.)
* *
* <p>Note that calling this method from within the <tt>run</tt> method of a repeating timer task absolutely * <p>Note that calling this method from within the <tt>run</tt> method of a repeating timer task absolutely
* guarantees that the timer task will not run again. * guarantees that the timer task will not run again.
* *
* <p>This method may be called repeatedly; the second and subsequent c alls have no effect. * <p>This method may be called repeatedly; the second and subsequent c alls have no effect.
* *
* @return true if this task is scheduled for one-time execution and ha s not yet run, or this task is scheduled * @return true if this task is scheduled for one-time execution and ha s not yet run, or this task is scheduled
* for repeated execution. Returns false if the task was sch eduled for one-time execution and has already run, * for repeated execution. Returns false if the task was sch eduled for one-time execution and has already run,
* or if the task was never scheduled, or if the task was al ready cancelled. (Loosely speaking, this method * or if the task was never scheduled, or if the task was al ready cancelled. (Loosely speaking, this method
* returns <tt>true</tt> if it prevents one or more schedule d executions from taking place.) * returns <tt>true</tt> if it prevents one or more schedule d executions from taking place.)
*/ */
bool Cancel(); virtual bool Cancel();
/** /**
* \brief The action to be performed by this timer task. * \brief The action to be performed by this timer task.
* *
*/ */
virtual void Run(); virtual void Run();
}; };
/** /**
skipping to change at line 199 skipping to change at line 212
* tasks from the queue. * tasks from the queue.
* *
*/ */
class TimerThread : public jthread::Thread { class TimerThread : public jthread::Thread {
friend class Timer; friend class Timer;
private: private:
jthread::Mutex _mutex; jthread::Mutex _mutex;
TaskQueue *_queue; TaskQueue *_queue;
bool newTasksMayBeScheduled; bool _is_running,
_new_tasks_may_be_scheduled;
private: private:
/** /**
* \brief The main timer loop. * \brief The main timer loop.
* *
*/ */
void MainLoop(); void MainLoop();
protected: protected:
/** /**
skipping to change at line 244 skipping to change at line 258
TimerThread *_thread; TimerThread *_thread;
TaskQueue *_queue; TaskQueue *_queue;
private: private:
/** /**
* \brief Schedule the specifed timer task for execution at the specifi ed time with the specified period, in microseconds. * \brief Schedule the specifed timer task for execution at the specifi ed time with the specified period, in microseconds.
* If period is positive, the task is scheduled for repeated execution; if period is zero, the task is scheduled for one-time * If period is positive, the task is scheduled for repeated execution; if period is zero, the task is scheduled for one-time
* execution. Time is specified in Date.getTime() format. T his method checks timer state, task state, and initial execution * execution. Time is specified in Date.getTime() format. T his method checks timer state, task state, and initial execution
* time, but not period. * time, but not period.
*/ */
void sched(TimerTask *task, uint64_t time, uint64_t period, bool delay) ; void schedule(TimerTask *task, uint64_t next_execution_time, uint64_t d elay, bool push_time);
public: public:
/** /**
* \brief Creates a new timer. The associated thread does <i>not</i> r un as a daemon. * \brief Creates a new timer. The associated thread does <i>not</i> r un as a daemon.
* *
*/ */
Timer(); Timer();
/** /**
* \brief This object causes the timer's task execution thread to exit * \brief Terminates this timer, discarding any currently scheduled tas
gracefully when there are no live references ks. Does not interfere with a currently
* to the Timer object and no tasks in the timer queue. It * executing task (if it exists).Once a timer has been termi
is used in preference to a finalizer on Timer as such a nated, its execution thread terminates gracefully,
* finalizer would be susceptible to a subclass's finalizer * and no more tasks may be scheduled on it.
forgetting to call it. *
* <p>Note that calling this method from within the run method of a tim
er task that was invoked by this timer
* absolutely guarantees that the ongoing task execution is
the last task execution that will ever be performed
* by this timer.
*
* <p>This method may be called repeatedly; the second and subsequent c
alls have no effect.
*/ */
virtual ~Timer(); virtual ~Timer();
/** /**
* \brief Schedules the specified task for execution after the specifie d delay. * \brief Schedules the specified task for execution after the specifie d delay.
* *
* @param task task to be scheduled. * @param task task to be scheduled.
* @param delay delay in microseconds before task is to be executed. * @param delay delay in microseconds before task is to be executed.
*/ */
void Schedule(TimerTask *task, uint64_t time, bool delay); void Schedule(TimerTask *task, uint64_t time, bool delay);
skipping to change at line 373 skipping to change at line 393
* @param period time in microseconds between successive task execution s. * @param period time in microseconds between successive task execution s.
*/ */
void ScheduleAtFixedRate(TimerTask *task, jcommon::Date *time, uint64_t period, bool delay); void ScheduleAtFixedRate(TimerTask *task, jcommon::Date *time, uint64_t period, bool delay);
/** /**
* \brief Remove a schedule reference from timer. * \brief Remove a schedule reference from timer.
* *
*/ */
void RemoveSchedule(TimerTask *task); void RemoveSchedule(TimerTask *task);
/**
* \brief Terminates this timer, discarding any currently scheduled tas
ks. Does not interfere with a currently
* executing task (if it exists).Once a timer has been termi
nated, its execution thread terminates gracefully,
* and no more tasks may be scheduled on it.
*
* <p>Note that calling this method from within the run method of a tim
er task that was invoked by this timer
* absolutely guarantees that the ongoing task execution is
the last task execution that will ever be performed
* by this timer.
*
* <p>This method may be called repeatedly; the second and subsequent c
alls have no effect.
*/
void Cancel();
}; };
} }
#endif #endif
 End of changes. 9 change blocks. 
40 lines changed or deleted 44 lines changed or added


 jwatch.h   jwatch.h 
skipping to change at line 40 skipping to change at line 40
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jwatch_type_t { enum jwatch_type_t {
ANALOGIC_WATCH, JWT_CRONOMETERUP,
CRONOMETERUP_WATCH, JWT_CRONOMETERDOWN,
CRONOMETERDOWN_WATCH JWT_ANALOGIC
}; };
class ButtonListener; class ButtonListener;
class ButtonEvent; class ButtonEvent;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
skipping to change at line 70 skipping to change at line 70
_paused; _paused;
jwatch_type_t _type; jwatch_type_t _type;
jhorizontal_align_t _halign; jhorizontal_align_t _halign;
jvertical_align_t _valign; jvertical_align_t _valign;
public: public:
/** /**
* \brief * \brief
* *
*/ */
Watch(jwatch_type_t type = ANALOGIC_WATCH, int x = 0, int y = 0, int width = DEFAULT_COMPONENT_WIDTH, int height = DEFAULT_COMPONENT_HE IGHT); Watch(jwatch_type_t type = JWT_ANALOGIC, int x = 0, int y = 0, int width = DEFAULT_COMPONENT_WIDTH, int height = DEFAULT_COMPONENT_HEIG HT);
/** /**
* \brief * \brief
* *
*/ */
virtual ~Watch(); virtual ~Watch();
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jwindowevent.h   jwindowevent.h 
skipping to change at line 31 skipping to change at line 31
#define J_WINDOWEVENT_H #define J_WINDOWEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jwindow_event_t { enum jwindowevent_type_t {
WINDOW_CLOSING_EVENT, JWT_CLOSING,
WINDOW_CLOSED_EVENT, JWT_CLOSED,
WINDOW_OPENED_EVENT, JWT_OPENED,
WINDOW_RESIZED_EVENT, JWT_RESIZED,
WINDOW_MOVED_EVENT, JWT_MOVED,
WINDOW_PAINTED_EVENT JWT_PAINTED
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class WindowEvent : public jcommon::EventObject{ class WindowEvent : public jcommon::EventObject{
private: private:
jwindow_event_t _type; jwindowevent_type_t _type;
public: public:
/** /**
* \brief * \brief
* *
*/ */
WindowEvent(void *source, jwindow_event_t type); WindowEvent(void *source, jwindowevent_type_t type);
/** /**
* \brief * \brief
* *
*/ */
virtual ~WindowEvent(); virtual ~WindowEvent();
/** /**
* \brief * \brief
* *
*/ */
virtual jwindow_event_t GetType(); virtual jwindowevent_type_t GetType();
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
10 lines changed or deleted 10 lines changed or added


 jwrapperprocess.h   jwrapperprocess.h 
skipping to change at line 40 skipping to change at line 40
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#endif #endif
#include <stdint.h> #include <stdint.h>
namespace jshared { namespace jshared {
enum jwprocess_mode_t {
FLUSH_WRITE_BUFFER,
WAIT_ANY_INPUT,
WAIT_ALL_INPUT,
TRY_ONCE
};
enum jwprocess_flag_t {
PROCESS_CREAT, /** \brief Create a new process */
PROCESS_LOCK /** \brief Create a new process and block parent */
};
/** /**
* \brief Socket. * \brief Socket.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class WrapperProcess : public virtual jcommon::Object{ class WrapperProcess : public virtual jcommon::Object{
private: private:
#ifdef _WIN32 #ifdef _WIN32
/** \brief */ /** \brief */
 End of changes. 1 change blocks. 
12 lines changed or deleted 0 lines changed or added


 jyesnodialogbox.h   jyesnodialogbox.h 
skipping to change at line 39 skipping to change at line 39
#include "jdate.h" #include "jdate.h"
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
namespace jgui { namespace jgui {
enum jyesno_response_t { enum jdialog_result_t {
YES_RESPONSE, JDR_YES,
NO_RESPONSE JDR_NO,
JDR_CANCEL
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class YesNoDialogBox : public jgui::Frame, public jgui::ButtonListener{ class YesNoDialogBox : public jgui::Frame, public jgui::ButtonListener{
private: private:
skipping to change at line 75 skipping to change at line 76
/** /**
* \brief * \brief
* *
*/ */
virtual ~YesNoDialogBox(); virtual ~YesNoDialogBox();
/** /**
* \brief * \brief
* *
*/ */
virtual jyesno_response_t GetResponse(); virtual jdialog_result_t GetResponse();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetHorizontalAlign(jhorizontal_align_t align); virtual void SetHorizontalAlign(jhorizontal_align_t align);
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
4 lines changed or deleted 5 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/