cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

and remove integrated patches

Browse Source
This commit is contained in:
espie 2003-04-05 14:48:19 +00:00
parent eea691e9a2
commit d4512bb2c8
7 changed files with 0 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
x11/qt3/patches/patch-src_kernel_qapplication_x11_cpp
View File

@ -1,156 +0,0 @@
$OpenBSD: patch-src_kernel_qapplication_x11_cpp,v 1.1 2003/01/19 17:36:51 espie Exp $
--- src/kernel/qapplication_x11.cpp.orig Mon Dec 9 10:40:39 2002
+++ src/kernel/qapplication_x11.cpp Sun Jan 19 16:07:04 2003
@@ -360,8 +360,8 @@ static bool qt_x11EventFilter( XEvent* e
#if !defined(QT_NO_XIM)
XIM qt_xim = 0;
XIMStyle qt_xim_style = 0;
-// static XIMStyle xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
-static XIMStyle xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
+static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing;
+static XIMStyle xim_preferred_style = 0;
#endif
static int composingKeycode=0;
@@ -988,6 +988,32 @@ bool QApplication::x11_apply_settings()
qt_use_rtl_extensions =
settings.readBoolEntry("/qt/useRtlExtensions", FALSE);
+#ifndef QT_NO_XFTFREETYPE
+ // defined in qfont_x11.cpp
+ extern bool qt_has_xft;
+ extern bool qt_use_antialiasing;
+
+ qt_has_xft = FALSE;
+ qt_use_antialiasing = FALSE;
+ if (qt_use_xrender &&
+ XftInit(0) && XftInitFtLibrary()) {
+ qt_has_xft = settings.readBoolEntry( "/qt/enableXft", TRUE );
+ qt_use_antialiasing = settings.readBoolEntry( "/qt/useXft", TRUE );
+ }
+#endif // QT_NO_XFTFREETYPE
+
+ QString ximInputStyle =
+ settings.readEntry( "/qt/XIMInputStyle",
+ QObject::trUtf8( "On The Spot" ) ).lower();
+ if ( ximInputStyle == "on the spot" )
+ xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
+ else if ( ximInputStyle == "over the spot" )
+ xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
+ else if ( ximInputStyle == "off the spot" )
+ xim_preferred_style = XIMPreeditArea | XIMStatusArea;
+ else if ( ximInputStyle == "root" )
+ xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
+
if (update_timestamp) {
QBuffer stamp;
QDataStream s(stamp.buffer(), IO_WriteOnly);
@@ -1452,25 +1478,7 @@ void qt_init_internal( int *argcptr, cha
p = strrchr( argv[0], '/' );
appName = p ? p + 1 : argv[0];
- // Read global settings file
-#if !defined(QT_NO_XIM)
- if ( QApplication::desktopSettingsAware() ) {
- QString ximInputStyle =
- QSettings().readEntry( "/qt/XIMInputStyle",
- QObject::trUtf8( "On The Spot" ) ).lower();
- if ( ximInputStyle == "on the spot" )
- xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing;
- else if ( ximInputStyle == "over the spot" )
- xim_preferred_style = XIMPreeditPosition | XIMStatusNothing;
- else if ( ximInputStyle == "off the spot" )
- xim_preferred_style = XIMPreeditArea | XIMStatusArea;
- else if ( ximInputStyle == "root" )
- xim_preferred_style = XIMPreeditNothing | XIMStatusNothing;
- }
-#endif
-
// Get command line params
-
j = 1;
for ( int i=1; i<argc; i++ ) {
if ( argv[i] && *argv[i] != '-' ) {
@@ -1974,8 +1982,28 @@ void qt_init_internal( int *argcptr, cha
setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work
if ( qt_is_gui_used ) {
+ qt_set_input_encoding();
+
+ // be smart about the size of the default font. most X servers have helvetica
+ // 12 point available at 2 resolutions:
+ // 75dpi (12 pixels) and 100dpi (17 pixels).
+ // At 95 DPI, a 12 point font should be 16 pixels tall - in which case a 17
+ // pixel font is a closer match than a 12 pixel font
+ int ptsz =
+ (int) ( ( ( QPaintDevice::x11AppDpiY() >= 95 ? 17. : 12. ) *
+ 72. / (float) QPaintDevice::x11AppDpiY() ) + 0.5 );
+
+ if ( !qt_app_has_font ) {
+ QFont f( "Helvetica", ptsz );
+ QApplication::setFont( f );
+ }
+
+ qt_set_x11_resources( appFont, appFGCol, appBGCol, appBTNCol);
#ifndef QT_NO_XIM
+ if ( ! xim_preferred_style ) // no configured input style, use the default
+ xim_preferred_style = xim_default_style;
+
qt_xim = 0;
QString ximServerName(ximServer);
if (ximServer)
@@ -2001,24 +2029,6 @@ void qt_init_internal( int *argcptr, cha
#endif // USE_X11R6_XIM
#endif // QT_NO_XIM
- qt_set_input_encoding();
-
- // be smart about the size of the default font. most X servers have helvetica
- // 12 point available at 2 resolutions:
- // 75dpi (12 pixels) and 100dpi (17 pixels).
- // At 95 DPI, a 12 point font should be 16 pixels tall - in which case a 17
- // pixel font is a closer match than a 12 pixel font
- int ptsz =
- (int) ( ( ( QPaintDevice::x11AppDpiY() >= 95 ? 17. : 12. ) *
- 72. / (float) QPaintDevice::x11AppDpiY() ) + 0.5 );
-
- if ( !qt_app_has_font ) {
- QFont f( "Helvetica", ptsz );
- QApplication::setFont( f );
- }
-
- qt_set_x11_resources( appFont, appFGCol, appBGCol, appBTNCol);
-
#if defined (QT_TABLET_SUPPORT)
int ndev,
i,
@@ -2573,7 +2583,7 @@ void QApplication::setMainWidget( QWidge
QApplication cursor stack
*****************************************************************************/
-extern void qt_x11_enforce_cursor( QWidget * w, bool unset );
+extern void qt_x11_enforce_cursor( QWidget * w );
typedef QPtrList<QCursor> QCursorList;
@@ -2638,7 +2648,8 @@ void QApplication::setOverrideCursor( co
QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
register QWidget *w;
while ( (w=it.current()) ) { // for all widgets that have
- qt_x11_enforce_cursor( w, FALSE );
+ if ( w->testWState( WState_OwnCursor ) )
+ qt_x11_enforce_cursor( w );
++it;
}
XFlush( appDpy ); // make X execute it NOW
@@ -2665,7 +2676,8 @@ void QApplication::restoreOverrideCursor
QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
register QWidget *w;
while ( (w=it.current()) ) { // set back to original cursors
- qt_x11_enforce_cursor( w, FALSE );
+ if ( w->testWState( WState_OwnCursor ) )
+ qt_x11_enforce_cursor( w );
++it;
}
XFlush( appDpy );

33
x11/qt3/patches/patch-src_kernel_qdnd_x11_cpp
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-src_kernel_qdnd_x11_cpp,v 1.2 2003/02/09 19:16:17 espie Exp $
--- src/kernel/qdnd_x11.cpp.orig Thu Feb 6 12:26:53 2003
+++ src/kernel/qdnd_x11.cpp Thu Feb 6 18:59:58 2003
@@ -246,7 +246,6 @@ static const char* const default_pm[] =
};
class QShapedPixmapWidget : public QWidget {
- QPixmap pixmap;
public:
QShapedPixmapWidget(int screen = -1) :
QWidget(QApplication::desktop()->screen( screen ),
@@ -256,18 +255,13 @@ public:
void setPixmap(QPixmap pm)
{
- pixmap = pm;
- if ( pixmap.mask() ) {
- setMask( *pixmap.mask() );
+ if ( pm.mask() ) {
+ setMask( *pm.mask() );
} else {
clearMask();
}
resize(pm.width(),pm.height());
- }
-
- void paintEvent(QPaintEvent*)
- {
- bitBlt(this,0,0,&pixmap);
+ setErasePixmap(pm);
}
};

30
x11/qt3/patches/patch-src_kernel_qfont_x11_cpp
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_kernel_qfont_x11_cpp,v 1.1 2003/01/19 17:36:51 espie Exp $
--- src/kernel/qfont_x11.cpp.orig Mon Dec 9 10:40:44 2002
+++ src/kernel/qfont_x11.cpp Sun Jan 19 16:02:09 2003
@@ -2850,8 +2850,6 @@ QFont::Script QFontPrivate::defaultScrip
QSingleCleanupHandler<QFontCache> cleanup_fontcache;
QSingleCleanupHandler<QFontNameDict> cleanup_fontnamedict;
-extern bool qt_use_xrender; // defined in qapplication_x11.cpp
-
/*!
Internal function that initializes the font system.
@@ -2893,17 +2891,6 @@ void QFont::initialize()
}
#endif // QT_NO_BIG_CODECS
#endif // QT_NO_CODECS
-
-#ifndef QT_NO_XFTFREETYPE
- qt_has_xft = FALSE;
-
- if (qt_use_xrender &&
- XftInit(0) && XftInitFtLibrary()) {
- QSettings settings;
- qt_has_xft = settings.readBoolEntry( "/qt/enableXft", TRUE );
- qt_use_antialiasing = QSettings().readBoolEntry( "/qt/useXft", TRUE );
- }
-#endif // QT_NO_XFTFREETYPE
QTextCodec *codec = QTextCodec::codecForLocale();
// we have a codec for the locale - lets see if it's one of the CJK codecs,

12
x11/qt3/patches/patch-src_kernel_qjpegio_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_kernel_qjpegio_cpp,v 1.1 2003/03/04 18:06:59 espie Exp $
--- src/kernel/qjpegio.cpp.orig Tue Mar 4 19:00:44 2003
+++ src/kernel/qjpegio.cpp Tue Mar 4 19:02:09 2003
@@ -235,7 +235,7 @@ void read_jpeg_image(QImageIO* iio)
} else if ( params.contains( "Scale" ) ) {
- sscanf( params.latin1(), "Scale( %i, %i, %s )", &sWidth, &sHeight, sModeStr );
+ sscanf( params.latin1(), "Scale( %i, %i, %1023s )", &sWidth, &sHeight, sModeStr );
QString sModeQStr( sModeStr );
if ( sModeQStr == "ScaleFree" ) {

19
x11/qt3/patches/patch-src_kernel_qwidget_cpp
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_kernel_qwidget_cpp,v 1.1 2003/01/19 17:36:51 espie Exp $
--- src/kernel/qwidget.cpp.orig Mon Dec 9 10:40:44 2002
+++ src/kernel/qwidget.cpp Sun Jan 19 16:00:29 2003
@@ -1473,8 +1473,13 @@ void QWidget::setEnabled( bool enable )
}
}
#if defined(Q_WS_X11)
- extern void qt_x11_enforce_cursor( QWidget * w, bool unset );
- qt_x11_enforce_cursor( this, FALSE );
+ if ( testWState( WState_OwnCursor ) ) {
+ // enforce the windows behavior of clearing the cursor on
+ // disabled widgets
+
+ extern void qt_x11_enforce_cursor( QWidget * w ); // defined in qwidget_x11.cpp
+ qt_x11_enforce_cursor( this );
+ }
#endif
}

66
x11/qt3/patches/patch-src_kernel_qwidget_x11_cpp
View File

@ -1,66 +0,0 @@
$OpenBSD: patch-src_kernel_qwidget_x11_cpp,v 1.3 2003/01/19 17:36:51 espie Exp $
--- src/kernel/qwidget_x11.cpp.orig Mon Dec 9 10:40:44 2002
+++ src/kernel/qwidget_x11.cpp Sun Jan 19 16:00:29 2003
@@ -164,22 +164,21 @@ Window qt_XCreateSimpleWindow( const QWi
void qt_XDestroyWindow( const QWidget *destroyer,
Display *display, Window window );
-Q_EXPORT void qt_x11_enforce_cursor( QWidget * w, bool unset )
+Q_EXPORT void qt_x11_enforce_cursor( QWidget * w )
{
- QCursor * oc = QApplication::overrideCursor();
- if ( oc ) {
- XDefineCursor( w->x11Display(), w->winId(), oc->handle() );
- } else if ( unset ) {
- XDefineCursor( w->x11Display(), w->winId(), None );
- } else if ( w->isEnabled() ) {
- XDefineCursor( w->x11Display(), w->winId(), w->cursor().handle() );
- } else {
- QWidget *parent = w->parentWidget();
- while ( parent && !parent->isEnabled() )
- parent = parent->parentWidget();
- if ( parent ) {
- XDefineCursor( w->x11Display(), w->winId(), parent->cursor().handle() );
+ if ( w->testWState( Qt::WState_OwnCursor ) ) {
+ QCursor * oc = QApplication::overrideCursor();
+ if ( oc ) {
+ XDefineCursor( w->x11Display(), w->winId(), oc->handle() );
+ } else if ( w->isEnabled() ) {
+ XDefineCursor( w->x11Display(), w->winId(), w->cursor().handle() );
+ } else {
+ // enforce the windows behavior of clearing the cursor on
+ // disabled widgets
+ XDefineCursor( w->x11Display(), w->winId(), None );
}
+ } else {
+ XDefineCursor( w->x11Display(), w->winId(), None );
}
}
@@ -554,7 +553,7 @@ void QWidget::create( WId window, bool i
setWState( WState_Visible );
} else if ( topLevel ) { // set X cursor
if ( initializeWindow )
- qt_x11_enforce_cursor( this, FALSE );
+ qt_x11_enforce_cursor( this );
setWState( WState_OwnCursor );
}
@@ -915,7 +914,7 @@ void QWidget::setCursor( const QCursor &
extra->curs = new QCursor(cursor);
}
setWState( WState_OwnCursor );
- qt_x11_enforce_cursor( this, FALSE );
+ qt_x11_enforce_cursor( this );
XFlush( x11Display() );
}
@@ -927,7 +926,7 @@ void QWidget::unsetCursor()
extra->curs = 0;
}
clearWState( WState_OwnCursor );
- qt_x11_enforce_cursor( this, TRUE );
+ qt_x11_enforce_cursor( this );
XFlush( x11Display() );
}
}

27
x11/qt3/patches/patch-src_moc_moc_y
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_moc_moc_y,v 1.1 2003/01/19 17:36:51 espie Exp $
--- src/moc/moc.y.orig Mon Dec 9 10:40:28 2002
+++ src/moc/moc.y Sun Jan 19 16:00:29 2003
@@ -845,6 +845,7 @@ type_name: elaborated_type_specifier
simple_type_names: simple_type_names simple_type_name
{ $$ = straddSpc($1,$2); }
| simple_type_name { $$ = $1; }
+ ;
simple_type_name: CHAR { $$ = "char"; }
| SHORT { $$ = "short"; }
@@ -977,6 +978,7 @@ fct_decl: '('
cv_qualifier_list_opt
ctor_initializer_opt
exception_spec_opt
+ opt_identifier
fct_body_or_semicolon
{ tmpFunc->args = $2;
tmpFunc->qualifier = $4; }
@@ -1090,6 +1092,7 @@ full_class_head: class_head
nested_class_head: class_key
qualified_class_name
opt_base_spec { templateClass = templateClassOld; }
+ ;
exception_spec_opt: /* empty */
| exception_spec