diff options
Diffstat (limited to 'src/kernel/tqapplication_x11.cpp')
| -rw-r--r-- | src/kernel/tqapplication_x11.cpp | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/kernel/tqapplication_x11.cpp b/src/kernel/tqapplication_x11.cpp index e9877fe0c..eeb5e0e36 100644 --- a/src/kernel/tqapplication_x11.cpp +++ b/src/kernel/tqapplication_x11.cpp @@ -341,7 +341,7 @@ static int xsync_errorbase; static long qt_alt_mask = 0; static long qt_meta_mask = 0; // modifier mask to remove mode switch from modifiers that have alt/meta set -// this problem manifests itself on HP/UX 10.20 at least, and without it +// this problem manifests itself on some systems, and without it // modifiers do not work at all... static long qt_mode_switch_remove_mask = 0; @@ -1972,33 +1972,7 @@ void tqt_init_internal( int *argcptr, char **argv, TQPaintDevice::x_appvisual_arr[ screen ]); int i, count; - TQPaintDevice::x_appcolormap_arr[ screen ] = 0; - - if ( ! serverVendor.contains( "Hewlett-Packard" ) ) { - // on HPUX 10.20 local displays, the RGB_DEFAULT_MAP colormap - // doesn't give us correct colors. Why this happens, I have - // no clue, so we disable this for HPUX - if (XGetRGBColormaps(appDpy, - TQPaintDevice::x11AppRootWindow( screen ), - &stdcmap, &count, XA_RGB_DEFAULT_MAP)) { - i = 0; - while (i < count && - TQPaintDevice::x_appcolormap_arr[ screen ] == 0) { - if (stdcmap[i].visualid == vid) { - TQPaintDevice::x_appcolormap_arr[ screen ] = - stdcmap[i].colormap; - } - i++; - } - - XFree( (char *)stdcmap ); - } - } - - if (TQPaintDevice::x_appcolormap_arr[ screen ] == 0) { - TQPaintDevice::x_appcolormap_arr[ screen ] = - DefaultColormap(appDpy, screen); - } + TQPaintDevice::x_appcolormap_arr[ screen ] = DefaultColormap(appDpy, screen); } else { // create a custom colormap TQPaintDevice::x_appcolormap_arr[ screen ] = @@ -5255,7 +5229,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, // save the modifier state, we will use the keystate uint later by passing // it to qt_x11_translateButtonState uint keystate = event->xkey.state; - // remove the modifiers where mode_switch exists... HPUX machines seem + // remove the modifiers where mode_switch exists... some machines seem // to have alt *AND* mode_switch both in Mod1Mask, which causes // XLookupString to return things like '�' (aring) for ALT-A. This // completely breaks modifiers. If we remove the modifier for Mode_switch, |