Skip to content

Commit

Permalink
patch to support mipspro natively
Browse files Browse the repository at this point in the history
  • Loading branch information
shaleh committed Aug 25, 2002
1 parent 20a67ee commit aa2964d
Show file tree
Hide file tree
Showing 8 changed files with 147 additions and 64 deletions.
1 change: 0 additions & 1 deletion AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Current Contributors:
Matt Wilson <mwilson@quicksilver.net.nz>
- for noticing all of the little things


nls contributors:
Mads Martin Joergensen <mmj@suse.de>
- Danish (da_DK) nls support
Expand Down
27 changes: 13 additions & 14 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@ Changes from 0.62.1 to 0.65.0:
- huge amounts of internal cleanups
- added emacs local variables to each file that prevent the addition of tabs
- added a Util.cc file which contains useful functions with no obvious home.
- removed several unused variables and otherwise reduced the memory usage
of the objects in Blackbox. For the record we are about 100k larger than
0.62.0 and that is mostly due to the STL. However for the most part
blackbox runs faster and is still one of the leanest window managers out
there today.
- move code over to the STL
- removed several unused variables and otherwise reduced the memory usage
of the objects in Blackbox. For the record the binary is roughly 100k
larger than 0.62.0 and that is mostly due to the STL but there is also a
fair bit of new code. However for the most part blackbox runs faster and
is still one of the leanest window managers out there today.
- bsetroot now sets _XROOTPMAP_ID, so pseudo transparent apps will be happy
- beginnings of a strut implementation. toolbar and slit are removed from
the available screen area if 'full maximize' is not set
- handle the odd edge case where a reparent event occurs while the window
is unmapped. XReparentWindow sends an UnmapNotify to the window manager
however the window is already unmapped so the window manager never gets
the event and the unmapNotify event is where reparentNotify was handled.
Added a reparentNotifyEvent handler in the BlackboxWindow class and a new
case in the Blackbox class's process_event function.
- XReparentWindow sends an UnmapNotify to the window manager however
in certain cases the window is already unmapped so the window manager
never gets the event and the unmapNotify event is where reparentNotify was
handled. Added a reparentNotifyEvent handler in the BlackboxWindow class
and a new case in the Blackbox class's process_event function.
- no more blackbox->grab/ungrab calls everywhere
- compression of motion and expose
- Now we have one function which turns ~/ into /home/user/. This is now
Expand All @@ -38,9 +37,9 @@ Changes from 0.62.1 to 0.65.0:
- update transient handling, should solve issues with apps like acroread.
added a getTransientInfo() method of the BlackboxWindow class which
handles checking the transient state in X and setting the appropriate
variables on the window. To further attack the infinite loops this
function ensures that client.transient != this. We also check for loops
of the forms A -> B -> C -> A. The new transient code also allows for one
variables on the window. To attack the infinite loops this
function ensures that client.transient != this and we check for loops
of the form A -> B -> C -> A. The new transient code also allows for one
window to have multiple transients so applications like xmms and web
browsers are better behaved.
- even better ICCCM support and focus handling
Expand Down
78 changes: 54 additions & 24 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2485,20 +2485,46 @@ test x$x_includes = "x" && x_includes="/usr/include"
test x$x_libraries = "x" && x_libraries="/usr/lib"

CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS -Wall -W -pedantic"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS"
LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"

echo $ac_n "checking for GCC""... $ac_c" 1>&6
echo "configure:2494: checking for GCC" >&5
if test x$GCC = "xyes"; then
echo "$ac_t""yes" 1>&6
CXXFLAGS="${CXXFLAGS} -Wall -W -pedantic"
else
echo "$ac_t""no, trying other compilers" 1>&6
echo $ac_n "checking for MIPSpro""... $ac_c" 1>&6
echo "configure:2501: checking for MIPSpro" >&5
mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
if test "x$mips_pro_ver" = "x"; then
echo "$ac_t""no" 1>&6
else
echo "$ac_t""yes, version $mips_pro_ver." 1>&6
echo $ac_n "checking for -LANG:std in CXXFLAGS""... $ac_c" 1>&6
echo "configure:2508: checking for -LANG:std in CXXFLAGS" >&5
lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
if test "x$lang_std_not_set" = "x"; then
echo "$ac_t""not set, setting." 1>&6
CXXFLAGS="${CXXFLAGS} -LANG:std"
else
echo "$ac_t""already set." 1>&6
fi
fi
fi

echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
echo "configure:2494: checking for XOpenDisplay in -lX11" >&5
echo "configure:2520: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2502 "configure"
#line 2528 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Expand All @@ -2509,7 +2535,7 @@ int main() {
XOpenDisplay()
; return 0; }
EOF
if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
Expand Down Expand Up @@ -2538,7 +2564,7 @@ Xext_lib=""

SHAPE=""
echo $ac_n "checking whether to build support for the XShape extension""... $ac_c" 1>&6
echo "configure:2542: checking whether to build support for the XShape extension" >&5
echo "configure:2568: checking whether to build support for the XShape extension" >&5
# Check whether --enable-shape or --disable-shape was given.
if test "${enable_shape+set}" = set; then
enableval="$enable_shape"
Expand All @@ -2550,15 +2576,15 @@ fi
if test x$enableval = "xyes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XShapeCombineShape in -lXext""... $ac_c" 1>&6
echo "configure:2554: checking for XShapeCombineShape in -lXext" >&5
echo "configure:2580: checking for XShapeCombineShape in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeCombineShape | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lXext $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2562 "configure"
#line 2588 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Expand All @@ -2569,7 +2595,7 @@ int main() {
XShapeCombineShape()
; return 0; }
EOF
if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
Expand All @@ -2585,9 +2611,9 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
echo "configure:2589: checking for X11/extensions/shape.h" >&5
echo "configure:2615: checking for X11/extensions/shape.h" >&5
cat > conftest.$ac_ext <<EOF
#line 2591 "configure"
#line 2617 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Expand All @@ -2597,7 +2623,7 @@ int main() {
long foo = ShapeSet
; return 0; }
EOF
if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
SHAPE="-DSHAPE"; Xext_lib="-lXext"
Expand All @@ -2623,7 +2649,7 @@ LIBS="$LIBS $Xext_lib"

ORDEREDPSEUDO=""
echo $ac_n "checking whether to include Pseudocolor ordered dithering code""... $ac_c" 1>&6
echo "configure:2627: checking whether to include Pseudocolor ordered dithering code" >&5
echo "configure:2653: checking whether to include Pseudocolor ordered dithering code" >&5
# Check whether --enable-ordered-pseudo or --disable-ordered-pseudo was given.
if test "${enable_ordered_pseudo+set}" = set; then
enableval="$enable_ordered_pseudo"
Expand All @@ -2642,13 +2668,17 @@ fi

DEBUG=""
echo $ac_n "checking whether to include verbose debugging code""... $ac_c" 1>&6
echo "configure:2646: checking whether to include verbose debugging code" >&5
echo "configure:2672: checking whether to include verbose debugging code" >&5
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
if test x$enableval = "xyes"; then
echo "$ac_t""yes" 1>&6
DEBUG="-DDEBUG -fno-inline -g"
if test x$GCC = "xyes"; then
DEBUG="-DDEBUG -fno-inline -g"
else
DEBUG="-DDEBUG"
fi
else
echo "$ac_t""no" 1>&6
DEBUG="-DNDEBUG"
Expand All @@ -2663,7 +2693,7 @@ fi

NLS=""
echo $ac_n "checking whether to include NLS support""... $ac_c" 1>&6
echo "configure:2667: checking whether to include NLS support" >&5
echo "configure:2697: checking whether to include NLS support" >&5
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
enableval="$enable_nls"
Expand All @@ -2682,15 +2712,15 @@ fi


echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6
echo "configure:2686: checking for setlocale in -lxpg4" >&5
echo "configure:2716: checking for setlocale in -lxpg4" >&5
ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lxpg4 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2694 "configure"
#line 2724 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Expand All @@ -2701,7 +2731,7 @@ int main() {
setlocale()
; return 0; }
EOF
if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
Expand All @@ -2727,7 +2757,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2731: checking for $ac_word" >&5
echo "configure:2761: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gencat_cmd'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
Expand Down Expand Up @@ -2763,7 +2793,7 @@ fi

TIMEDCACHE=""
echo $ac_n "checking whether to use the new timed pixmap cache""... $ac_c" 1>&6
echo "configure:2767: checking whether to use the new timed pixmap cache" >&5
echo "configure:2797: checking whether to use the new timed pixmap cache" >&5
# Check whether --enable-timed-cache or --disable-timed-cache was given.
if test "${enable_timed_cache+set}" = set; then
enableval="$enable_timed_cache"
Expand All @@ -2782,12 +2812,12 @@ fi


echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:2786: checking return type of signal handlers" >&5
echo "configure:2816: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2791 "configure"
#line 2821 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
Expand All @@ -2804,7 +2834,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:2808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
Expand All @@ -2824,7 +2854,7 @@ EOF


echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:2828: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo "configure:2858: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
Expand Down
31 changes: 29 additions & 2 deletions configure.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,33 @@ test x$x_includes = "x" && x_includes="/usr/include"
test x$x_libraries = "x" && x_libraries="/usr/lib"

CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS -Wall -W -pedantic"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS"
LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"

AC_MSG_CHECKING(for GCC)
if test x$GCC = "xyes"; then
AC_MSG_RESULT([yes])
CXXFLAGS="${CXXFLAGS} -Wall -W -pedantic"
else
AC_MSG_RESULT([no, trying other compilers])
AC_MSG_CHECKING(for MIPSpro)
mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
if test "x$mips_pro_ver" = "x"; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes, version $mips_pro_ver.])
AC_MSG_CHECKING(for -LANG:std in CXXFLAGS)
lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
if test "x$lang_std_not_set" = "x"; then
AC_MSG_RESULT([not set, setting.])
CXXFLAGS="${CXXFLAGS} -LANG:std"
else
AC_MSG_RESULT([already set.])
fi
fi
fi

dnl Check for required functions in -lX11
AC_CHECK_LIB(X11, XOpenDisplay,
LIBS="$LIBS -lX11",
Expand Down Expand Up @@ -106,7 +129,11 @@ AC_ARG_ENABLE(debug,
[ --enable-debug include verbose debugging code [default=no]],
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
DEBUG="-DDEBUG -fno-inline -g"
if test x$GCC = "xyes"; then
DEBUG="-DDEBUG -fno-inline -g"
else
DEBUG="-DDEBUG"
fi
else
AC_MSG_RESULT([no])
DEBUG="-DNDEBUG"
Expand Down
5 changes: 2 additions & 3 deletions src/Basemenu.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,17 @@ extern "C" {
}

#include <string>
#include <deque>
#include <vector>

class Blackbox;
class BImageControl;
class BScreen;
class Basemenu;
class BasemenuItem;


class Basemenu {
private:
typedef std::deque<BasemenuItem*> MenuItems;
typedef std::vector<BasemenuItem*> MenuItems;
MenuItems menuitems;
Blackbox *blackbox;
Basemenu *parent;
Expand Down
4 changes: 2 additions & 2 deletions src/Timer.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ struct TimerLessThan {
}
};

#include <deque>
typedef _timer_queue<BTimer*, std::deque<BTimer*>, TimerLessThan> TimerQueue;
#include <vector>
typedef _timer_queue<BTimer*, std::vector<BTimer*>, TimerLessThan> TimerQueue;

class TimerQueueManager {
public:
Expand Down
Loading

0 comments on commit aa2964d

Please sign in to comment.