jadjustmentevent.h   jadjustmentevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 ADJUSTMENTEVENT_H #ifndef J_ADJUSTMENTEVENT_H
#define ADJUSTMENTEVENT_H #define J_ADJUSTMENTEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jadjustmentlistener.h   jadjustmentlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 ADJUSTMENTLISTENER_H #ifndef J_ADJUSTMENTLISTENER_H
#define ADJUSTMENTLISTENER_H #define J_ADJUSTMENTLISTENER_H
#include "jadjustmentevent.h" #include "jadjustmentevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 janimation.h   janimation.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 ANIMATION_H #ifndef J_ANIMATION_H
#define ANIMATION_H #define J_ANIMATION_H
#include "jruntimeexception.h" #include "jruntimeexception.h"
#include "jstringtokenizer.h" #include "jstringtokenizer.h"
#include "jstringutils.h" #include "jstringutils.h"
#include "jthread.h" #include "jthread.h"
#include "jtextlistener.h" #include "jtextlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include "joffscreenimage.h" #include "joffscreenimage.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jbitinputstream.h   jbitinputstream.h 
skipping to change at line 69 skipping to change at line 69
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetPosition(); virtual int64_t GetPosition();
/** /**
* \brief * \brief
* *
*/ */
virtual int Read(); virtual int Read();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Read(char *, long long size); virtual int64_t Read(char *, int64_t size);
/** /**
* \brief Salto relativo. * \brief Salto relativo.
* *
*/ */
virtual void Skip(long long skip); virtual void Skip(int64_t skip);
/** /**
* \brief * \brief
* *
*/ */
virtual void Reset(); virtual void Reset();
/** /**
* \brief * \brief
* *
skipping to change at line 129 skipping to change at line 129
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetReceiveBytes(); virtual int64_t GetReceiveBytes();
}; };
} }
#endif #endif
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jbitoutputstream.h   jbitoutputstream.h 
skipping to change at line 70 skipping to change at line 70
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(int b); virtual int Write(int b);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Write(char *, long long size); virtual int64_t Write(char *, int64_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Flush(); virtual int64_t Flush();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
skipping to change at line 112 skipping to change at line 112
/** /**
* \brief * \brief
* *
*/ */
void WriteBits(int bits, int num); void WriteBits(int bits, int num);
/** /**
* \brief * \brief
* *
*/ */
long long GetSentBytes(); int64_t GetSentBytes();
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 jbitstream.h   jbitstream.h 
skipping to change at line 72 skipping to change at line 72
/** /**
* \brief * \brief
* *
*/ */
unsigned long long GetBits(int size); unsigned long long GetBits(int size);
/** /**
* \brief * \brief
* *
*/ */
unsigned char * GetBitsArray(int size); uint8_t* GetBitsArray(int size);
/** /**
* \brief * \brief
* *
*/ */
int Skip(int n); int Skip(int n);
/** /**
* \brief * \brief
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 jborderlayout.h   jborderlayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 BORDERLAYOUT_H #ifndef J_BORDERLAYOUT_H
#define BORDERLAYOUT_H #define J_BORDERLAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jbufferedreader.h   jbufferedreader.h 
skipping to change at line 59 skipping to change at line 59
/** /**
* \brief * \brief
* *
*/ */
virtual ~BufferedReader(); virtual ~BufferedReader();
/** /**
* \brief * \brief
* *
*/ */
bool EndOfFile(); bool IsEOF();
/** /**
* \brief * \brief
* *
*/ */
int Available(); int Available();
/** /**
* \brief * \brief
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 jbutton.h   jbutton.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 BUTTON_H #ifndef J_BUTTON_H
#define BUTTON_H #define J_BUTTON_H
#include "jcomponent.h" #include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jbuttonevent.h   jbuttonevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 BUTTONEVENT_H #ifndef J_BUTTONEVENT_H
#define BUTTONEVENT_H #define J_BUTTONEVENT_H
#include "jbutton.h" #include "jbutton.h"
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jbuttonlistener.h   jbuttonlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 BUTTONLISTENER_H #ifndef J_BUTTONLISTENER_H
#define BUTTONLISTENER_H #define J_BUTTONLISTENER_H
#include "jbuttonevent.h" #include "jbuttonevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcalendardialog.h   jcalendardialog.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CALENDARDIALOG_H #ifndef J_CALENDARDIALOG_H
#define CALENDARDIALOG_H #define J_CALENDARDIALOG_H
#include "jbutton.h" #include "jbutton.h"
#include "jcalendarlistener.h" #include "jcalendarlistener.h"
#include "jspin.h" #include "jspin.h"
#include "jselectlistener.h" #include "jselectlistener.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "jlabel.h" #include "jlabel.h"
#include "jframe.h" #include "jframe.h"
#include "jthread.h" #include "jthread.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcalendarevent.h   jcalendarevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CALENDAREVENT_H #ifndef J_CALENDAREVENT_H
#define CALENDAREVENT_H #define J_CALENDAREVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcalendarlistener.h   jcalendarlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CALENDARLISTENER_H #ifndef J_CALENDARLISTENER_H
#define CALENDARLISTENER_H #define J_CALENDARLISTENER_H
#include "jcalendarevent.h" #include "jcalendarevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcanvas.h   jcanvas.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CANVAS_H #ifndef J_CANVAS_H
#define CANVAS_H #define J_CANVAS_H
#include "jcomponent.h" #include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcardlayout.h   jcardlayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CARDLAYOUT_H #ifndef J_CARDLAYOUT_H
#define CARDLAYOUT_H #define J_CARDLAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jchannel.h   jchannel.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_CHANNEL_H #ifndef J_CHANNEL_H
#define J_CHANNEL_H #define J_CHANNEL_H
#include "jobject.h" #include "jobject.h"
#include <string> #include <string>
#include <stdint.h>
namespace jio { namespace jio {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Channel : public virtual jcommon::Object{ class Channel : public virtual jcommon::Object{
private: private:
skipping to change at line 67 skipping to change at line 69
/** /**
* \brief Acquires an exclusive lock on this channel's file. * \brief Acquires an exclusive lock on this channel's file.
* *
*/ */
virtual void Lock(); virtual void Lock();
/** /**
* \brief Returns this channel's file position. * \brief Returns this channel's file position.
* *
*/ */
virtual long long GetPosition(); virtual int64_t GetPosition();
/** /**
* \brief Sets this channel's file position. * \brief Sets this channel's file position.
* *
*/ */
virtual long long SetPosition(long long p); virtual int64_t SetPosition(int64_t p);
/** /**
* \brief Reads a sequence of bytes from this channel into the given buffer. * \brief Reads a sequence of bytes from this channel into the given buffer.
* *
*/ */
virtual long long Read(char *b, long long size, long long of fset = 0); virtual int64_t Read(char *b, int64_t size, int64_t offset = 0);
/** /**
* \brief Returns the current size of this channel's file. * \brief Returns the current size of this channel's file.
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief Writes a sequence of bytes to this channel from th e given buffer. * \brief Writes a sequence of bytes to this channel from th e given buffer.
* *
*/ */
virtual long Write(char *b, long long size, long long offset = 0); virtual int64_t Write(char *b, int64_t size, int64_t offset = 0);
/** /**
* \brief Transfers bytes into this channel's file from the given readable byte channel. * \brief Transfers bytes into this channel's file from the given readable byte channel.
* *
*/ */
virtual long long Transfer(Channel *in, long long count_in, long long position_int, Channel *out, long long count_out, long long positi on_out); virtual int64_t Transfer(Channel *in, int64_t count_in, int6 4_t position_int, Channel *out, int64_t count_out, int64_t position_out);
/** /**
* \brief * \brief
* *
*/ */
virtual std::string what(); virtual std::string what();
}; };
} }
 End of changes. 7 change blocks. 
6 lines changed or deleted 8 lines changed or added


 jcheckbutton.h   jcheckbutton.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CHECKButton_H #ifndef J_CHECKButton_H
#define CHECKButton_H #define J_CHECKButton_H
#include "jcomponent.h" #include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcheckbuttonevent.h   jcheckbuttonevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CHECKBUTTONEVENT_H #ifndef J_CHECKBUTTONEVENT_H
#define CHECKBUTTONEVENT_H #define J_CHECKBUTTONEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcheckbuttongroup.h   jcheckbuttongroup.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CHECKBUTTONGROUP_H #ifndef J_CHECKBUTTONGROUP_H
#define CHECKBUTTONGROUP_H #define J_CHECKBUTTONGROUP_H
#include "jeventobject.h" #include "jeventobject.h"
#include "jcheckbutton.h" #include "jcheckbutton.h"
#include "jcheckbuttonlistener.h" #include "jcheckbuttonlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcheckbuttonlistener.h   jcheckbuttonlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CHECKBUTTONLISTENER_H #ifndef J_CHECKBUTTONLISTENER_H
#define CHECKBUTTONLISTENER_H #define J_CHECKBUTTONLISTENER_H
#include "jcheckbuttonevent.h" #include "jcheckbuttonevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcombobox.h   jcombobox.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 COMBOBOX_H #ifndef J_COMBOBOX_H
#define COMBOBOX_H #define J_COMBOBOX_H
#include "jselectlistener.h" #include "jselectlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include "jmenu.h" #include "jmenu.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
skipping to change at line 56 skipping to change at line 56
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class ComboMenu : public jgui::Frame, public jgui::FrameInputListener{ class ComboMenu : public jgui::Frame, public jgui::FrameInputListener{
friend class ComboMenuComponent; friend class ComboMenuComponent;
private: private:
jthread::Mutex _menu_mutex; jthread::Mutex _menu_mutex;
std::vector<ComboMenu *> _menus; std::vector<ComboMenu *> _menus;
std::vector<MenuListener *> _listeners; std::vector<MenuListener *> _menu_listeners;
MenuItem *_current_item; MenuItem *_current_item;
ComboMenuComponent *_list; ComboMenuComponent *_list;
int _visible_items; int _visible_items;
jmenu_align_t _menu_align; jmenu_align_t _menu_align;
private: private:
/** /**
* \brief * \brief
* *
*/ */
skipping to change at line 182 skipping to change at line 182
/** /**
* \brief * \brief
* *
*/ */
void RemoveAll(); void RemoveAll();
/** /**
* \brief * \brief
* *
*/ */
uint32_t GetItemColor(); jcolor_t GetItemColor();
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetForegroundColor(uint32_t color); void SetForegroundColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetBackgroundColor(uint32_t color); void SetBackgroundColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
skipping to change at line 269 skipping to change at line 269
int bx, int bx,
by, by,
bwidth, bwidth,
bheight, bheight,
_item_size, _item_size,
_index, _index,
_visible_items, _visible_items,
_paint_count, _paint_count,
_vertical_gap, _vertical_gap,
_horizontal_gap; _horizontal_gap;
int _item_red, jcolor_t _item_color;
_item_green,
_item_blue,
_item_alpha;
float delta; float delta;
bool _input_locked, bool _input_locked,
_arrows_visible, _arrows_visible,
_loop; _loop;
/** /**
* \brief * \brief
* *
*/ */
void SetComboMenu(ComboMenu *menu); void SetComboMenu(ComboMenu *menu);
skipping to change at line 385 skipping to change at line 382
/** /**
* \brief * \brief
* *
*/ */
void RemoveAll(); void RemoveAll();
/** /**
* \brief * \brief
* *
*/ */
uint32_t GetItemColor(); jcolor_t GetItemColor();
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
 End of changes. 9 change blocks. 
13 lines changed or deleted 10 lines changed or added


 jcommonlib.h   jcommonlib.h 
skipping to change at line 31 skipping to change at line 31
#define J_COMMONLIB_H #define J_COMMONLIB_H
#include "jmutex.h" #include "jmutex.h"
#define JINFO 1 #define JINFO 1
#define JWARN 2 #define JWARN 2
#define JERRO 3 #define JERRO 3
#ifdef JDEBUG_ENABLED #ifdef JDEBUG_ENABLED
#define JDEBUG(t, args...) #define JDEBUG(t, args...)
\
if (t == JINFO) {
\
\ if (t == JINFO) {
\
printf ("\033[37;40mINFO:: %s:%d [%s] \033[37;40m", __FILE__ , __LINE__, __PRETTY_FUNCTION__); \ printf ("\033[37;40mINFO:: %s:%d [%s] \033[37;40m", __FILE__ , __LINE__, __PRETTY_FUNCTION__); \
} else if (t == JWARN) { \ } else if (t == JWARN) { \
printf ("\033[33;40mWARN:: %s:%d [%s] \033[37;40m", __FILE__ , __LINE__, __PRETTY_FUNCTION__); \ printf ("\033[33;40mWARN:: %s:%d [%s] \033[37;40m", __FILE__ , __LINE__, __PRETTY_FUNCTION__); \
} else if (t == JERRO) { \ } else if (t == JERRO) { \
printf ("\033[31;40mERRO:: %s:%d [%s] \033[37;40m", __FILE__ , __LINE__, __PRETTY_FUNCTION__); \ printf ("\033[31;40mERRO:: %s:%d [%s] \033[37;40m", __FILE__ , __LINE__, __PRETTY_FUNCTION__); \
} }
\
printf(args);
\ \
fflush(stdin); printf(args);
\
\
fflush(stdin);
\
#else #else
#define JDEBUG(t, args...) #define JDEBUG(t, args...)
#endif #endif
void jLibLock();
void jLibUnlock();
#endif #endif
 End of changes. 5 change blocks. 
20 lines changed or deleted 28 lines changed or added


 jcomponent.h   jcomponent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 COMPONENT_H #ifndef J_COMPONENT_H
#define COMPONENT_H #define J_COMPONENT_H
#include "jobject.h" #include "jobject.h"
#include "jguilib.h" #include "jguilib.h"
#include "jkeyevent.h" #include "jkeyevent.h"
#include "jgraphics.h" #include "jgraphics.h"
#include "jmutex.h" #include "jmutex.h"
#include "jautolock.h" #include "jautolock.h"
#include "jcomponentlistener.h" #include "jcomponentlistener.h"
#include "jfont.h" #include "jfont.h"
#include "jgfxhandler.h" #include "jgfxhandler.h"
skipping to change at line 46 skipping to change at line 46
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#define DEFAULT_COMPONENT_WIDTH 100 #define DEFAULT_COMPONENT_WIDTH 100
#define DEFAULT_COMPONENT_HEIGHT 40 #define DEFAULT_COMPONENT_HEIGHT 40
#define CENTER_VERTICAL_TEXT \ #define CENTER_VERTICAL_TEXT \
(_font==NULL)?0:(_font->GetHeight()>_height)?0:((_height-_font->GetH eight())/2) (_font==NULL)?0:(_font->GetHeight()>_size.height)?0:((_size.height-_ font->GetHeight())/2)
/* /*
#define CENTER_VERTICAL_ERROR \ #define CENTER_VERTICAL_ERROR \
(int)(_font->GetHeight()/(2.25*(double)GFXHandler::GetInstance()->Ge tScreenHeight()/(double)DEFAULT_SCALE_HEIGHT)) (int)(_font->GetHeight()/(2.25*(double)GFXHandler::GetInstance()->Ge tScreenHeight()/(double)DEFAULT_SCALE_HEIGHT))
#define CENTER_VERTICAL_TEXT \ #define CENTER_VERTICAL_TEXT \
(_font==NULL)?0:(_font->GetHeight()>_height)?0:((_height-_font->GetH eight())/2-CENTER_VERTICAL_ERROR)<0?0:((_height-_font->GetHeight())/2-CENTE R_VERTICAL_ERROR) (_font==NULL)?0:(_font->GetHeight()>_height)?0:((_height-_font->GetH eight())/2-CENTER_VERTICAL_ERROR)<0?0:((_height-_font->GetHeight())/2-CENTE R_VERTICAL_ERROR)
*/ */
namespace jgui { namespace jgui {
skipping to change at line 153 skipping to change at line 153
jthread::Mutex _component_mutex; jthread::Mutex _component_mutex;
std::vector<FocusListener *> _focus_listeners; std::vector<FocusListener *> _focus_listeners;
std::vector<ComponentListener *> _component_listeners; std::vector<ComponentListener *> _component_listeners;
Component *_left, Component *_left,
*_right, *_right,
*_up, *_up,
*_down; *_down;
jgui::Container *_parent; jgui::Container *_parent;
jgui::Font *_font; jgui::Font *_font;
int _x, jpoint_t _location;
_y, jsize_t _size,
_width, _minimum_size,
_height, _maximum_size,
_minimum_width, _preferred_size;
_minimum_height, jcolor_t _bg_color,
_maximum_width, _fg_color,
_maximum_height, _bgfocus_color,
_preferred_width, _fgfocus_color,
_preferred_height, _border_color,
_border_size; _borderfocus_color;
// disabled colors jcomponent_alignment_t _alignment_x,
int _bg_red,
_bg_green, _alignment_y;
_bg_blue, jcomponent_orientation_t _orientation;
_bg_alpha, jcomponent_border_t _border;
_fg_red, int _gradient_level,
_fg_green, _vertical_gap,
_fg_blue, _horizontal_gap,
_fg_alpha, _border_size;
_bgfocus_red,
_bgfocus_green,
_bgfocus_blue,
_bgfocus_alpha,
_fgfocus_red,
_fgfocus_green,
_fgfocus_blue,
_fgfocus_alpha,
_border_red,
_border_green,
_border_blue,
_border_alpha,
_borderfocus_red,
_borderfocus_green,
_borderfocus_blue,
_borderfocus_alpha,
_gradient_level,
_vertical_gap,
_horizontal_gap;
bool _has_focus, bool _has_focus,
_is_visible, _is_visible,
_ignore_repaint, _ignore_repaint,
_truncate_string, _truncate_string,
_background_visible, _background_visible,
_is_focusable, _is_focusable,
_enabled, _enabled,
_theme_enabled, _theme_enabled,
_is_opaque, _is_opaque,
_is_valid; _is_valid;
jcomponent_border_t _border;
jcomponent_alignment_t _alignment_x,
_alignment_y;
jcomponent_orientation_t _orientation;
/** /**
* \brief * \brief
* *
*/ */
std::string TruncateString(std::string text, int width); std::string TruncateString(std::string text, int width);
protected: protected:
/** /**
* \brief render surface using component_border_t parameter * \brief render surface using component_border_t parameter
skipping to change at line 447 skipping to change at line 423
/** /**
* \brief * \brief
* *
*/ */
virtual bool HasFocus(); virtual bool HasFocus();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetMinimumSize(int w, int h); virtual void SetBorder(jcomponent_border_t t);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetMaximumSize(int w, int h); virtual void SetBorderSize(int size);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetPreferredSize(int w, int h); virtual void SetMinimumSize(jsize_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual int GetMinimumWidth(); virtual void SetMaximumSize(jsize_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual int GetMinimumHeight(); virtual void SetPreferredSize(jsize_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual int GetMaximumWidth(); virtual jsize_t GetMinimumSize();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetMaximumHeight(); virtual jsize_t GetMaximumSize();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetPreferredWidth(); virtual jsize_t GetPreferredSize();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetPreferredHeight(); virtual void Move(int x, int y);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBorder(jcomponent_border_t t); virtual void Move(jpoint_t location);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBorderSize(int size); virtual void SetBounds(int x, int y, int w, int h);
/** /**
* \brief * \brief
* *
*/ */
virtual void Move(int x, int y); virtual void SetBounds(jpoint_t location, jsize_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBounds(int x, int y, int w, int h); virtual void SetBounds(jregion_t region);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetPosition(int x, int y); virtual void SetLocation(int x, int y);
/**
* \brief
*
*/
virtual void SetLocation(jpoint_t point);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetSize(int width, int height); virtual void SetSize(int width, int height);
/** /**
* \brief * \brief
* *
*/ */
virtual int GetX(); virtual void SetSize(jsize_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual int GetY(); virtual int GetX();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetWidth(); virtual int GetY();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetHeight(); virtual int GetWidth();
/** /**
* \brief * \brief
* *
*/ */
virtual void Paint(Graphics *g); virtual int GetHeight();
/** /**
* \brief * \brief
* *
*/ */
virtual void PaintBorder(Graphics *g); virtual jpoint_t GetLocation();
/** /**
* \brief * \brief
* *
*/ */
virtual void Repaint(bool all = false); virtual jsize_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetGradientLevel(int level); virtual void SetGradientLevel(int level);
/** /**
* \brief * \brief
* *
skipping to change at line 633 skipping to change at line 615
/** /**
* \brief * \brief
* *
*/ */
virtual void PutBelow(Component *c); virtual void PutBelow(Component *c);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBackgroundColor(uint32_t color); virtual void SetBackgroundColor(int red, int green, int blue , int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetForegroundColor(uint32_t color); virtual void SetForegroundColor(int red, int green, int blue , int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBackgroundFocusColor(uint32_t color); virtual void SetBackgroundFocusColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetForegroundFocusColor(uint32_t color); virtual void SetForegroundFocusColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBorderColor(uint32_t color); virtual void SetBorderColor(int red, int green, int blue, in t alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBackgroundColor(int red, int green, int blue , int alpha); virtual void SetBorderFocusColor(int red, int green, int blu e, int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetForegroundColor(int red, int green, int blue , int alpha); virtual void SetBackgroundColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBorderColor(int red, int green, int blue, in t alpha); virtual void SetForegroundColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBackgroundFocusColor(int red, int green, int blue, int alpha); virtual void SetBackgroundFocusColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetForegroundFocusColor(int red, int green, int blue, int alpha); virtual void SetForegroundFocusColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetBorderFocusColor(int red, int green, int blu e, int alpha); virtual void SetBorderColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
virtual unsigned int GetBackgroundColor(); virtual void SetBorderFocusColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
virtual unsigned int GetForegroundColor(); virtual jcolor_t GetBackgroundColor();
/** /**
* \brief * \brief
* *
*/ */
virtual unsigned int GetBackgroundFocusColor(); virtual jcolor_t GetForegroundColor();
/** /**
* \brief * \brief
* *
*/ */
virtual unsigned int GetForegroundFocusColor(); virtual jcolor_t GetBackgroundFocusColor();
/** /**
* \brief * \brief
* *
*/ */
virtual unsigned int GetBorderColor(); virtual jcolor_t GetForegroundFocusColor();
/**
* \brief
*
*/
virtual jcolor_t GetBorderColor();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetFocusable(bool b); virtual void SetFocusable(bool b);
/** /**
* \brief * \brief
* *
skipping to change at line 747 skipping to change at line 735
/** /**
* \brief * \brief
* *
*/ */
virtual bool Intersect(int x, int y); virtual bool Intersect(int x, int y);
/** /**
* \brief * \brief
* *
*/ */
virtual void Paint(Graphics *g);
/**
* \brief
*
*/
virtual void PaintBorder(Graphics *g);
/**
* \brief
*
*/
virtual void Repaint(bool all = false);
/**
* \brief
*
*/
void RegisterFocusListener(FocusListener *listener); void RegisterFocusListener(FocusListener *listener);
/** /**
* \brief * \brief
* *
*/ */
void RemoveFocusListener(FocusListener *listener); void RemoveFocusListener(FocusListener *listener);
/** /**
* \brief * \brief
 End of changes. 42 change blocks. 
84 lines changed or deleted 90 lines changed or added


 jcomponentevent.h   jcomponentevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 COMPONENTEVENT_H #ifndef J_COMPONENTEVENT_H
#define COMPONENTEVENT_H #define J_COMPONENTEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcomponentlistener.h   jcomponentlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 COMPONENTLISTENER_H #ifndef J_COMPONENTLISTENER_H
#define COMPONENTLISTENER_H #define J_COMPONENTLISTENER_H
#include "jcomponentevent.h" #include "jcomponentevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 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 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CONTAINER_H #ifndef J_CONTAINER_H
#define CONTAINER_H #define J_CONTAINER_H
#include "jobject.h" #include "jobject.h"
#include "jguilib.h" #include "jguilib.h"
#include "jgraphics.h" #include "jgraphics.h"
#include "jcomponent.h" #include "jcomponent.h"
#include "jcontainerlistener.h" #include "jcontainerlistener.h"
#include "jcontainerevent.h" #include "jcontainerevent.h"
#include "jborderlayout.h" #include "jborderlayout.h"
#include "jgridbaglayout.h" #include "jgridbaglayout.h"
#include "jscrollbar.h" #include "jscrollbar.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcontainerevent.h   jcontainerevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CONTAINEREVENT_H #ifndef J_CONTAINEREVENT_H
#define CONTAINEREVENT_H #define J_CONTAINEREVENT_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcontainerlistener.h   jcontainerlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 CONTAINERLISTENER_H #ifndef J_CONTAINERLISTENER_H
#define CONTAINERLISTENER_H #define J_CONTAINERLISTENER_H
#include "jcontainerevent.h" #include "jcontainerevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jcoordinatelayout.h   jcoordinatelayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 COORDINATELAYOUT_H #ifndef J_COORDINATELAYOUT_H
#define COORDINATELAYOUT_H #define J_COORDINATELAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include "jcontainer.h" #include "jcontainer.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jdatainputstream.h   jdatainputstream.h 
skipping to change at line 61 skipping to change at line 61
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetPosition(); virtual int64_t GetPosition();
/** /**
* \brief * \brief
* *
*/ */
virtual int Read(uint8_t *data); virtual int Read(uint8_t *data);
/** /**
* \brief * \brief
* *
skipping to change at line 103 skipping to change at line 103
/** /**
* \brief * \brief
* *
*/ */
virtual int Read(uint64_t *data); virtual int Read(uint64_t *data);
/** /**
* \brief Salto relativo. * \brief Salto relativo.
* *
*/ */
virtual void Skip(long long skip); virtual void Skip(int64_t skip);
/** /**
* \brief * \brief
* *
*/ */
virtual void Reset(); virtual void Reset();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetReceiveBytes(); virtual int64_t GetReceiveBytes();
}; };
} }
#endif #endif
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jdataoutputstream.h   jdataoutputstream.h 
skipping to change at line 24 skipping to change at line 24
* * * *
* 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_DATAOUTPUTSTREAM_H #ifndef J_DATAOUTPUTSTREAM_H
#define J_DATAOUTPUTSTREAM_H #define J_DATAOUTPUTSTREAM_H
#include "joutputstream.h" #include "joutputstream.h"
#include <stdint.h>
namespace jio { namespace jio {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class DataOutputStream : public jcommon::Object{ class DataOutputStream : public jcommon::Object{
skipping to change at line 61 skipping to change at line 60
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(uint8_t data); virtual int Write(uint8_t data);
/** /**
* \brief * \brief
* *
skipping to change at line 91 skipping to change at line 90
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(uint64_t data); virtual int Write(uint64_t data);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Flush(); virtual int64_t Flush();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
long long GetSentBytes(); int64_t GetSentBytes();
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 3 lines changed or added


 jfile.h   jfile.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 JFILE_H #ifndef J_FILE_H
#define JFILE_H #define J_FILE_H
#include "jobject.h" #include "jobject.h"
#include <string> #include <string>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
skipping to change at line 203 skipping to change at line 203
/** /**
* \brief * \brief
* *
*/ */
bool IsDirectory(); bool IsDirectory();
/** /**
* \brief Retorna o tamanho, em bytes, do aquivo. * \brief Retorna o tamanho, em bytes, do aquivo.
* *
*/ */
long long GetSize(); int64_t GetSize();
/** /**
* \brief Retorna o nome do arquivo/diretorio. * \brief Retorna o nome do arquivo/diretorio.
* *
*/ */
std::string GetName(); std::string GetName();
/** /**
* \brief Retorna caminho do arquivo/diretorio. * \brief Retorna caminho do arquivo/diretorio.
* *
skipping to change at line 263 skipping to change at line 263
/** /**
* \brief Retorna a data da ultima modificacao do status do arquivo. * \brief Retorna a data da ultima modificacao do status do arquivo.
* *
*/ */
time_t GetTimeLastStatusChange(); time_t GetTimeLastStatusChange();
/** /**
* \brief * \brief
* *
*/ */
long Read(char *data_, long length_); int64_t Read(char *data_, int64_t length_);
/** /**
* \brief * \brief
* *
*/ */
long Write(const char *data_, long length_); int64_t Write(const char *data_, int64_t length_);
/** /**
* \brief * \brief
* *
*/ */
void Flush(); void Flush();
/** /**
* \brief * \brief
* *
skipping to change at line 329 skipping to change at line 329
/** /**
* \brief * \brief
* *
*/ */
void Reset(); void Reset();
/** /**
* \brief * \brief
* *
*/ */
int Seek(int n); int64_t Seek(int64_t n);
/** /**
* \brief Find a file in the directory opened. * \brief Find a file in the directory opened.
* *
*/ */
bool ExistsFile(std::string file_); bool ExistsFile(std::string file_);
/** /**
* \brief * \brief
* *
 End of changes. 5 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jfilechooserdialog.h   jfilechooserdialog.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 FILESYSTEMDIALOG_H #ifndef J_FILESYSTEMDIALOG_H
#define FILESYSTEMDIALOG_H #define J_FILESYSTEMDIALOG_H
#include "jframe.h" #include "jframe.h"
#include "jselectlistener.h" #include "jselectlistener.h"
#include "jlistbox.h" #include "jlistbox.h"
#include "jlabel.h" #include "jlabel.h"
#include "jmutex.h" #include "jmutex.h"
#include "jtextfield.h" #include "jtextfield.h"
#include <string> #include <string>
#include <iostream> #include <iostream>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jfileinputstream.h   jfileinputstream.h 
skipping to change at line 36 skipping to change at line 36
namespace jio { namespace jio {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class FileInputStream : public jio::InputStream{ class FileInputStream : public jio::InputStream{
private: private:
/** \brief Seek */
int _current;
/** \brief */ /** \brief */
File *_file; File *_file;
/** \brief */ /** \brief */
unsigned char *_buffer; uint8_t *_buffer;
/** \brief */ /** \brief Seek */
int _buffer_size; int64_t _current,
/** \brief */ _buffer_size,
int _buffer_index; _buffer_index;
/** \brief */
bool _is_eof, bool _is_eof,
_flag; _flag;
public: public:
/** /**
* \brief * \brief
* *
*/ */
FileInputStream(std::string filename_); FileInputStream(std::string filename_);
/** /**
* \brief * \brief
skipping to change at line 78 skipping to change at line 75
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetPosition(); virtual int64_t GetPosition();
/** /**
* \brief * \brief
* *
*/ */
virtual int Read(); virtual int Read();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Read(char *, long long size); virtual int64_t Read(char *, int64_t size);
/** /**
* \brief Salto relativo. * \brief Salto relativo.
* *
*/ */
virtual void Skip(long long skip); virtual void Skip(int64_t skip);
/** /**
* \brief * \brief
* *
*/ */
virtual void Reset(); virtual void Reset();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetReceiveBytes(); virtual int64_t GetReceiveBytes();
}; };
} }
#endif #endif
 End of changes. 9 change blocks. 
15 lines changed or deleted 12 lines changed or added


 jfileoutputstream.h   jfileoutputstream.h 
skipping to change at line 37 skipping to change at line 37
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class FileOutputStream : public jio::OutputStream{ class FileOutputStream : public jio::OutputStream{
private: private:
/** \brief Seek */ /** \brief Seek */
long long _current; int64_t _current;
/** \brief */ /** \brief */
File *_file; File *_file;
/** \brief */ /** \brief */
char *_buffer; char *_buffer;
/** \brief */ /** \brief */
int _buffer_length; int _buffer_length;
/** \brief */ /** \brief */
int _current_index; int _current_index;
/** \brief */ /** \brief */
long long _sent_bytes; int64_t _sent_bytes;
public: public:
/** /**
* \brief * \brief
* *
*/ */
FileOutputStream(std::string filename_); FileOutputStream(std::string filename_);
/** /**
* \brief * \brief
skipping to change at line 78 skipping to change at line 78
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(int b); virtual int Write(int b);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Write(const char *, long long size); virtual int64_t Write(const char *, int64_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Flush(); virtual int64_t Flush();
/** /**
* \brief * \brief
* *
*/ */
virtual void Seek(long long index); virtual void Seek(int64_t index);
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
long long GetSentBytes(); int64_t GetSentBytes();
}; };
} }
#endif #endif
 End of changes. 8 change blocks. 
8 lines changed or deleted 8 lines changed or added


 jflowlayout.h   jflowlayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 FLOWLAYOUT_H #ifndef J_FLOWLAYOUT_H
#define FLOWLAYOUT_H #define J_FLOWLAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include "jcontainer.h" #include "jcontainer.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jfocusevent.h   jfocusevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 FOCUSEVENT_H #ifndef J_FOCUSEVENT_H
#define FOCUSEVENT_H #define J_FOCUSEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jfocuslistener.h   jfocuslistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 FOCUSLISTENER_H #ifndef J_FOCUSLISTENER_H
#define FOCUSLISTENER_H #define J_FOCUSLISTENER_H
#include "jfocusevent.h" #include "jfocusevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 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 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 FONT_H #ifndef J_FONT_H
#define FONT_H #define J_FONT_H
#include "jobject.h" #include "jobject.h"
#include "jmutex.h" #include "jmutex.h"
#include "jgraphics.h" #include "jgraphics.h"
#include <stdlib.h> #include <stdlib.h>
#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>
#ifdef DIRECTFB_UI
#include <directfb.h>
#endif
namespace jgui { namespace jgui {
/** /**
* \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;
 End of changes. 2 change blocks. 
6 lines changed or deleted 2 lines changed or added


 jframeinputlistener.h   jframeinputlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 FRAMEINPUTLISTENER_H #ifndef J_FRAMEINPUTLISTENER_H
#define FRAMEINPUTLISTENER_H #define J_FRAMEINPUTLISTENER_H
#include "jkeylistener.h" #include "jkeylistener.h"
#include "jmouselistener.h" #include "jmouselistener.h"
#include "jlistener.h" #include "jlistener.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jgfxhandler.h   jgfxhandler.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 GFXHANDLER_H #ifndef J_GFXHANDLER_H
#define GFXHANDLER_H #define J_GFXHANDLER_H
#include "jobject.h" #include "jobject.h"
#include "jmutex.h" #include "jmutex.h"
#include "jgraphics.h" #include "jgraphics.h"
#include <vector> #include <vector>
#include <map> #include <map>
#ifdef DIRECTFB_UI #ifdef DIRECTFB_UI
#include <directfb.h> #include <directfb.h>
skipping to change at line 54 skipping to change at line 54
SIZECORNER_CURSOR, SIZECORNER_CURSOR,
SIZEALL_CURSOR, SIZEALL_CURSOR,
SIZENS_CURSOR, SIZENS_CURSOR,
SIZEWE_CURSOR, SIZEWE_CURSOR,
SIZENWSE_CURSOR, SIZENWSE_CURSOR,
SIZENESW_CURSOR, SIZENESW_CURSOR,
WAIT_CURSOR WAIT_CURSOR
}; };
class OffScreenImage; class OffScreenImage;
class Window;
class WindowManager;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class GFXHandler : public virtual jcommon::Object{ class GFXHandler : public virtual jcommon::Object{
friend class Window;
friend class WindowManager;
protected: protected:
GFXHandler(); GFXHandler();
/** /**
* \brief * \brief
* *
*/ */
int InitEngine(); int InitEngine();
private: private:
skipping to change at line 130 skipping to change at line 135
* *
*/ */
void Add(OffScreenImage *); void Add(OffScreenImage *);
/** /**
* \brief * \brief
* *
*/ */
void Remove(OffScreenImage *); void Remove(OffScreenImage *);
public: #ifdef DIRECTFB_UI
/** /**
* \brief * \brief
* *
*/ */
virtual ~GFXHandler(); IDirectFBDisplayLayer * GetDisplayLayer();
/** /**
* \brief * \brief
* *
*/ */
static GFXHandler * GetInstance(); int CreateWindow(int x, int y, int width, int height, IDirec tFBWindow **window, IDirectFBSurface **surface, int opacity = 0xff, int sca le_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT);
/** /**
* \brief * \brief
* *
*/ */
static std::string GetID(); void CreateFont(std::string name, int height, IDirectFBFont
**font, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_S
CALE_HEIGHT);
#endif
public:
/** /**
* \brief * \brief
* *
*/ */
void * GetGraphicEngine(); virtual ~GFXHandler();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCurrentWorkingScreenSize(int width, int heig ht); static GFXHandler * GetInstance();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetScreenWidth(); static std::string GetID();
/** /**
* \brief * \brief
* *
*/ */
virtual int GetScreenHeight(); void * GetGraphicEngine();
/** /**
* \brief * \brief
* *
*/ */
virtual jpoint_t GetMousePosition(); virtual void SetWorkingScreenSize(int width, int height);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetMousePosition(int x, int y); virtual int GetScreenWidth();
/** /**
* \brief * \brief
* *
*/ */
virtual void InitCursors(); virtual int GetScreenHeight();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCursorEnabled(bool b); virtual jpoint_t GetMousePosition();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCursor(jcursor_style_t t); virtual void SetMousePosition(int x, int y);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCursor(OffScreenImage *shape, int hotx, int hoty); virtual void InitCursors();
#ifdef DIRECTFB_UI
/** /**
* \brief * \brief
* *
*/ */
IDirectFBDisplayLayer * GetDisplayLayer(); virtual void SetCursorEnabled(bool b);
/** /**
* \brief * \brief
* *
*/ */
int CreateWindow(int x, int y, int width, int height, IDirec tFBWindow **window, IDirectFBSurface **surface, int opacity = 0xff, int sca le_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT); virtual void SetCursor(jcursor_style_t t);
/** /**
* \brief * \brief
* *
*/ */
void CreateFont(std::string name, int height, IDirectFBFont virtual void SetCursor(OffScreenImage *shape, int hotx, int
**font, int scale_width = DEFAULT_SCALE_WIDTH, int scale_height = DEFAULT_S hoty);
CALE_HEIGHT);
#endif
/** /**
* \brief * \brief
* *
*/ */
virtual void Restore(); virtual void Restore();
/** /**
* \brief * \brief
* *
 End of changes. 22 change blocks. 
23 lines changed or deleted 29 lines changed or added


 jgraphics.h   jgraphics.h 
#ifndef GRAPHICS_H /**************************************************************************
#define GRAPHICS_H *
* Copyright (C) 2005 by Jeff Ferr
*
* root@sat
*
*
*
* This program is free software; you can redistribute it and/or modify
*
* it under the terms of the GNU General Public License as published by
*
* the Free Software Foundation; either version 2 of the License, or
*
* (at your option) any later version.
*
*
*
* This program is distributed in the hope that it will be useful,
*
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* GNU General Public License for more details.
*
*
*
* You should have received a copy of the GNU General Public License
*
* along with this program; if not, write to the
*
* Free Software Foundation, Inc.,
*
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
**************************************************************************
*/
#ifndef J_GRAPHICS_H
#define J_GRAPHICS_H
#include "jobject.h" #include "jobject.h"
#include "jmutex.h" #include "jmutex.h"
#include <stdlib.h> #include <stdlib.h>
#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>
#ifdef DIRECTFB_UI #ifdef DIRECTFB_UI
#include <directfb.h> #include <directfb.h>
#endif #endif
#define TRUNC_COLOR(red, green, blue, alpha) \ #define TRUNC_COLOR(red, green, blue, alpha) \
if (red < 0) { \ if (red < 0) { \
red = 0; \ red = 0; \
} \ }
\ \
if (green < 0) { \
green = 0; \ \
} \ if (green < 0) { \
\ green = 0; \
if (blue < 0) { \ }
blue = 0; \ \
} \
\ \
if (alpha < 0) { \ if (blue < 0) { \
alpha = 0; \ blue = 0; \
} \ }
\ \
if (red > 0xff) { \
red = 0xff; \ \
} \ if (alpha < 0) { \
\ alpha = 0; \
}
\
\
if (red > 0xff) { \
red = 0xff; \
}
\
\
if (green > 0xff) { \ if (green > 0xff) { \
green = 0xff; \ green = 0xff; \
} \ }
\ \
\
if (blue > 0xff) { \ if (blue > 0xff) { \
blue = 0xff; \ blue = 0xff; \
} \ }
\ \
\
if (alpha > 0xff) { \ if (alpha > 0xff) { \
alpha = 0xff; \ alpha = 0xff; \
} \ }
\
#define SCALE_TO_SCREEN(x, y, z) \ #define SCALE_TO_SCREEN(x, y, z) \
(int)floor(((double)x*(double)y)/(double)z) (int)floor(((double)x*(double)y)/(double)z)
// (int)round(((double)x*(double)y)/(double)z)
#define SCREEN_TO_SCALE(x, z, y) \ #define SCREEN_TO_SCALE(x, z, y) \
(int)floor(((double)x*(double)y)/(double)z) (int)floor(((double)x*(double)y)/(double)z)
#define DEFAULT_SCALE_WIDTH 1920 #define DEFAULT_SCALE_WIDTH 1920
#define DEFAULT_SCALE_HEIGHT 1080 #define DEFAULT_SCALE_HEIGHT 1080
namespace jgui{ namespace jgui{
/** /**
* \brief * \brief
* *
*/ */
enum jporter_duff_flags_t { enum jporter_duff_flags_t {
PD_NONE = 0x0001, // fs: sa fd: 1.0-sa PDF_NONE = 0x0001, // fs: sa fd: 1.0-sa
(defaults) (defaults)
PD_CLEAR = 0x0002, // fs: 0.0 fd: 0.0 PDF_CLEAR = 0x0002, // fs: 0.0 fd: 0.0
PD_SRC = 0x0004, // fs: 1.0 fd: 0.0 PDF_SRC = 0x0004, // fs: 1.0 fd: 0.0
PD_SRC_OVER = 0x0008, // fs: 1.0 fd: 1.0-sa PDF_SRC_OVER = 0x0008, // fs: 1.0 fd: 1.0-sa
PD_DST_OVER = 0x0010, // fs: 1.0-da fd: 1.0 PDF_DST_OVER = 0x0010, // fs: 1.0-da fd: 1.0
PD_SRC_IN = 0x0020, // fs: da fd: 0.0 PDF_SRC_IN = 0x0020, // fs: da fd: 0.0
PD_DST_IN = 0x0040, // fs: 0.0 fd: sa PDF_DST_IN = 0x0040, // fs: 0.0 fd: sa
PD_SRC_OUT = 0x0080, // fs: 1.0-da fd: 0.0 PDF_SRC_OUT = 0x0080, // fs: 1.0-da fd: 0.0
PD_DST_OUT = 0x0100, // fs: 0.0 fd: 1.0-sa PDF_DST_OUT = 0x0100, // fs: 0.0 fd: 1.0-sa
PD_SRC_ATOP = 0x0200, // fs: da fd: 1.0-sa PDF_SRC_ATOP = 0x0200, // fs: da fd: 1.0-sa
PD_DST_ATOP = 0x0400, // fs: 1.0-da fd: sa PDF_DST_ATOP = 0x0400, // fs: 1.0-da fd: sa
PD_ADD = 0x0800, // fs: 1.0 fd: 1.0 PDF_ADD = 0x0800, // fs: 1.0 fd: 1.0
PD_XOR = 0x1000 // fs: 1.0-da fd: 1. PDF_XOR = 0x1000 // fs: 1.0-da fd: 1.
0-sa 0-sa
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jdrawing_flags_t { enum jdrawing_flags_t {
NOFX_FLAG = 0x01, DF_NOFX = 0x01,
BLEND_FLAG = 0x02, DF_BLEND = 0x02,
XOR_FLAG = 0x04 DF_XOR = 0x04
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jblitting_flags_t { enum jblitting_flags_t {
NOFX_BLIT = 0x01, BF_NOFX = 0x01,
ALPHACHANNEL_BLIT = 0x02, BF_ALPHACHANNEL = 0x02,
COLORALPHA_BLIT = 0x04, BF_COLORALPHA = 0x04,
COLORIZE_BLIT = 0x08, BF_COLORIZE = 0x08,
DEINTERLACE_BLIT = 0x10, BF_DEINTERLACE = 0x10,
SRC_COLORKEY_BLIT = 0x20, BF_SRC_COLORKEY = 0x20,
DST_COLORKEY_BLIT = 0x40, BF_DST_COLORKEY = 0x40,
XOR_BLIT = 0x80 BF_XOR = 0x80
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jline_type_t { enum jline_type_t {
RECT_LINE = 0x01, RECT_LINE = 0x01,
ROUND_LINE = 0x02 ROUND_LINE = 0x02
}; };
skipping to change at line 181 skipping to change at line 199
* \brief * \brief
* *
*/ */
struct jinsets_t { struct jinsets_t {
int left; int left;
int top; int top;
int right; int right;
int bottom; int bottom;
}; };
/**
* \brief
*
*/
struct jcolor_t {
uint8_t alpha;
uint8_t red;
uint8_t green;
uint8_t blue;
jcolor_t Brighter(int r, int g, int b, int a)
{
r = red + r;
g = green + g;
b = blue + b;
a = alpha + a;
TRUNC_COLOR(r, g, b, a);
jcolor_t color;
color.red = r;
color.green = g;
color.blue = b;
color.alpha = a;
return color;
}
jcolor_t Darker(int r, int g, int b, int a)
{
return Brighter(-r, -g, -b, -a);
}
};
class Window; class Window;
class Image; class Image;
class Font; class Font;
class OffScreenImage; class OffScreenImage;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
skipping to change at line 216 skipping to change at line 270
private: private:
static Font *_default_font; static Font *_default_font;
jthread::Mutex graphics_mutex; jthread::Mutex graphics_mutex;
#ifdef DIRECTFB_UI #ifdef DIRECTFB_UI
IDirectFBSurface *surface; IDirectFBSurface *surface;
#endif #endif
std::vector<struct jregion_t> _clips;
struct jregion_t _clip; struct jregion_t _clip;
struct jpoint_t _translate; struct jpoint_t _translate;
struct jsize_t _screen; struct jsize_t _screen;
struct jsize_t _scale; struct jsize_t _scale;
Font *_font; struct jcolor_t _color;
double _radians;
int _red,
_green,
_blue,
_alpha,
_color,
_line_width;
jline_type_t _line_type; jline_type_t _line_type;
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; jporter_duff_flags_t _porter_duff_flags;
Font *_font;
double _radians;
int _line_width;
// INFO:: polygon functions // INFO:: polygon functions
void insertEdge(edge_t *list, edge_t *edge); void insertEdge(edge_t *list, edge_t *edge);
void makeEdgeRec(struct jpoint_t lower, struct jpoint_t uppe r, int yComp, edge_t *edge, edge_t *edges[]); void makeEdgeRec(struct jpoint_t lower, struct jpoint_t uppe r, int yComp, edge_t *edge, edge_t *edges[]);
void fillScan(int scan, edge_t *active); void fillScan(int scan, edge_t *active);
int yNext(int k, int cnt, jpoint_t pts[]); int yNext(int k, int cnt, jpoint_t pts[]);
void buildEdgeList(int cnt, jpoint_t pts[], edge_t *edges[]) ; void buildEdgeList(int cnt, jpoint_t pts[], edge_t *edges[]) ;
void updateActiveList(int scan, edge_t *active); void updateActiveList(int scan, edge_t *active);
void Polygon(int n, int coordinates[]); void Polygon(int n, int coordinates[]);
void Fill_polygon(int n, int ppts[]); void Fill_polygon(int n, int ppts[]);
skipping to change at line 271 skipping to change at line 320
/** /**
* \brief * \brief
* *
*/ */
static Font * GetDefaultFont(); static Font * GetDefaultFont();
/** /**
* \brief * \brief
* *
*/ */
void * GetSurface(); virtual void * GetNativeSurface();
/** /**
* \brief * \brief
* *
*/ */
void SetSurface(void *surface); virtual void SetNativeSurface(void *surface);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCurrentWorkingScreenSize(int width, int heig ht); virtual void SetWorkingScreenSize(int width, int height);
/** /**
* \brief * \brief
* *
*/ */
virtual OffScreenImage * Create(); virtual OffScreenImage * Create();
/** /**
* \brief * \brief
* *
skipping to change at line 325 skipping to change at line 374
/** /**
* \brief * \brief
* *
*/ */
virtual void SetClip(int x1, int y1, int width, int height); virtual void SetClip(int x1, int y1, int width, int height);
/** /**
* \brief * \brief
* *
*/ */
virtual jregion_t GetClipBounds(); virtual jregion_t GetClip();
/**
* \brief
*
*/
virtual int GetClipX();
/**
* \brief
*
*/
virtual int GetClipY();
/**
* \brief
*
*/
virtual int GetClipWidth();
/**
* \brief
*
*/
virtual int GetClipHeight();
/** /**
* \brief * \brief
* *
*/ */
virtual void ReleaseClip(); virtual void ReleaseClip();
/** /**
* \brief * \brief
* *
skipping to change at line 385 skipping to change at line 410
/** /**
* \brief * \brief
* *
*/ */
virtual void Flip(int x, int y, int w, int h); virtual void Flip(int x, int y, int w, int h);
/** /**
* \brief * \brief
* *
*/ */
virtual uint32_t GetColor(); virtual struct jcolor_t GetColor();
/**
* \brief
*
*/
virtual void SetColor(struct jcolor_t c);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetColor(uint32_t c); virtual void SetColor(uint32_t c);
/** /**
* \brief * \brief
* *
skipping to change at line 577 skipping to change at line 608
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawPolygon(int x, int y, jpoint_t *p, int num, bool close); virtual void DrawPolygon(int x, int y, jpoint_t *p, int num, bool close);
/** /**
* \brief * \brief
* *
*/ */
virtual void FillGradientRectangle(int x, int y, int w, int h, int sr, int sg, int sb, int sa, int dr, int dg, int db, int da = 0xFF, b ool horizontal = true); virtual void FillGradientRectangle(int x, int y, int w, int h, jcolor_t scolor, jcolor_t dcolor, bool horizontal = true);
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawGlyph(int symbol, int xp, int yp); virtual void DrawGlyph(int symbol, int xp, int yp);
/** /**
* \brief * \brief
* *
skipping to change at line 607 skipping to change at line 638
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(std::string img, int x, int y, int w, int h, int alpha = 0xff); virtual bool DrawImage(std::string img, int x, int y, int w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(std::string img, int sx, int sy, int
sw, int sh, int x, int y, int alpha = 0xff);
/**
* \brief
*
*/
virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff); virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(OffScreenImage *img, int x, int y, in t alpha = 0xff); virtual bool DrawImage(OffScreenImage *img, int x, int y, in t alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h, int alpha = 0xff); virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(OffScreenImage *img, int sx, int sy,
int sw, int sh, int x, int y, int alpha = 0xff);
/**
* \brief
*
*/
virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff); virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawString(std::string s, int x, int y); virtual void DrawString(std::string s, int x, int y);
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawStringJustified(std::string full_text, int x, int y, int width, int height, jalign_t align = JUSTIFY_ALIGN); virtual void DrawString(std::string full_text, int x, int y, int width, int height, jalign_t align = JUSTIFY_ALIGN);
/** /**
* \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. 22 change blocks. 
97 lines changed or deleted 176 lines changed or added


 jgridbaglayout.h   jgridbaglayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 *
* aint64_t with this program; if not, write to the * * aint64_t 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 GRIDBAGLAYOUT_H #ifndef J_GRIDBAGLAYOUT_H
#define GRIDBAGLAYOUT_H #define J_GRIDBAGLAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jgridlayout.h   jgridlayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 GRIDLAYOUT_H #ifndef J_GRIDLAYOUT_H
#define GRIDLAYOUT_H #define J_GRIDLAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
/** /**
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jimagebutton.h   jimagebutton.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 IMAGEBUTTON_H #ifndef J_IMAGEBUTTON_H
#define IMAGEBUTTON_H #define J_IMAGEBUTTON_H
#include "jbutton.h" #include "jbutton.h"
#include "joffscreenimage.h" #include "joffscreenimage.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jinetaddress.h   jinetaddress.h 
skipping to change at line 104 skipping to change at line 104
/** /**
* \brief Get the host address. * \brief Get the host address.
* *
*/ */
std::string GetHostAddress(); std::string GetHostAddress();
/** /**
* \brief Get the address IPv4. * \brief Get the address IPv4.
* *
*/ */
std::vector<unsigned char> GetAddress(); std::vector<uint8_t> GetAddress();
}; };
} }
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 jinputdialogbox.h   jinputdialogbox.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 INPUTDIALOGBOX_H #ifndef J_INPUTDIALOGBOX_H
#define INPUTDIALOGBOX_H #define J_INPUTDIALOGBOX_H
#include "jbutton.h" #include "jbutton.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "jlabel.h" #include "jlabel.h"
#include "jtextfield.h" #include "jtextfield.h"
#include "jframe.h" #include "jframe.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
#include "jdate.h" #include "jdate.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jinputmanager.h   jinputmanager.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 INPUTMANAGER_H #ifndef J_INPUTMANAGER_H
#define INPUTMANAGER_H #define J_INPUTMANAGER_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jkeylistener.h" #include "jkeylistener.h"
#include "jmouselistener.h" #include "jmouselistener.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
#include "jautolock.h" #include "jautolock.h"
#include <vector> #include <vector>
#include <map> #include <map>
#include <list> #include <list>
#ifdef DIRECTFB_UI
#include <directfb.h>
#endif
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class KeyProcess : public jthread::Thread{ class KeyProcess : public jthread::Thread{
private: private:
skipping to change at line 199 skipping to change at line 195
/** /**
* \brief * \brief
* *
*/ */
static InputManager * GetInstance(); static InputManager * GetInstance();
/** /**
* \brief * \brief
* *
*/ */
void SetCurrentWorkingScreenSize(int width, int height); void SetWorkingScreenSize(int width, int height);
/** /**
* \brief * \brief
* *
*/ */
void SkipKeyEvents(bool b); void SkipKeyEvents(bool b);
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
7 lines changed or deleted 3 lines changed or added


 jinputstream.h   jinputstream.h 
skipping to change at line 79 skipping to change at line 79
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty() = 0; virtual bool IsEmpty() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available() = 0; virtual int64_t Available() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize() = 0; virtual int64_t GetSize() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetPosition() = 0; virtual int64_t GetPosition() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual int Read() = 0; virtual int Read() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long Read(char *, long long size) = 0; virtual int64_t Read(char *, int64_t size) = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual std::string Read(int size); virtual std::string Read(int size);
/** /**
* \brief Salto relativo. * \brief Salto relativo.
* *
*/ */
virtual void Skip(long long skip) = 0; virtual void Skip(int64_t skip) = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual void Reset() = 0; virtual void Reset() = 0;
/** /**
* \brief * \brief
* *
skipping to change at line 139 skipping to change at line 139
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsClosed(); virtual bool IsClosed();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetReceiveBytes() = 0; virtual int64_t GetReceiveBytes() = 0;
}; };
} }
#endif #endif
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 jkeyboard.h   jkeyboard.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 KEYBOARD_H #ifndef J_KEYBOARD_H
#define KEYBOARD_H #define J_KEYBOARD_H
#include "jbutton.h" #include "jbutton.h"
#include "jtextarea.h" #include "jtextarea.h"
#include "jkeyboardlistener.h" #include "jkeyboardlistener.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "jtextlistener.h" #include "jtextlistener.h"
#include "jframe.h" #include "jframe.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
skipping to change at line 66 skipping to change at line 66
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Keyboard : public jgui::Frame, public jgui::ButtonListener, public jg ui::FrameInputListener, public jgui::TextListener { class Keyboard : public jgui::Frame, public jgui::ButtonListener, public jg ui::FrameInputListener, public jgui::TextListener {
public: public:
private: private:
jthread::Mutex _key_mutex; jthread::Mutex _key_mutex;
std::vector<KeyboardListener *> _listeners; std::vector<KeyboardListener *> _keyboard_listeners;
std::vector<Button *> _buttons; std::vector<Button *> _buttons;
TextArea *display; TextArea *display;
Component *_current_button; Component *_current_button;
jkeyboard_type_t _type; jkeyboard_type_t _type;
std::string _text; std::string _text;
int bx, int bx,
by, by,
bwidth, bwidth,
bheight, bheight,
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 jkeyboardevent.h   jkeyboardevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 KEYBOARDEVENT_H #ifndef J_KEYBOARDEVENT_H
#define KEYBOARDEVENT_H #define J_KEYBOARDEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include "jbutton.h" #include "jbutton.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jkeyboardlistener.h   jkeyboardlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 KEYBOARDLISTENER_H #ifndef J_KEYBOARDLISTENER_H
#define KEYBOARDLISTENER_H #define J_KEYBOARDLISTENER_H
#include "jkeyboardevent.h" #include "jkeyboardevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jkeyevent.h   jkeyevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 KEYEVENT_H #ifndef J_KEYEVENT_H
#define KEYEVENT_H #define J_KEYEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
skipping to change at line 44 skipping to change at line 44
#include <time.h> #include <time.h>
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
*/ */
enum jkey_type_t { enum jkey_type_t {
JKEY_PRESSED, JKEY_PRESSED,
JKEY_RELEASED JKEY_RELEASED,
JKEY_TYPED
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jinput_modifiers_t { enum jinput_modifiers_t {
JMOD_SHIFT, JMOD_SHIFT = 0x0001,
JMOD_CONTROL, JMOD_CONTROL = 0x0002,
JMOD_ALT, JMOD_ALT = 0x0004,
JMOD_ALTGR, JMOD_ALTGR = 0x0008,
JMOD_META, JMOD_META = 0x0010,
JMOD_SUPER, JMOD_SUPER = 0x0020,
JMOD_HYPER JMOD_HYPER = 0x0040,
JMOD_CAPS_LOCK = 0x0080,
JMOD_NUM_LOCK = 0x0100,
JMOD_SCROLL_LOCK = 0x0200
}; };
/** /**
* \brief * \brief
* *
*/ */
enum jkey_symbol_t { enum jkey_symbol_t {
JKEY_UNKNOWN, JKEY_UNKNOWN,
JKEY_EXIT, JKEY_EXIT,
JKEY_BACKSPACE, JKEY_BACKSPACE,
skipping to change at line 265 skipping to change at line 269
* *
*/ */
KeyEvent(void *source, jkey_type_t type, jinput_modifiers_t mod, int code, jkey_symbol_t symbol); KeyEvent(void *source, jkey_type_t type, jinput_modifiers_t mod, int code, jkey_symbol_t symbol);
/** /**
* \brief * \brief
* *
*/ */
virtual ~KeyEvent(); virtual ~KeyEvent();
int GetCode(); /**
* \brief
*
*/
int GetKeyCode();
/** /**
* \brief * \brief
* *
*/ */
jkey_symbol_t GetSymbol(); jkey_symbol_t GetSymbol();
/** /**
* \brief * \brief
* *
 End of changes. 4 change blocks. 
11 lines changed or deleted 19 lines changed or added


 jkeylistener.h   jkeylistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 KEYLISTENER_H #ifndef J_KEYLISTENER_H
#define KEYLISTENER_H #define J_KEYLISTENER_H
#include "jkeyevent.h" #include "jkeyevent.h"
#include "jlistener.h" #include "jlistener.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jlabel.h   jlabel.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 LABEL_H #ifndef J_LABEL_H
#define LABEL_H #define J_LABEL_H
#include "jcomponent.h" #include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jlayout.h   jlayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 LAYOUT_H #ifndef J_LAYOUT_H
#define LAYOUT_H #define J_LAYOUT_H
#include "jgraphics.h" #include "jgraphics.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
class Container; class Container;
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jlistbox.h   jlistbox.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 LISTBOX_H #ifndef J_LISTBOX_H
#define LISTBOX_H #define J_LISTBOX_H
#include "jbutton.h" #include "jbutton.h"
#include "jtextarea.h" #include "jtextarea.h"
#include "jselectlistener.h" #include "jselectlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "joffscreenimage.h" #include "joffscreenimage.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
skipping to change at line 89 skipping to change at line 89
private: private:
struct listbox_t { struct listbox_t {
std::string text; std::string text;
bool check; bool check;
jlist_item_type_t type; jlist_item_type_t type;
jgui::OffScreenImage *image; jgui::OffScreenImage *image;
}; };
private: private:
std::vector<SelectListener *> _listeners; std::vector<SelectListener *> _listbox_listeners;
std::vector<listbox_t> _items; std::vector<listbox_t> _items;
int bx, int bx,
by, by,
bwidth, bwidth,
bheight, bheight,
_item_size, _item_size,
_index, _index,
_top_index, _top_index,
_selected_index; _selected_index;
int _item_red, jcolor_t _item_color;
_item_green,
_item_blue,
_item_alpha;
float delta; float delta;
bool _input_locked, bool _input_locked,
_centered_interaction, _centered_interaction,
_loop; _loop;
jalign_t _align; jalign_t _align;
jlist_scroll_type_t _scroll; jlist_scroll_type_t _scroll;
jlist_selection_type_t _selection; jlist_selection_type_t _selection;
public: public:
/** /**
skipping to change at line 273 skipping to change at line 270
/** /**
* \brief * \brief
* *
*/ */
void SetItemSize(int size); void SetItemSize(int size);
/** /**
* \brief * \brief
* *
*/ */
uint32_t GetItemColor(); jcolor_t GetItemColor();
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
 End of changes. 5 change blocks. 
9 lines changed or deleted 6 lines changed or added


 jmarquee.h   jmarquee.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MARQUEE_H #ifndef J_MARQUEE_H
#define MARQUEE_H #define J_MARQUEE_H
#include "jruntimeexception.h" #include "jruntimeexception.h"
#include "jstringtokenizer.h" #include "jstringtokenizer.h"
#include "jstringutils.h" #include "jstringutils.h"
#include "jthread.h" #include "jthread.h"
#include "jtextlistener.h" #include "jtextlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jmemoryinputstream.h   jmemoryinputstream.h 
skipping to change at line 24 skipping to change at line 24
* * * *
* 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_MEMORYINPUTSTREAM_H #ifndef J_MEMORYINPUTSTREAM_H
#define J_MEMORYINPUTSTREAM_H #define J_MEMORYINPUTSTREAM_H
#include "jinputstream.h" #include "jinputstream.h"
#include <stdint.h>
#include <cstring> #include <cstring>
namespace jio { namespace jio {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class MemoryInputStream : public jio::InputStream{ class MemoryInputStream : public jio::InputStream{
private: private:
/** \brief */ /** \brief */
unsigned char *_buffer; uint8_t*_buffer;
/** \brief */ /** \brief */
long long _buffer_size; int64_t _buffer_size;
/** \brief */ /** \brief */
long long _buffer_index; int64_t _buffer_index;
public: public:
/** /**
* \brief * \brief
* *
*/ */
MemoryInputStream(unsigned char *data, int size); MemoryInputStream(uint8_t*data, int size);
/** /**
* \brief * \brief
* *
*/ */
virtual ~MemoryInputStream(); virtual ~MemoryInputStream();
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetPosition(); virtual int64_t GetPosition();
/** /**
* \brief * \brief
* *
*/ */
virtual int Read(); virtual int Read();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Read(char *, long long size); virtual int64_t Read(char *, int64_t size);
/** /**
* \brief Salto relativo. * \brief Salto relativo.
* *
*/ */
virtual void Skip(long long skip); virtual void Skip(int64_t skip);
/** /**
* \brief * \brief
* *
*/ */
virtual void Reset(); virtual void Reset();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetReceiveBytes(); virtual int64_t GetReceiveBytes();
}; };
} }
#endif #endif
 End of changes. 11 change blocks. 
11 lines changed or deleted 11 lines changed or added


 jmemoryoutputstream.h   jmemoryoutputstream.h 
skipping to change at line 38 skipping to change at line 38
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class MemoryOutputStream : public jio::OutputStream{ class MemoryOutputStream : public jio::OutputStream{
private: private:
/** \brief */ /** \brief */
unsigned char *_buffer; uint8_t*_buffer;
/** \brief */ /** \brief */
long long _buffer_size; int64_t _buffer_size;
/** \brief */ /** \brief */
long long _buffer_index; int64_t _buffer_index;
public: public:
/** /**
* \brief * \brief
* *
*/ */
MemoryOutputStream(unsigned char *data, int size); MemoryOutputStream(uint8_t*data, int size);
/** /**
* \brief * \brief
* *
*/ */
virtual ~MemoryOutputStream(); virtual ~MemoryOutputStream();
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(int b); virtual int Write(int b);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Write(char *, long long size); virtual int64_t Write(char *, int64_t size);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Flush(); virtual int64_t Flush();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
long long GetSentBytes(); int64_t GetSentBytes();
}; };
} }
#endif #endif
 End of changes. 8 change blocks. 
8 lines changed or deleted 8 lines changed or added


 jmenu.h   jmenu.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MENU_H #ifndef J_MENU_H
#define MENU_H #define J_MENU_H
#include "jmenulistener.h" #include "jmenulistener.h"
#include "jframe.h" #include "jframe.h"
#include "jlistbox.h" #include "jlistbox.h"
#include "jmenuexception.h" #include "jmenuexception.h"
#include "joffscreenimage.h" #include "joffscreenimage.h"
#include "jmouselistener.h" #include "jmouselistener.h"
#include <string> #include <string>
#include <iostream> #include <iostream>
skipping to change at line 77 skipping to change at line 77
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Menu : public jgui::Frame, public jgui::FrameInputListener{ class Menu : public jgui::Frame, public jgui::FrameInputListener{
friend class MenuComponent; friend class MenuComponent;
private: private:
jthread::Mutex _menu_mutex; jthread::Mutex _menu_mutex;
std::vector<Menu *> _menus; std::vector<Menu *> _menus;
std::vector<MenuListener *> _listeners; std::vector<MenuListener *> _menu_listeners;
MenuItem *_current_item; MenuItem *_current_item;
MenuComponent *_list; MenuComponent *_list;
jmenu_align_t _menu_align; jmenu_align_t _menu_align;
int _visible_items; int _visible_items;
private: private:
virtual void MousePressed(MouseEvent *event); virtual void MousePressed(MouseEvent *event);
virtual void MouseReleased(MouseEvent *event); virtual void MouseReleased(MouseEvent *event);
virtual void MouseClicked(MouseEvent *event); virtual void MouseClicked(MouseEvent *event);
virtual void MouseMoved(MouseEvent *event); virtual void MouseMoved(MouseEvent *event);
skipping to change at line 103 skipping to change at line 103
virtual void SetTitle(std::string title); virtual void SetTitle(std::string title);
virtual bool Show(bool modal = true); virtual bool Show(bool modal = true);
void SetMenuAlign(jmenu_align_t align); void SetMenuAlign(jmenu_align_t align);
int GetItemsSize(); int GetItemsSize();
int GetVisibleItems(); int GetVisibleItems();
void SetLoop(bool loop); void SetLoop(bool loop);
void SetCurrentIndex(int i); void SetCurrentIndex(int i);
void AddMenuItem(MenuItem *item); void AddMenuItem(MenuItem *item);
void AddMenuItem(MenuItem *item, int index);
void AddMenuItems(std::vector<MenuItem *> &items);
Menu * GetCurrentMenu(); Menu * GetCurrentMenu();
MenuItem * GetCurrentItem(); MenuItem * GetCurrentItem();
int GetCurrentIndex(); int GetCurrentIndex();
void RemoveItem(int index);
void RemoveAll(); void RemoveAll();
uint32_t GetItemColor(); jcolor_t GetItemColor();
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
void SetBackgroundColor(uint32_t color); void SetBackgroundColor(jcolor_t color);
void SetForegroundColor(uint32_t color); void SetForegroundColor(jcolor_t color);
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
void SetBackgroundColor(int red, int green, int blue, int al pha); void SetBackgroundColor(int red, int green, int blue, int al pha);
void SetForegroundColor(int red, int green, int blue, int al pha); void SetForegroundColor(int red, int green, int blue, int al pha);
void RegisterMenuListener(MenuListener *listener); void RegisterMenuListener(MenuListener *listener);
void RemoveMenuListener(MenuListener *listener); void RemoveMenuListener(MenuListener *listener);
void DispatchEvent(MenuEvent *event); void DispatchEvent(MenuEvent *event);
std::vector<MenuListener *> & GetMenuListeners(); std::vector<MenuListener *> & GetMenuListeners();
virtual void Paint(Graphics *g);
virtual void InputChanged(KeyEvent *event); virtual void InputChanged(KeyEvent *event);
}; };
class MenuItem : public virtual jcommon::Object{ class MenuItem : public virtual jcommon::Object{
friend class MenuComponent; friend class MenuComponent;
friend class ComboMenuComponent; friend class ComboMenuComponent;
private: private:
std::vector<MenuItem *> _childs; std::vector<MenuItem *> _childs;
skipping to change at line 183 skipping to change at line 185
_parent = NULL; _parent = NULL;
_prefetch = NULL; _prefetch = NULL;
_image = image; _image = image;
_value = value; _value = value;
_is_checked = false; _is_checked = false;
_is_visible = true; _is_visible = true;
_type = IMAGE_MENU_ITEM; _type = IMAGE_MENU_ITEM;
} }
MenuItem(std::string value, bool checked) MenuItem(std::string value, bool checked)
{ {
jcommon::Object::SetClassName("jcommon::MenuItem"); jcommon::Object::SetClassName("jcommon::MenuItem");
_enabled = true; _enabled = true;
_parent = NULL; _parent = NULL;
_prefetch = NULL; _prefetch = NULL;
_value = value; _value = value;
_is_checked = checked; _is_checked = checked;
_is_visible = true; _is_visible = true;
_type = CHECK_MENU_ITEM; _type = CHECK_MENU_ITEM;
} }
~MenuItem() ~MenuItem()
{ {
} }
Menu * GetParent() Menu * GetParent()
{ {
return _parent; return _parent;
} }
std::vector<MenuItem *> & GetSubItems() std::vector<MenuItem *> & GetSubItems()
{ {
return _childs; return _childs;
} }
void SetEnabled(bool b) void SetEnabled(bool b)
{ {
_enabled = b; _enabled = b;
} }
bool GetEnabled() bool GetEnabled()
{ {
return _enabled; return _enabled;
} }
void SetVisible(bool b) void SetVisible(bool b)
{ {
_is_visible = b; _is_visible = b;
} }
bool IsVisible() bool IsVisible()
{ {
return _is_visible; return _is_visible;
} }
bool IsSelected() bool IsSelected()
{ {
return _is_checked; return _is_checked;
} }
void SetSelected(bool b) void SetSelected(bool b)
{ {
if (_is_checked == b) { if (_is_checked == b) {
return; return;
} }
_is_checked = b; _is_checked = b;
/* /*
if (_parent != NULL) { if (_parent != NULL) {
_parent->Repaint(); _parent->Repaint();
}
*/
} }
*/
}
void SetParent(Menu *parent) void SetParent(Menu *parent)
{ {
_parent = parent; _parent = parent;
}
void AddSubItem(MenuItem *item)
{
if (_type == jgui::CHECK_MENU_ITEM) {
throw MenuException("Item cannot accept childs");
} }
void AddSubItem(MenuItem *item) _childs.push_back(item);
{ }
if (_type == jgui::CHECK_MENU_ITEM) {
throw MenuException("Item cannot accept chil
ds");
}
_childs.push_back(item); void AddSubItem(MenuItem *item, int index)
{
if (index > (int)_childs.size()) {
index = _childs.size();
} }
std::string GetValue() _childs.insert(_childs.begin()+index, item);
{ }
return _value;
void AddSubItems(std::vector<MenuItem *> items)
{
for (std::vector<MenuItem *>::iterator i=items.begin(); i!=i
tems.end(); i++) {
_childs.push_back((*i));
} }
}
std::string GetImage() void RemoveSubItem(int index)
{ {
return _image; if (_childs.size() > 0 && index < (int)_childs.size()) {
_childs.erase(_childs.begin()+index);
} }
}
jmenuitem_type_t GetType() void RemoveSubItem(MenuItem *item)
{ {
return _type; std::vector<MenuItem *>::iterator i = std::find(_childs.begi
n(), _childs.end(), item);
if (i != _childs.end()) {
_childs.erase(i);
} }
}
std::string GetValue()
{
return _value;
}
std::string GetImage()
{
return _image;
}
jmenuitem_type_t GetType()
{
return _type;
}
}; };
class MenuComponent : public Component{ class MenuComponent : public Component{
friend class Menu; friend class Menu;
private: private:
std::vector<MenuItem *>_items; std::vector<MenuItem *>_items;
OffScreenImage *prefetch; OffScreenImage *prefetch;
Menu *_menu; Menu *_menu;
int bx, int bx,
by, by,
bwidth, bwidth,
bheight, bheight,
_item_size, _item_size,
_index, _index,
_top_index, _top_index,
_visible_items, _visible_items,
_paint_count, _paint_count,
_vertical_gap, _vertical_gap,
_horizontal_gap; _horizontal_gap;
int _item_red, jcolor_t _item_color;
_item_green,
_item_blue,
_item_alpha;
float delta; float delta;
bool _input_locked, bool _input_locked,
_arrows_visible, _arrows_visible,
_loop, _loop,
_centered_interaction; _centered_interaction;
void SetMenu(Menu *menu); void SetMenu(Menu *menu);
public: public:
MenuComponent(int x, int y, int width, int visible_items); MenuComponent(int x, int y, int width, int visible_items);
virtual ~MenuComponent(); virtual ~MenuComponent();
void SetCenteredInteraction(bool b); void SetCenteredInteraction(bool b);
void SetLoop(bool loop); void SetLoop(bool loop);
uint32_t GetItemColor(); jcolor_t GetItemColor();
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
void SetCurrentIndex(int i); void SetCurrentIndex(int i);
void AddEmptyItem(); void AddEmptyItem();
void AddItem(std::string text); void AddItem(std::string text);
void AddItem(std::string text, std::string image); void AddItem(std::string text, std::string image);
void AddItem(std::string text, bool checked); void AddItem(std::string text, bool checked);
void AddMenuItem(MenuItem *item); void AddMenuItem(MenuItem *item);
MenuItem * GetMenuItem(int index); MenuItem * GetMenuItem(int index);
MenuItem * GetCurrentMenuItem(); MenuItem * GetCurrentMenuItem();
int GetCurrentIndex(); int GetCurrentIndex();
 End of changes. 34 change blocks. 
94 lines changed or deleted 126 lines changed or added


 jmenuevent.h   jmenuevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MENUEVENT_H #ifndef J_MENUEVENT_H
#define MENUEVENT_H #define J_MENUEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jmenugroup.h   jmenugroup.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MENUGROUP_H #ifndef J_MENUGROUP_H
#define MENUGROUP_H #define J_MENUGROUP_H
#include "jeventobject.h" #include "jeventobject.h"
#include "jmenu.h" #include "jmenu.h"
#include "jmenulistener.h" #include "jmenulistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jmenulistener.h   jmenulistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MENULISTENER_H #ifndef J_MENULISTENER_H
#define MENULISTENER_H #define J_MENULISTENER_H
#include "jmenuevent.h" #include "jmenuevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jmessagedialog.h   jmessagedialog.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MESSAGEDIALOG_H #ifndef J_MESSAGEDIALOG_H
#define MESSAGEDIALOG_H #define J_MESSAGEDIALOG_H
#include "jbutton.h" #include "jbutton.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "jlabel.h" #include "jlabel.h"
#include "jframe.h" #include "jframe.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
#include "jdate.h" #include "jdate.h"
 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 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MOUSEEVENT_H #ifndef J_MOUSEEVENT_H
#define MOUSEEVENT_H #define J_MOUSEEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jmouselistener.h   jmouselistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 MOUSELISTENER_H #ifndef J_MOUSELISTENER_H
#define MOUSELISTENER_H #define J_MOUSELISTENER_H
#include "jmouseevent.h" #include "jmouseevent.h"
#include "jlistener.h" #include "jlistener.h"
namespace jgui { namespace jgui {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jnullgraphics.h   jnullgraphics.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 NULLGRAPHICS_H #ifndef J_NULLGRAPHICS_H
#define NULLGRAPHICS_H #define J_NULLGRAPHICS_H
#include "jgraphics.h" #include "jgraphics.h"
namespace jgui{ namespace jgui{
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
skipping to change at line 53 skipping to change at line 53
/** /**
* \brief * \brief
* *
*/ */
virtual ~NullGraphics(); virtual ~NullGraphics();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetCurrentWorkingScreenSize(int width, int heig virtual void * GetNativeSurface();
ht);
/**
* \brief
*
*/
virtual void SetNativeSurface(void *surface);
/**
* \brief
*
*/
virtual void SetWorkingScreenSize(int width, int height);
/** /**
* \brief * \brief
* *
*/ */
virtual OffScreenImage * Create(); virtual OffScreenImage * Create();
/** /**
* \brief * \brief
* *
skipping to change at line 155 skipping to change at line 167
/** /**
* \brief * \brief
* *
*/ */
virtual void Flip(int x, int y, int w, int h); virtual void Flip(int x, int y, int w, int h);
/** /**
* \brief * \brief
* *
*/ */
virtual uint32_t GetColor(); virtual struct jcolor_t GetColor();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetColor(uint32_t color); virtual void SetColor(uint32_t color);
/** /**
* \brief * \brief
* *
skipping to change at line 377 skipping to change at line 389
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(std::string img, int x, int y, int w, int h, int alpha = 0xff); virtual bool DrawImage(std::string img, int x, int y, int w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(std::string img, int sx, int sy, int
sw, int sh, int x, int y, int alpha = 0xff);
/**
* \brief
*
*/
virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff); virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h, int alpha = 0xff); virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual bool DrawImage(OffScreenImage *img, int sx, int sy,
int sw, int sh, int x, int y, int alpha = 0xff);
/**
* \brief
*
*/
virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff); virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);
/** /**
* \brief * \brief
* *
*/ */
virtual void DrawStringJustified(std::string full_text, int x, int y, int width, int height, int align = 3); virtual void DrawString(std::string full_text, int x, int y, int width, int height, int align = 3);
/** /**
* \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. 6 change blocks. 
6 lines changed or deleted 31 lines changed or added


 jnulllayout.h   jnulllayout.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 NULLLAYOUT_H #ifndef J_NULLLAYOUT_H
#define NULLLAYOUT_H #define J_NULLLAYOUT_H
#include "jlayout.h" #include "jlayout.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
namespace jgui { namespace jgui {
/** /**
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jobjectinputstream.h   jobjectinputstream.h 
skipping to change at line 59 skipping to change at line 59
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize(); virtual int64_t GetSize();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetPosition(); virtual int64_t GetPosition();
/** /**
* \brief * \brief
* *
*/ */
virtual Object * Read(); virtual Object * Read();
/** /**
* \brief Salto relativo. * \brief Salto relativo.
* *
*/ */
virtual void Skip(long long skip); virtual void Skip(int64_t skip);
/** /**
* \brief * \brief
* *
*/ */
virtual void Reset(); virtual void Reset();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetReceiveBytes(); virtual int64_t GetReceiveBytes();
/** /**
* \brief * \brief
* *
*/ */
virtual jcommon::Object * CreateObject(std::string id); virtual jcommon::Object * CreateObject(std::string id);
}; };
} }
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jobjectoutputstream.h   jobjectoutputstream.h 
skipping to change at line 60 skipping to change at line 60
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty(); virtual bool IsEmpty();
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available(); virtual int64_t Available();
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(Object *object); virtual int Write(Object *object);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Flush(); virtual int64_t Flush();
/** /**
* \brief * \brief
* *
*/ */
virtual void Close(); virtual void Close();
/** /**
* \brief * \brief
* *
*/ */
long long GetSentBytes(); int64_t GetSentBytes();
}; };
} }
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 joffscreenimage.h   joffscreenimage.h 
skipping to change at line 30 skipping to change at line 30
#ifndef J_OFFSCREENIMAGE_H #ifndef J_OFFSCREENIMAGE_H
#define J_OFFSCREENIMAGE_H #define J_OFFSCREENIMAGE_H
#include "jgraphics.h" #include "jgraphics.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
namespace jgui{ namespace jgui{
enum jsurface_pixelformat_t {
SPF_UNKNOWN, // 0x00000000 unknown or unspecified format
SPF_ARGB1555, // DFB_SURFACE_PIXELFORMAT(0, 15, 1, 1, 0, 2, 0, 0,
0, 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
, 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
, 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
, 0, 0, 0, 0, 0) 24 bit RGB (4 byte, nothing@24, red 8@16, green 8@8, bl
ue 8@0)
SPF_ARGB, // DFB_SURFACE_PIXELFORMAT(4, 24, 8,
1, 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)
SPF_A8, // DFB_SURFACE_PIXELFORMAT(5, 0, 8,
1, 0, 1, 0, 0, 0, 0, 0) 8 bit alpha (1 byte, alpha 8@0), e.g. anti-alia
sed glyphs
SPF_YUY2, // DFB_SURFACE_PIXELFORMAT(6, 16, 0,
0, 0, 2, 0, 0, 0, 0, 0) 16 bit YUV (4 byte/ 2 pixel, macropixel contain
s CbYCrY [31:0])
SPF_RGB332, // DFB_SURFACE_PIXELFORMAT(7, 8, 0, 0, 0, 1,
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,
0, 0, 2, 0, 0, 0, 0, 0) 16 bit YUV (4 byte/ 2 pixel, macropixel contain
s YCbYCr [31:0])
SPF_I420, // DFB_SURFACE_PIXELFORMAT(9, 12, 0,
0, 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by 8 bit qua
rter size U/V planes)
SPF_YV12, // DFB_SURFACE_PIXELFORMAT(10, 12, 0
, 0, 0, 1, 0, 2, 0, 0, 0) 12 bit YUV (8 bit Y plane followed by 8 bit qua
rter size V/U planes)
SPF_LUT8, // DFB_SURFACE_PIXELFORMAT(11, 8, 0,
1, 0, 1, 0, 0, 0, 1, 0) 8 bit LUT (8 bit color and alpha lookup from pa
lette)
SPF_ALUT44, // DFB_SURFACE_PIXELFORMAT(12, 4, 4, 1, 0, 1
, 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,
4, 0, 0, 0, 0, 1) 32 bit ARGB (4 byte, inv. alpha 8@24, red 8@16, green 8
@8, blue 8@0)
SPF_A1, // DFB_SURFACE_PIXELFORMAT(14, 0, 1,
1, 1, 0, 7, 0, 0, 0, 0) 1 bit alpha (1 byte/ 8 pixel, most significant
bit used first)
SPF_NV12, // DFB_SURFACE_PIXELFORMAT(15, 12, 0
, 0, 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)
SPF_NV16, // DFB_SURFACE_PIXELFORMAT(16, 24, 0
, 0, 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)
SPF_ARGB2554, // DFB_SURFACE_PIXELFORMAT(17, 14, 2, 1, 0, 2, 0, 0,
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,
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,
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
, 0, 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)
SPF_AYUV, // DFB_SURFACE_PIXELFORMAT(21, 24, 8
, 1, 0, 4, 0, 0, 0, 0, 0) 32 bit AYUV (4 byte, alpha 8@24, Y 8@16, Cb 8@8
, Cr 8@0)
SPF_A4, // DFB_SURFACE_PIXELFORMAT(22, 0, 4,
1, 4, 0, 1, 0, 0, 0, 0) 4 bit alpha (1 byte/ 2 pixel, more significant
nibble used first)
SPF_ARGB1666, // DFB_SURFACE_PIXELFORMAT(23, 18, 1, 1, 0, 3, 0, 0,
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,
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,
3, 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,
1, 2, 0, 3, 0, 0, 1, 0) 2 bit LUT (1 byte/ 4 pixel, 2 bit color and alp
ha lookup from palette)
SPF_RGB444, // DFB_SURFACE_PIXELFORMAT(27, 12, 0, 0, 0,
2, 0, 0, 0, 0, 0) 16 bit RGB (2 byte, nothing @12, red 4@8, green 4@4, bl
ue 4@0)
SPF_RGB555, // DFB_SURFACE_PIXELFORMAT(28, 15, 0, 0, 0,
2, 0, 0, 0, 0, 0) 16 bit RGB (2 byte, nothing @15, red 5@10, green 5@5, b
lue 5@0)
SPF_BGR555, // DFB_SURFACE_PIXELFORMAT(29, 15, 0, 0, 0,
2, 0, 0, 0, 0, 0) 16 bit BGR (2 byte, nothing @15, blue 5@10, green 5@5,
red 5@0)
SPF_RGBA5551, // DFB_SURFACE_PIXELFORMAT(30, 15, 1, 1, 0, 2, 0, 0,
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
, 1, 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)
SPF_VYU, // DFB_SURFACE_PIXELFORMAT(32, 24, 0
, 0, 0, 3, 0, 0, 0, 0, 0)
};
class Graphics; class Graphics;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class OffScreenImage : public virtual jcommon::Object{ class OffScreenImage : public virtual jcommon::Object{
private: private:
uint8_t *_buffer; uint8_t *_buffer;
protected: protected:
Graphics *graphics; Graphics *graphics;
int _width, int _width,
_height, _height,
_scale_width, _scale_width,
_scale_height; _scale_height;
jsurface_pixelformat_t _pixelformat;
public: public:
/** /**
* \brief * \brief
* *
*/ */
OffScreenImage(int width, int height, int scale_width = DEFA ULT_SCALE_WIDTH, int scale_height = DEFAULT_SCALE_HEIGHT); OffScreenImage(int width, int height, jsurface_pixelformat_t pixelformat = SPF_ARGB, int scale_width = DEFAULT_SCALE_WIDTH, int scale_h eight = DEFAULT_SCALE_HEIGHT);
/** /**
* \brief * \brief
* *
*/ */
virtual ~OffScreenImage(); virtual ~OffScreenImage();
/** /**
* \brief * \brief
* *
*/ */
Graphics * GetGraphics(); Graphics * GetGraphics();
/** /**
* \brief * \brief
* *
*/ */
OffScreenImage * Create();
/**
* \brief
*
*/
jsurface_pixelformat_t GetPixelFormat();
/**
* \brief
*
*/
int GetWidth(); int GetWidth();
/** /**
* \brief * \brief
* *
*/ */
int GetHeight(); int GetHeight();
/** /**
* \brief * \brief
 End of changes. 4 change blocks. 
1 lines changed or deleted 104 lines changed or added


 joutputstream.h   joutputstream.h 
skipping to change at line 24 skipping to change at line 24
* * * *
* 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_OUTPUTSTREAM_H #ifndef J_OUTPUTSTREAM_H
#define J_OUTPUTSTREAM_H #define J_OUTPUTSTREAM_H
#include "joutputstream.h" #include "joutputstream.h"
#include "jobject.h" #include "jobject.h"
#include <stdint.h>
namespace jio { namespace jio {
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class OutputStream : public virtual jcommon::Object{ class OutputStream : public virtual jcommon::Object{
private: private:
skipping to change at line 67 skipping to change at line 68
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsEmpty() = 0; virtual bool IsEmpty() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long Available() = 0; virtual int64_t Available() = 0;
/** /**
* \brief * \brief
* *
*/ */
void SetBlocking(bool block_); void SetBlocking(bool block_);
/** /**
* \brief * \brief
* *
*/ */
bool IsBlocking(); bool IsBlocking();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSize() = 0; virtual int64_t GetSize() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual int Write(int b) = 0; virtual int Write(int b) = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long Write(const char *, long long size) = 0; virtual int64_t Write(const char *, int64_t size) = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual long long Write(std::string); virtual int64_t Write(std::string);
/** /**
* \brief * \brief
* *
*/ */
virtual long long Flush() = 0; virtual int64_t Flush() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual void Seek(long long index) = 0; virtual void Seek(int64_t index) = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual void Close() = 0; virtual void Close() = 0;
/** /**
* \brief * \brief
* *
*/ */
virtual bool IsClosed(); virtual bool IsClosed();
/** /**
* \brief * \brief
* *
*/ */
virtual long long GetSentBytes() = 0; virtual int64_t GetSentBytes() = 0;
}; };
} }
#endif #endif
 End of changes. 9 change blocks. 
8 lines changed or deleted 9 lines changed or added


 jpanel.h   jpanel.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 PANEL_H #ifndef J_PANEL_H
#define PANEL_H #define J_PANEL_H
#include "jcontainer.h" #include "jcontainer.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jpipestream.h   jpipestream.h 
skipping to change at line 75 skipping to change at line 75
/** /**
* \brief Destrutor virtual. * \brief Destrutor virtual.
* *
*/ */
virtual ~PipeStream(); virtual ~PipeStream();
/** /**
* \brief * \brief
* *
*/ */
long Read(char *data_, long length_); int64_t Read(char *data_, int64_t length_);
/** /**
* \brief * \brief
* *
*/ */
long Write(const char *data_, long length_); int64_t Write(const char *data_, int64_t length_);
/** /**
* \brief * \brief
* *
*/ */
void Close(); void Close();
}; };
} }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jprogressbar.h   jprogressbar.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 PROGRESSBAR_H #ifndef J_PROGRESSBAR_H
#define PROGRESSBAR_H #define J_PROGRESSBAR_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jthread.h" #include "jthread.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jrawsocket.h   jrawsocket.h 
skipping to change at line 61 skipping to change at line 61
namespace jsocket { namespace jsocket {
/** /**
* \brief * \brief
* *
*/ */
struct jip_hdr_t { struct jip_hdr_t {
unsigned int ip_hl:4, unsigned int ip_hl:4,
ip_v:4; ip_v:4;
unsigned char ip_tos; uint8_t ip_tos;
unsigned short ip_len; unsigned short ip_len;
unsigned short ip_id; unsigned short ip_id;
unsigned short ip_off; unsigned short ip_off;
unsigned char ip_ttl; uint8_t ip_ttl;
unsigned char ip_p; uint8_t ip_p;
unsigned short ip_sum; unsigned short ip_sum;
unsigned long saddr, daddr; unsigned long saddr, daddr;
}; };
/** /**
* \brief * \brief
* *
*/ */
struct jtcp_hdr_t { struct jtcp_hdr_t {
unsigned short th_sport; unsigned short th_sport;
unsigned short th_dport; unsigned short th_dport;
unsigned long th_seq; unsigned long th_seq;
unsigned long th_syn; unsigned long th_syn;
unsigned int th_x2:4, unsigned int th_x2:4,
th_off:4; th_off:4;
unsigned char th_flags; uint8_t th_flags;
unsigned short th_win; unsigned short th_win;
unsigned short th_sum; unsigned short th_sum;
unsigned short th_urp; unsigned short th_urp;
}; };
/** /**
* \brief * \brief
* *
*/ */
struct jtcpopt_hdr_t { struct jtcpopt_hdr_t {
unsigned char type; uint8_t type;
unsigned char len; uint8_t len;
unsigned short value; unsigned short value;
}; };
/** /**
* \brief * \brief
* *
*/ */
struct jpseudo_hdr_t { struct jpseudo_hdr_t {
unsigned long saddr, daddr; unsigned long saddr, daddr;
unsigned char mbz, ptcl; uint8_t mbz, ptcl;
unsigned short tcpl; unsigned short tcpl;
}; };
/** /**
* \brief * \brief
* *
*/ */
struct jpacket_t { struct jpacket_t {
struct iphdr ip; struct iphdr ip;
struct tcphdr tcp; struct tcphdr tcp;
 End of changes. 5 change blocks. 
7 lines changed or deleted 7 lines changed or added


 jregexp.h   jregexp.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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. *
a************************************************************************* **/ a************************************************************************* **/
#ifndef REGEXP_H #ifndef J_REGEXP_H
#define REGEXP_H #define J_REGEXP_H
#include "jobject.h" #include "jobject.h"
#include "jcompileexception.h" #include "jcompileexception.h"
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <list> #include <list>
#include <vector> #include <vector>
#include <map> #include <map>
skipping to change at line 2156 skipping to change at line 2156
#ifdef TRACE #ifdef TRACE
t << "parse failed" << endl; t << "parse failed" << endl;
#endif #endif
} }
return this->m_parsed_size; return this->m_parsed_size;
} }
virtual std::basic_istream<E>& parse( std::basic_istream<E>& is ); virtual std::basic_istream<E>& parse( std::basic_istream<E>& is );
virtual std::basic_ostream<E>& format( std::basic_ostream<E> & os ); virtual std::basic_ostream<E>& format( std::basic_ostream<E> & os );
// during allocation the value is assigned to unsigned char - for // during allocation the value is assigned to uint8_t- for
// comparison during parsing // comparison during parsing
E& get_valid() E& get_valid()
{ {
if( !this->is_valid() ) if( !this->is_valid() )
{ {
this->m_parsed_object = F().create(); this->m_parsed_object = F().create();
*(this->m_parsed_object) = value; *(this->m_parsed_object) = value;
} }
return *this->m_parsed_object; return *this->m_parsed_object;
} }
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 jrtpsocket.h   jrtpsocket.h 
skipping to change at line 50 skipping to change at line 50
namespace jsocket { namespace jsocket {
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// ------------------ md5 class ----------------------------------------- // ------------------ md5 class -----------------------------------------
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// TODO:: retirar isso // TODO:: retirar isso
/* POINTER defines a generic pointer type */ /* POINTER defines a generic pointer type */
typedef unsigned char *POINTER; typedef uint8_t*POINTER;
/* UINT2 defines a two byte word */ /* UINT2 defines a two byte word */
typedef unsigned short int UINT2; typedef unsigned short int UINT2;
/* UINT4 defines a four byte word */ /* UINT4 defines a four byte word */
typedef unsigned long int UINT4; typedef unsigned long int UINT4;
/* MD5 context. */ /* MD5 context. */
typedef struct { typedef struct {
UINT4 state[4]; /* state (ABCD) */ UINT4 state[4]; /* state (ABCD) */
UINT4 count[2]; /* number of bits, modulo 2^64 (lsb * first) */ UINT4 count[2]; /* number of bits, modulo 2^64 (lsb * first) */
unsigned char buffer[64]; /* input buffer */ uint8_t buffer[64]; /* input buffer */
} MD5_CTX; } MD5_CTX;
void MD5Init(MD5_CTX *); void MD5Init(MD5_CTX *);
/** /**
* \brief MD5 block update operation. Continues an MD5 message-digest opera tion, * \brief MD5 block update operation. Continues an MD5 message-digest opera tion,
* processing another message block, and updating the context. * processing another message block, and updating the context.
* *
* \param context Context * \param context Context
* \param input Input block * \param input Input block
* \param inputLen Length of input block * \param inputLen Length of input block
*/ */
void MD5Update(MD5_CTX *, unsigned char *, unsigned int); void MD5Update(MD5_CTX *, uint8_t*, unsigned int);
/** /**
* \brief MD5 finalization. Ends an MD5 message-digest operation, writing t he the * \brief MD5 finalization. Ends an MD5 message-digest operation, writing t he the
* message digest and zeroizing the context. * message digest and zeroizing the context.
* *
* \param digest Message digest * \param digest Message digest
* \param context Context * \param context Context
*/ */
void MD5Final(unsigned char[16], MD5_CTX *); void MD5Final(uint8_t[16], MD5_CTX *);
/** /**
* \brief MD5 basic transformation. Transforms state based on block. * \brief MD5 basic transformation. Transforms state based on block.
*/ */
static void MD5Transform(UINT4 state[4], unsigned char block[64]); static void MD5Transform(UINT4 state[4], uint8_tblock[64]);
/** /**
* \breif Encodes input (UINT4) into output (unsigned char). Assumes len is a multiple of 4. * \breif Encodes input (UINT4) into output (uint8_t). Assumes len is a mul tiple of 4.
*/ */
static void Encode( unsigned char *output, UINT4 *input, unsigned int len) ; static void Encode( uint8_t *output, UINT4 *input, unsigned int len);
/** /**
* \brief Decodes input (unsigned char) into output (UINT4). Assumes len is a multiple of 4. * \brief Decodes input (uint8_t) into output (UINT4). Assumes len is a mul tiple of 4.
*/ */
static void Decode(UINT4 *output, unsigned char *input, unsigned int len); static void Decode(UINT4 *output, uint8_t*input, unsigned int len);
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// ------------------ end class ----------------------------------------- // ------------------ end class -----------------------------------------
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// ------------------ rtp class ----------------------------------------- // ------------------ rtp class -----------------------------------------
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
#define RTP_SEQ_MOD (1<<16) #define RTP_SEQ_MOD (1<<16)
skipping to change at line 167 skipping to change at line 167
uint32_t probation; /* sequ. packets till source is valid */ uint32_t probation; /* sequ. packets till source is valid */
uint32_t received; /* packets received */ uint32_t received; /* packets received */
uint32_t expected_prior; /* packet expected at last interval */ uint32_t expected_prior; /* packet expected at last interval */
uint32_t received_prior; /* packet received at last interval */ uint32_t received_prior; /* packet received at last interval */
uint32_t transit; /* relative trans time for prev pkt */ uint32_t transit; /* relative trans time for prev pkt */
uint32_t jitter; /* estimated jitter */ uint32_t jitter; /* estimated jitter */
/* librtp fields */ /* librtp fields */
uint32_t ssrc; uint32_t ssrc;
struct sockaddr_storage address; struct sockaddr_storage address;
char *hostname; char *hostname;
unsigned char sdes_len[RTCP_SDES_MAX]; uint8_tsdes_len[RTCP_SDES_MAX];
char *sdes_data[RTCP_SDES_MAX]; char *sdes_data[RTCP_SDES_MAX];
} Rtp_Source; } Rtp_Source;
void init_seq(Rtp_Source *s, uint16_t seq); void init_seq(Rtp_Source *s, uint16_t seq);
int update_seq(Rtp_Source *s, uint16_t seq); int update_seq(Rtp_Source *s, uint16_t seq);
double rtcp_interval(int members, int senders, double rtcp_bw, int we_sent, int packet_size, int *avg_rtcp_size, int initial); double rtcp_interval(int members, int senders, double rtcp_bw, int we_sent, int packet_size, int *avg_rtcp_size, int initial);
uint32_t random32(int type); uint32_t random32(int type);
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// ------------------ end class ----------------------------------------- // ------------------ end class -----------------------------------------
skipping to change at line 241 skipping to change at line 241
typedef struct Rtp_Header_Struct *Rtp_Header; typedef struct Rtp_Header_Struct *Rtp_Header;
typedef struct Rtp_Packet_Struct *Rtp_Packet; typedef struct Rtp_Packet_Struct *Rtp_Packet;
Rtp_Packet rtp_packet_new_take_data(void *data, uint32_t data_len); Rtp_Packet rtp_packet_new_take_data(void *data, uint32_t data_len);
Rtp_Packet rtp_packet_new_copy_data(void *data, uint32_t data_len); Rtp_Packet rtp_packet_new_copy_data(void *data, uint32_t data_len);
Rtp_Packet rtp_packet_new_allocate(uint32_t payload_len, uint32_t pad_len, uint32_t csrc_count); Rtp_Packet rtp_packet_new_allocate(uint32_t payload_len, uint32_t pad_len, uint32_t csrc_count);
void rtp_packet_free(Rtp_Packet packet); void rtp_packet_free(Rtp_Packet packet);
Rtp_Packet rtp_packet_read(int fd, struct sockaddr *fromaddr, socklen_t *fr omlen); Rtp_Packet rtp_packet_read(int fd, struct sockaddr *fromaddr, socklen_t *fr omlen);
void rtp_packet_send(Rtp_Packet packet, int fd, struct sockaddr *toaddr, so cklen_t tolen); void rtp_packet_send(Rtp_Packet packet, int fd, struct sockaddr *toaddr, so cklen_t tolen);
unsigned char rtp_packet_get_version(Rtp_Packet packet); uint8_trtp_packet_get_version(Rtp_Packet packet);
void rtp_packet_set_version(Rtp_Packet packet, unsigned char version); void rtp_packet_set_version(Rtp_Packet packet, uint8_tversion);
unsigned char rtp_packet_get_padding(Rtp_Packet packet); uint8_trtp_packet_get_padding(Rtp_Packet packet);
void rtp_packet_set_padding(Rtp_Packet packet, unsigned char padding); void rtp_packet_set_padding(Rtp_Packet packet, uint8_tpadding);
unsigned char rtp_packet_get_csrc_count(Rtp_Packet packet); uint8_trtp_packet_get_csrc_count(Rtp_Packet packet);
unsigned char rtp_packet_get_extension(Rtp_Packet packet); uint8_trtp_packet_get_extension(Rtp_Packet packet);
void rtp_packet_set_extension(Rtp_Packet packet, unsigned char extension); void rtp_packet_set_extension(Rtp_Packet packet, uint8_textension);
void rtp_packet_set_csrc_count(Rtp_Packet packet, unsigned char csrc_count) void rtp_packet_set_csrc_count(Rtp_Packet packet, uint8_tcsrc_count);
; uint8_trtp_packet_get_marker(Rtp_Packet packet);
unsigned char rtp_packet_get_marker(Rtp_Packet packet); void rtp_packet_set_marker(Rtp_Packet packet, uint8_tmarker);
void rtp_packet_set_marker(Rtp_Packet packet, unsigned char marker); uint8_trtp_packet_get_payload_type(Rtp_Packet packet);
unsigned char rtp_packet_get_payload_type(Rtp_Packet packet); void rtp_packet_set_payload_type(Rtp_Packet packet, uint8_tpayload_type);
void rtp_packet_set_payload_type(Rtp_Packet packet, unsigned char payload_t
ype);
uint16_t rtp_packet_get_seq(Rtp_Packet packet); uint16_t rtp_packet_get_seq(Rtp_Packet packet);
void rtp_packet_set_seq(Rtp_Packet packet, uint16_t seq); void rtp_packet_set_seq(Rtp_Packet packet, uint16_t seq);
uint32_t rtp_packet_get_timestamp(Rtp_Packet packet); uint32_t rtp_packet_get_timestamp(Rtp_Packet packet);
void rtp_packet_set_timestamp(Rtp_Packet packet, uint32_t timestamp); void rtp_packet_set_timestamp(Rtp_Packet packet, uint32_t timestamp);
uint32_t rtp_packet_get_ssrc(Rtp_Packet packet); uint32_t rtp_packet_get_ssrc(Rtp_Packet packet);
void rtp_packet_set_ssrc(Rtp_Packet packet, uint32_t ssrc); void rtp_packet_set_ssrc(Rtp_Packet packet, uint32_t ssrc);
uint32_t rtp_packet_get_payload_len(Rtp_Packet packet); uint32_t rtp_packet_get_payload_len(Rtp_Packet packet);
void *rtp_packet_get_payload(Rtp_Packet packet); void *rtp_packet_get_payload(Rtp_Packet packet);
uint32_t rtp_packet_get_packet_len(Rtp_Packet packet); uint32_t rtp_packet_get_packet_len(Rtp_Packet packet);
skipping to change at line 336 skipping to change at line 336
uint32_t osent; /* octets sent */ uint32_t osent; /* octets sent */
struct Rtcp_RR rr[1]; /* variable-length list */ struct Rtcp_RR rr[1]; /* variable-length list */
}; };
struct Rtcp_RR_Header { struct Rtcp_RR_Header {
uint32_t ssrc; /* receiver generating this report */ uint32_t ssrc; /* receiver generating this report */
struct Rtcp_RR rr[1]; /* variable-length list */ struct Rtcp_RR rr[1]; /* variable-length list */
}; };
struct SDES_Item { struct SDES_Item {
unsigned char type; /* type of item (Rtcp_Sdes_Type uint8_ttype; /* type of item (Rtcp_Sdes_Type) */
) */ uint8_tlength; /* length of item (in octets) */
unsigned char length; /* length of item (in octets) *
/
char data[1]; /* text, not null-terminated */ char data[1]; /* text, not null-terminated */
}; };
struct Rtcp_SDES_Header { struct Rtcp_SDES_Header {
uint32_t src; /* first SSRC/CSRC */ uint32_t src; /* first SSRC/CSRC */
struct SDES_Item item[1]; /* list of SDES items */ struct SDES_Item item[1]; /* list of SDES items */
}; };
struct Rtcp_BYE_Header { struct Rtcp_BYE_Header {
uint32_t src[1]; /* list of sources */ uint32_t src[1]; /* list of sources */
skipping to change at line 361 skipping to change at line 361
struct Rtcp_APP_Header { struct Rtcp_APP_Header {
uint32_t ssrc; /* source */ uint32_t ssrc; /* source */
char name[4]; /* name */ char name[4]; /* name */
char data[1]; /* application data */ char data[1]; /* application data */
}; };
typedef struct Rtcp_Packet_Struct *Rtcp_Packet; typedef struct Rtcp_Packet_Struct *Rtcp_Packet;
typedef struct Rtcp_Compound_Struct *Rtcp_Compound; typedef struct Rtcp_Compound_Struct *Rtcp_Compound;
typedef void (*Rtcp_Foreach_Func) (Rtcp_Packet packet, void *data); typedef void (*Rtcp_Foreach_Func) (Rtcp_Packet packet, void *data);
typedef Rtp_Source *(*Rtcp_Find_Member_Func) (uint32_t src); typedef Rtp_Source *(*Rtcp_Find_Member_Func) (uint32_t src);
typedef void (*Rtcp_Member_SDES_Func) (Rtp_Source *s, unsigned char type, c har *data, unsigned char length); typedef void (*Rtcp_Member_SDES_Func) (Rtp_Source *s, uint8_ttype, char *da ta, uint8_tlength);
Rtcp_Compound rtcp_compound_new(void); Rtcp_Compound rtcp_compound_new(void);
Rtcp_Compound rtcp_compound_new_allocate(uint32_t len); Rtcp_Compound rtcp_compound_new_allocate(uint32_t len);
Rtcp_Compound rtcp_compound_new_take_data(void *data, uint32_t data_len); Rtcp_Compound rtcp_compound_new_take_data(void *data, uint32_t data_len);
Rtcp_Compound rtcp_compound_new_copy_data(void *data, uint32_t data_len); Rtcp_Compound rtcp_compound_new_copy_data(void *data, uint32_t data_len);
void rtcp_compound_free(Rtcp_Compound compound); void rtcp_compound_free(Rtcp_Compound compound);
void rtcp_compound_foreach(Rtcp_Compound compound, Rtcp_Foreach_Func func, void *data); void rtcp_compound_foreach(Rtcp_Compound compound, Rtcp_Foreach_Func func, void *data);
void rtcp_read_sdes(Rtcp_Packet packet, Rtcp_Find_Member_Func find_member, Rtcp_Member_SDES_Func member_sdes); void rtcp_read_sdes(Rtcp_Packet packet, Rtcp_Find_Member_Func find_member, Rtcp_Member_SDES_Func member_sdes);
Rtcp_Compound rtcp_compound_read(int fd, struct sockaddr *fromaddr, socklen _t *fromlen); Rtcp_Compound rtcp_compound_read(int fd, struct sockaddr *fromaddr, socklen _t *fromlen);
skipping to change at line 383 skipping to change at line 383
Rtcp_Packet rtcp_packet_new(void); Rtcp_Packet rtcp_packet_new(void);
Rtcp_Packet rtcp_packet_new_take_data(void *data, uint32_t data_len); Rtcp_Packet rtcp_packet_new_take_data(void *data, uint32_t data_len);
Rtcp_Packet rtcp_packet_new_copy_data(void *data, uint32_t data_len); Rtcp_Packet rtcp_packet_new_copy_data(void *data, uint32_t data_len);
void rtcp_packet_free(Rtcp_Packet packet); void rtcp_packet_free(Rtcp_Packet packet);
void rtcp_compound_add_sr(Rtcp_Compound compound, uint32_t ssrc, uint32_t t imestamp, uint32_t packets_sent, uint32_t octets_sent); void rtcp_compound_add_sr(Rtcp_Compound compound, uint32_t ssrc, uint32_t t imestamp, uint32_t packets_sent, uint32_t octets_sent);
void rtcp_compound_add_sdes(Rtcp_Compound compound, uint32_t ssrc, uint32_t nsdes, Rtcp_Sdes_Type type[], char *value[], int32_t length[]); void rtcp_compound_add_sdes(Rtcp_Compound compound, uint32_t ssrc, uint32_t nsdes, Rtcp_Sdes_Type type[], char *value[], int32_t length[]);
void rtcp_compound_add_app(Rtcp_Compound compound, uint32_t ssrc, const cha r name[4], void *data, uint32_t data_len); void rtcp_compound_add_app(Rtcp_Compound compound, uint32_t ssrc, const cha r name[4], void *data, uint32_t data_len);
uint16_t rtcp_compound_get_length(Rtcp_Compound compound); uint16_t rtcp_compound_get_length(Rtcp_Compound compound);
void rtcp_compound_set_length(Rtcp_Compound compound, uint16_t len); void rtcp_compound_set_length(Rtcp_Compound compound, uint16_t len);
unsigned char rtcp_packet_get_version(Rtcp_Packet packet); uint8_trtcp_packet_get_version(Rtcp_Packet packet);
void rtcp_packet_set_version(Rtcp_Packet packet, unsigned char version); void rtcp_packet_set_version(Rtcp_Packet packet, uint8_tversion);
unsigned char rtcp_packet_get_padding(Rtcp_Packet packet); uint8_trtcp_packet_get_padding(Rtcp_Packet packet);
void rtcp_packet_set_padding(Rtcp_Packet packet, unsigned char padding); void rtcp_packet_set_padding(Rtcp_Packet packet, uint8_tpadding);
unsigned char rtcp_packet_get_count(Rtcp_Packet packet); uint8_trtcp_packet_get_count(Rtcp_Packet packet);
void rtcp_packet_set_count(Rtcp_Packet packet, unsigned char count); void rtcp_packet_set_count(Rtcp_Packet packet, uint8_tcount);
unsigned char rtcp_packet_get_packet_type(Rtcp_Packet packet); uint8_trtcp_packet_get_packet_type(Rtcp_Packet packet);
void rtcp_packet_set_packet_type(Rtcp_Packet packet, unsigned char packet_t void rtcp_packet_set_packet_type(Rtcp_Packet packet, uint8_tpacket_type);
ype);
uint16_t rtcp_packet_get_length(Rtcp_Packet packet); uint16_t rtcp_packet_get_length(Rtcp_Packet packet);
void rtcp_packet_set_content_length(Rtcp_Packet packet, uint16_t length); void rtcp_packet_set_content_length(Rtcp_Packet packet, uint16_t length);
void *rtcp_packet_get_data(Rtcp_Packet packet); void *rtcp_packet_get_data(Rtcp_Packet packet);
void *rtcp_packet_get_content(Rtcp_Packet packet); void *rtcp_packet_get_content(Rtcp_Packet packet);
char *rtcp_app_packet_get_name(Rtcp_Packet packet); char *rtcp_app_packet_get_name(Rtcp_Packet packet);
void *rtcp_app_packet_get_data(Rtcp_Packet packet); void *rtcp_app_packet_get_data(Rtcp_Packet packet);
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// ------------------ end class ----------------------------------------- // ------------------ end class -----------------------------------------
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
skipping to change at line 422 skipping to change at line 422
uint32_t probation; // sequ. packets till source is valid uint32_t probation; // sequ. packets till source is valid
uint32_t received; // packets received uint32_t received; // packets received
uint32_t expected_prior; // packet expected at last interval uint32_t expected_prior; // packet expected at last interval
uint32_t received_prior; // packet received at last interval uint32_t received_prior; // packet received at last interval
uint32_t transit; // relative trans time for prev pkt uint32_t transit; // relative trans time for prev pkt
uint32_t jitter; // estimated jitter uint32_t jitter; // estimated jitter
// gphone fields // gphone fields
uint32_t ssrc; uint32_t ssrc;
struct in_addr address; struct in_addr address;
char *hostname; char *hostname;
unsigned char sdes_len[RTCP_SDES_MAX]; uint8_tsdes_len[RTCP_SDES_MAX];
char *sdes_data[RTCP_SDES_MAX]; char *sdes_data[RTCP_SDES_MAX];
} rtp_source; } rtp_source;
/** /**
* \brief InetAddress. * \brief InetAddress.
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class RTPSocket : public virtual jcommon::Object{ class RTPSocket : public virtual jcommon::Object{
private: private:
skipping to change at line 617 skipping to change at line 617
/** /**
* \brief * \brief
* *
*/ */
rtp_source * add_member(uint32_t src, uint16_t seq, struct i n_addr *addr); rtp_source * add_member(uint32_t src, uint16_t seq, struct i n_addr *addr);
/** /**
* \brief * \brief
* *
*/ */
void member_sdes(rtp_source *s, unsigned char type, char *da ta, unsigned char length); void member_sdes(rtp_source *s, uint8_ttype, char *data, uin t8_tlength);
/** /**
* \brief * \brief
* *
*/ */
bool check_from(struct sockaddr_in *fromaddr, rtp_source *s) ; bool check_from(struct sockaddr_in *fromaddr, rtp_source *s) ;
/** /**
* \brief * \brief
* *
 End of changes. 16 change blocks. 
40 lines changed or deleted 35 lines changed or added


 jscrollbar.h   jscrollbar.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 SCROLLBAR_H #ifndef J_SCROLLBAR_H
#define SCROLLBAR_H #define J_SCROLLBAR_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jadjustmentlistener.h" #include "jadjustmentlistener.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jscrollpane.h   jscrollpane.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 SCROLLPANE_H #ifndef J_SCROLLPANE_H
#define SCROLLPANE_H #define J_SCROLLPANE_H
#include "jguilib.h" #include "jguilib.h"
#include "jcontainer.h" #include "jcontainer.h"
#include "jscrollbar.h" #include "jscrollbar.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jselectevent.h   jselectevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 SELECTEVENT_H #ifndef J_SELECTEVENT_H
#define SELECTEVENT_H #define J_SELECTEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jselectlistener.h   jselectlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 SELECTLISTENER_H #ifndef J_SELECTLISTENER_H
#define SELECTLISTENER_H #define J_SELECTLISTENER_H
#include "jselectevent.h" #include "jselectevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jslider.h   jslider.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 SLIDER_H #ifndef J_SLIDER_H
#define SLIDER_H #define J_SLIDER_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jscrollbar.h" #include "jscrollbar.h"
#include "jadjustmentlistener.h" #include "jadjustmentlistener.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jspin.h   jspin.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 SPIN_H #ifndef J_SPIN_H
#define SPIN_H #define J_SPIN_H
#include "jselectlistener.h" #include "jselectlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtable.h   jtable.h 
skipping to change at line 67 skipping to change at line 67
public: public:
virtual ~Cell(); virtual ~Cell();
void SetAlign(jalign_t align); void SetAlign(jalign_t align);
jalign_t GetAlign(); jalign_t GetAlign();
void SetValue(std::string value); void SetValue(std::string value);
std::string GetValue(); std::string GetValue();
void SetCellBackgroundColor(uint32_t color); void SetCellBackgroundColor(jcolor_t color);
void SetCellForegroundColor(uint32_t color); void SetCellForegroundColor(jcolor_t color);
void SetCellBackgroundColor(int r, int g, int b, int a); void SetCellBackgroundColor(int r, int g, int b, int a);
void SetCellForegroundColor(int r, int g, int b, int a); void SetCellForegroundColor(int r, int g, int b, int a);
}; };
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
skipping to change at line 230 skipping to change at line 230
/** /**
* \brief * \brief
* *
*/ */
void SetCell(Cell *cell, int row, int column); void SetCell(Cell *cell, int row, int column);
/** /**
* \brief * \brief
* *
*/ */
uint32_t GetItemColor(); jcolor_t GetItemColor();
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
*/ */
void SetGridColor(uint32_t color); void SetGridColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetGridColor(int r, int g, int b, int a); void SetGridColor(int r, int g, int b, int a);
/** /**
* \brief * \brief
* *
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added


 jtextarea.h   jtextarea.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TEXTAREA_H #ifndef J_TEXTAREA_H
#define TEXTAREA_H #define J_TEXTAREA_H
#include "jruntimeexception.h" #include "jruntimeexception.h"
#include "jstringtokenizer.h" #include "jstringtokenizer.h"
#include "jstringutils.h" #include "jstringutils.h"
#include "jtextlistener.h" #include "jtextlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtextdialog.h   jtextdialog.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TEXTDIALOG_H #ifndef J_TEXTDIALOG_H
#define TEXTDIALOG_H #define J_TEXTDIALOG_H
#include "jbutton.h" #include "jbutton.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "jlabel.h" #include "jlabel.h"
#include "jframe.h" #include "jframe.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
#include "jdate.h" #include "jdate.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtextevent.h   jtextevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TEXTEVENT_H #ifndef J_TEXTEVENT_H
#define TEXTEVENT_H #define J_TEXTEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtextfield.h   jtextfield.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TEXTFIELD_H #ifndef J_TEXTFIELD_H
#define TEXTFIELD_H #define J_TEXTFIELD_H
#include "jruntimeexception.h" #include "jruntimeexception.h"
#include "jstringtokenizer.h" #include "jstringtokenizer.h"
#include "jstringutils.h" #include "jstringutils.h"
#include "jtextarea.h" #include "jtextarea.h"
#include "jtextlistener.h" #include "jtextlistener.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <iostream> #include <iostream>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtextlistener.h   jtextlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TEXTLISTENER_H #ifndef J_TEXTLISTENER_H
#define TEXTLISTENER_H #define J_TEXTLISTENER_H
#include "jtextevent.h" #include "jtextevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtheme.h   jtheme.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 THEME_H #ifndef J_THEME_H
#define THEME_H #define J_THEME_H
#include "jgraphics.h" #include "jgraphics.h"
#include "jcomponent.h" #include "jcomponent.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
skipping to change at line 50 skipping to change at line 50
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Theme : public jcommon::Object{ class Theme : public jcommon::Object{
friend class ThemeManager; friend class ThemeManager;
friend class Component; friend class Component;
friend class Window; friend class Window;
friend class Frame; friend class Frame;
private: private:
uint32_t _window_bgcolor, jcolor_t _window_bgcolor,
_window_fgcolor, _window_fgcolor,
_window_border_color, _window_border_color,
_component_bgcolor, _component_bgcolor,
_component_fgcolor, _component_fgcolor,
_component_border_color, _component_border_color,
_component_border_focus_col or,
_component_focus_bgcolor, _component_focus_bgcolor,
_component_focus_fgcolor; _component_focus_fgcolor;
int _gradient_level, int _gradient_level,
_window_border_size, _window_border_size,
_component_border_size; _component_border_size;
jinsets_t _insets; jinsets_t _insets;
Font *_window_font, Font *_window_font,
*_component_font; *_component_font;
jcomponent_border_t _component_border, jcomponent_border_t _component_border,
_wi ndow_border; _wi ndow_border;
skipping to change at line 126 skipping to change at line 127
/** /**
* \brief * \brief
* *
*/ */
virtual void SetComponentBorderColor(int red, int green, int blue, int alpha); virtual void SetComponentBorderColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetComponentBackgroungFocusColor(int red, int g virtual void SetComponentBorderFocusColor(int red, int green
reen, int blue, int alpha); , int blue, int alpha);
/**
* \brief
*
*/
virtual void SetComponentBackgroundFocusColor(int red, int g
reen, int blue, int alpha);
/** /**
* \brief * \brief
* *
*/ */
virtual void SetComponentForegroundFocusColor(int red, int g reen, int blue, int alpha); virtual void SetComponentForegroundFocusColor(int red, int g reen, int blue, int alpha);
/** /**
* \brief * \brief
* *
 End of changes. 4 change blocks. 
5 lines changed or deleted 13 lines changed or added


 jthememanager.h   jthememanager.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 THEMEMANAGER_H #ifndef J_THEMEMANAGER_H
#define THEMEMANAGER_H #define J_THEMEMANAGER_H
#include "jtheme.h" #include "jtheme.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
namespace jgui { namespace jgui {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtooglebutton.h   jtooglebutton.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TOOGLEBUTTON_H #ifndef J_TOOGLEBUTTON_H
#define TOOGLEBUTTON_H #define J_TOOGLEBUTTON_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jimagebutton.h" #include "jimagebutton.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jtree.h   jtree.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 TREE_H #ifndef J_TREE_H
#define TREE_H #define J_TREE_H
#include "jmenu.h" #include "jmenu.h"
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
skipping to change at line 51 skipping to change at line 51
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class Tree : public jgui::Component{ class Tree : public jgui::Component{
friend class TreeComponent; friend class TreeComponent;
private: private:
jthread::Mutex _tree_mutex; jthread::Mutex _tree_mutex;
std::vector<Tree *> _trees; std::vector<Tree *> _trees;
std::vector<MenuListener *> _listeners; std::vector<MenuListener *> _tree_listeners;
TreeItem *_current_item; TreeItem *_current_item;
TreeComponent *_list; TreeComponent *_list;
int _visible_items; int _visible_items;
jmenu_align_t _menu_align; jmenu_align_t _menu_align;
jcolor_t _item_color;
public: public:
/** /**
* \brief * \brief
* *
*/ */
Tree(int x = 0, int y = 0, int width = 0, int visible_items = 3); Tree(int x = 0, int y = 0, int width = 0, int visible_items = 3);
/** /**
* \brief * \brief
skipping to change at line 98 skipping to change at line 99
/** /**
* \brief * \brief
* *
*/ */
void SetLoop(bool loop); void SetLoop(bool loop);
/** /**
* \brief * \brief
* *
*/ */
uint32_t GetItemColor(); jcolor_t GetItemColor();
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
skipping to change at line 344 skipping to change at line 345
int bx, int bx,
by, by,
bwidth, bwidth,
bheight, bheight,
_item_size, _item_size,
_index, _index,
_visible_items, _visible_items,
_paint_count, _paint_count,
_vertical_gap, _vertical_gap,
_horizontal_gap; _horizontal_gap;
int _item_red, jcolor_t _item_color;
_item_green,
_item_blue,
_item_alpha;
float delta; float delta;
bool _input_locked, bool _input_locked,
_arrows_visible, _arrows_visible,
_loop; _loop;
/** /**
* \brief * \brief
* *
*/ */
void SetTree(Tree *tree); void SetTree(Tree *tree);
skipping to change at line 388 skipping to change at line 386
/** /**
* \brief * \brief
* *
*/ */
void SetLoop(bool loop); void SetLoop(bool loop);
/** /**
* \brief * \brief
* *
*/ */
uint32_t GetItemColor(); jcolor_t GetItemColor();
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(uint32_t color); void SetItemColor(jcolor_t color);
/** /**
* \brief * \brief
* *
*/ */
void SetItemColor(int red, int green, int blue, int alpha); void SetItemColor(int red, int green, int blue, int alpha);
/** /**
* \brief * \brief
* *
 End of changes. 8 change blocks. 
11 lines changed or deleted 9 lines changed or added


 jwatch.h   jwatch.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 WATCH_H #ifndef J_WATCH_H
#define WATCH_H #define J_WATCH_H
#include "jcomponent.h" #include "jcomponent.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
#include "jautolock.h" #include "jautolock.h"
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jwindow.h   jwindow.h 
skipping to change at line 31 skipping to change at line 31
#define J_WINDOW_H #define J_WINDOW_H
#include "jcontainer.h" #include "jcontainer.h"
#include "jwindowlistener.h" #include "jwindowlistener.h"
#include "joffscreenimage.h" #include "joffscreenimage.h"
#include "jmutex.h" #include "jmutex.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#ifdef DIRECTFB_UI
#include <directfb.h>
#endif
namespace jgui{ namespace jgui{
class Graphics; class Graphics;
class InputManager; class InputManager;
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
skipping to change at line 90 skipping to change at line 86
/** /**
* \brief * \brief
* *
*/ */
Graphics * GetGraphics(); Graphics * GetGraphics();
/** /**
* \brief * \brief
* *
*/ */
void * GetWindowEngine(); void * GetNativeWindow();
/** /**
* \brief * \brief
* *
*/ */
virtual void SetOpacity(int i); virtual void SetOpacity(int i);
/** /**
* \brief * \brief
* *
 End of changes. 2 change blocks. 
5 lines changed or deleted 1 lines changed or added


 jwindowevent.h   jwindowevent.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 WINDOWEVENT_H #ifndef J_WINDOWEVENT_H
#define WINDOWEVENT_H #define J_WINDOWEVENT_H
#include "jeventobject.h" #include "jeventobject.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jwindowlistener.h   jwindowlistener.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 WINDOWLISTENER_H #ifndef J_WINDOWLISTENER_H
#define WINDOWLISTENER_H #define J_WINDOWLISTENER_H
#include "jwindowevent.h" #include "jwindowevent.h"
#include "jlistener.h" #include "jlistener.h"
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 jwindowmanager.h   jwindowmanager.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 WINDOWMANAGER_H #ifndef J_WINDOWMANAGER_H
#define WINDOWMANAGER_H #define J_WINDOWMANAGER_H
#include "jwindow.h" #include "jwindow.h"
#include "jobject.h" #include "jobject.h"
#include "jmutex.h" #include "jmutex.h"
#include <vector> #include <vector>
#ifdef DIRECTFB_UI
#include <directfb.h>
#endif
namespace jgui{ namespace jgui{
/** /**
* \brief * \brief
* *
* \author Jeff Ferr * \author Jeff Ferr
*/ */
class WindowManager : public virtual jcommon::Object{ class WindowManager : public virtual jcommon::Object{
private: private:
 End of changes. 2 change blocks. 
6 lines changed or deleted 2 lines changed or added


 jxmlparser.h   jxmlparser.h 
skipping to change at line 64 skipping to change at line 64
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <stdint.h>
/** /**
* \brief The support for explicit isn't that universal, and it isn't reall y * \brief The support for explicit isn't that universal, and it isn't reall y
* required - it is used to check that the XmlString class isn't incorrectl y * required - it is used to check that the XmlString class isn't incorrectl y
* used. Be nice to old compilers and macro it here: * used. Be nice to old compilers and macro it here:
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1200 ) #if defined(_MSC_VER) && (_MSC_VER >= 1200 )
#define TIXML_EXPLICIT explicit // Microsoft visual studio, version 6 and higher. #define TIXML_EXPLICIT explicit // Microsoft visual studio, version 6 and higher.
#elif defined(__GNUC__) && (__GNUC__ >= 3 ) #elif defined(__GNUC__) && (__GNUC__ >= 3 )
#define TIXML_EXPLICIT explicit // GCC version 3 and higher. s #define TIXML_EXPLICIT explicit // GCC version 3 and higher. s
skipping to change at line 420 skipping to change at line 421
XmlCursor location; XmlCursor location;
/** \brief Field containing a generic user pointer */ /** \brief Field containing a generic user pointer */
void *userData; void *userData;
/** /**
* \brief None of these methods are reliable for any languag e except English. * \brief None of these methods are reliable for any languag e except English.
* Good for approximation, not great for accuracy. * Good for approximation, not great for accuracy.
* *
*/ */
static int IsAlpha(unsigned char anyByte, XmlEncoding encodi ng); static int IsAlpha(uint8_t anyByte, XmlEncoding encoding);
/** /**
* \brief * \brief
* *
*/ */
static int IsAlphaNum(unsigned char anyByte, XmlEncoding enc oding); static int IsAlphaNum(uint8_t anyByte, XmlEncoding encoding) ;
/** /**
* \brief * \brief
* *
*/ */
static int ToLower(int v, XmlEncoding encoding); static int ToLower(int v, XmlEncoding encoding);
/** /**
* \brief * \brief
* *
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 lines changed or added


 jyesnodialog.h   jyesnodialog.h 
skipping to change at line 20 skipping to change at line 20
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* 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 YESNODIALOG_H #ifndef J_YESNODIALOG_H
#define YESNODIALOG_H #define J_YESNODIALOG_H
#include "jbutton.h" #include "jbutton.h"
#include "jbuttonlistener.h" #include "jbuttonlistener.h"
#include "jlabel.h" #include "jlabel.h"
#include "jframe.h" #include "jframe.h"
#include "jthread.h" #include "jthread.h"
#include "jmutex.h" #include "jmutex.h"
#include "jdate.h" #include "jdate.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 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/