Gentoo Attachment #42419 for bug #66368

View | Details | Raw Unified
Collapse All | Expand All

(-) fglrx_panel_sources.orig/AdjustPage.cpp (-6 / +14 lines)

Lines 23-34	Link Here

#endif // DEBUG

#endif // DEBUG

AdjustPage::AdjustPage ( QWidget *parent, int CurMonitor ) : QWidget ( parent,  0 )

AdjustPage::AdjustPage ( QWidget *parent, int CurMonitor ) : QWidget ( parent,  0 ),

  m_HasSecondary ( FALSE ), m_Init ( FALSE ), m_TimingsChanged ( FALSE ),

  m_CurMonitor = CurMonitor ;

  m_CurMonitor ( CurMonitor ), m_Timings ( ), m_DotClock ( 0 ), m_CurTimings ( ),

  m_Init = FALSE ;

  m_CurDotClock ( 0 ), m_Gamma ( ), m_CurGamma ( ),

  m_TimingsChanged = FALSE ;

  pMonitorBox ( 0 ), pLeft ( 0 ), pRight ( 0 ), pUp ( 0 ), pDown ( 0 ), pWider ( 0 ),

  pSmaler ( 0 ),  pHigher ( 0 ), pLower ( 0 ), pSyncHorz ( 0 ), pSyncVert ( 0 ), pUndo ( 0 ),

  pDefault ( 0 ), pCouple ( 0 ),

#ifdef FGLRX_GAMMA_X

  pGammaX ( 0 ),

#endif // FGLRX_GAMMA_X

    pSliderRed ( 0 ), pSliderGreen ( 0 ), pSliderBlue ( 0 ), pTextRed ( 0 ), pTextGreen ( 0 ),

    pTextBlue ( 0 ), pDefaultRed ( 0 ), pDefaultGreen ( 0 ), pDefaultBlue ( 0 )

{ }

void AdjustPage::Init ( )

void AdjustPage::Init ( )

(-) fglrx_panel_sources.orig/AdjustPage.h (-5 / +7 lines)

Lines 1-3	Link Here

#ifndef _ADJUSTPAGE_

#define _ADJUSTPAGE_

#include <qstring.h>

#include <qstring.h>

#include <qwidget.h>

#include <qwidget.h>

#include <qlabel.h>

#include <qlabel.h>

Lines 12-20	Link Here

#define XMD_H 1

#define XMD_H 1

#include <X11/extensions/xf86vmode.h>

#include <X11/extensions/xf86vmode.h>

#define GAMMA_MIN	0.1

const double GAMMA_MIN = 0.1;

#define GAMMA_MAX	10.0

const double GAMMA_MAX = 10.0;

#define GAMMA_DEFAULT	1.0

const double GAMMA_DEFAULT = 1.0;

class AdjustPage: public QWidget

class AdjustPage: public QWidget

Lines 83-89	Link Here

} ;

} ;

} ;

} ;

#endif // _ADJUSTPAGE_

(-) fglrx_panel_sources.orig/BoardInfo.cpp (-3 / +8 lines)

Lines 139-147	Link Here

CBoardInfo BoardInfo ;

CBoardInfo BoardInfo ;

CBoardInfo::CBoardInfo ( )

CBoardInfo::CBoardInfo ( ) :

  m_NumBoards ( 0 ), m_FamilyName ( ), m_BoardName ( ), m_BIOSVersion ( ), m_ChipType ( ),

  m_ChipRevision ( ), m_DacSpeed ( 0 ), m_MemoryType ( ), m_MemorySize ( 0 ),

  m_TransferMode ( ), m_DriverVersion ( )

#ifdef FGLRX_OGL_INFO

  , m_OGLVendor ( ), m_OGLRenderer ( ), m_OGLVersion ( )

#endif // FGLRX_OGL_INFO

{ }

bool CBoardInfo::Init ( )

bool CBoardInfo::Init ( )

(-) fglrx_panel_sources.orig/BoardInfo.h (-95 / +108 lines)

Lines 1-7	Link Here

#ifndef _BOARDINFO_

#define _BOARDINFO_

#include <qglobal.h>

#include <qglobal.h>

#include <qstring.h>

#include <qstring.h>

#define LOG_FILE   "/var/log/XFree86.0.log"

const char LOG_FILE[] = "/var/log/XFree86.0.log";

class CBoardInfo

class CBoardInfo

Lines 48-170	Link Here

};

};

// ATI device IDs

// ATI device IDs

enum eDeviceID

// === R200 ===

// === R200 ===

#define DEVICE_ID_R200_QH       0x5148  // Function 0, workstation. - current FGL boards

  DEVICE_ID_R200_QH     = 0x5148,  // Function 0, workstation. - current FGL boards

#define DEVICE_ID_R200_QI       0x5149  // Function 0, workstation. - for future use

  DEVICE_ID_R200_QI     = 0x5149,  // Function 0, workstation. - for future use

#define DEVICE_ID_R200_QJ       0x514A  // Function 0, workstation. - for future use

  DEVICE_ID_R200_QJ     = 0x514A,  // Function 0, workstation. - for future use

#define DEVICE_ID_R200_QK       0x514B  // Function 0, workstation. - for future use

  DEVICE_ID_R200_QK     = 0x514B,  // Function 0, workstation. - for future use

#define DEVICE_ID_R200_QL       0x514C  // Function 0, regular.     - consumer div.

  DEVICE_ID_R200_QL     = 0x514C,  // Function 0, regular.     - consumer div.

#define DEVICE_ID_R200_QT       0x516C  // Function 1, regular.     - consumer div.

  DEVICE_ID_R200_QT     = 0x516C,  // Function 1, regular.     - consumer div.

#define DEVICE_ID_R200_BB       0x4242  // R200 chip on AiW board with bridget in PCI-PCI bridget mode.

  DEVICE_ID_R200_BB     = 0x4242,  // R200 chip on AiW board with bridget in PCI-PCI bridget mode.

#define DEVICE_ID_R200_QM       0x514D  // Radeon 9100

  DEVICE_ID_R200_QM     = 0x514D,  // Radeon 9100

#define DEVICE_ID_R200_QN       0x514E

  DEVICE_ID_R200_QN     = 0x514E,

#define DEVICE_ID_R200_QO       0x514F

  DEVICE_ID_R200_QO     = 0x514F,

// === RV250 ===

// === RV250 ===

#define DEVICE_ID_RV250_ID      0x4964	// workstation

  DEVICE_ID_RV250_ID    = 0x4964,	// workstation

#define DEVICE_ID_RV250_IE      0x4965  // workstation

  DEVICE_ID_RV250_IE    = 0x4965,  // workstation

#define DEVICE_ID_RV250_IF      0x4966  // regular

  DEVICE_ID_RV250_IF    = 0x4966,  // regular

#define DEVICE_ID_RV250_IG      0x4967  // regular

  DEVICE_ID_RV250_IG    = 0x4967,  // regular

#define DEVICE_ID_RV250_IL      0x496C  // workstation

  DEVICE_ID_RV250_IL    = 0x496C,  // workstation

#define DEVICE_ID_RV250_IM      0x496D  // workstation

  DEVICE_ID_RV250_IM    = 0x496D,  // workstation

#define DEVICE_ID_RV250_IN      0x496E  // regular

  DEVICE_ID_RV250_IN    = 0x496E,  // regular

#define DEVICE_ID_RV250_IO      0x496F  // regular

  DEVICE_ID_RV250_IO    = 0x496F,  // regular

#define DEVICE_ID_RV250_LD      0x4C64  // mobile workstation

  DEVICE_ID_RV250_LD    = 0x4C64,  // mobile workstation

#define DEVICE_ID_RV250_LE      0x4C65  // mobile workstation

  DEVICE_ID_RV250_LE    = 0x4C65,  // mobile workstation

#define DEVICE_ID_RV250_LF      0x4C66  // mobile regular

  DEVICE_ID_RV250_LF    = 0x4C66,  // mobile regular

#define DEVICE_ID_RV250_LG      0x4C67  // mobile regular

  DEVICE_ID_RV250_LG    = 0x4C67,  // mobile regular

#define DEVICE_ID_RV250_LL      0x4C6C  // mobile workstation

  DEVICE_ID_RV250_LL    = 0x4C6C,  // mobile workstation

#define DEVICE_ID_RV250_LM      0x4C6D  // mobile workstation

  DEVICE_ID_RV250_LM    = 0x4C6D,  // mobile workstation

#define DEVICE_ID_RV250_LN      0x4C6E  // mobile regular

  DEVICE_ID_RV250_LN    = 0x4C6E,  // mobile regular

#define DEVICE_ID_RV250_LO      0x4C6F  // mobile regular

  DEVICE_ID_RV250_LO    = 0x4C6F,  // mobile regular

// === RV280 ===

// === RV280 ===

#define DEVICE_ID_RV280_5960    0x5960  // RV280 PRO, RV280pro

  DEVICE_ID_RV280_5960  = 0x5960,  // RV280 PRO, RV280pro

#define DEVICE_ID_RV280_5961    0x5961  // RV280 Ya, RV280LE, regular

  DEVICE_ID_RV280_5961  = 0x5961,  // RV280 Ya, RV280LE, regular

//#define DEVICE_ID_RV280_5962    0x5962

//  DEVICE_ID_RV280_5962  = 0x5962,

//#define DEVICE_ID_RV280_5963    0x5963

//  DEVICE_ID_RV280_5963  = 0x5963,

#define DEVICE_ID_RV280_5964    0x5964  // RV280SE

  DEVICE_ID_RV280_5964  = 0x5964,  // RV280SE

//#define DEVICE_ID_RV280_5C60    0x5C60

//  DEVICE_ID_RV280_5C60  = 0x5C60,

#define DEVICE_ID_RV280_5C61    0x5C61  // RV280 M9+

  DEVICE_ID_RV280_5C61  = 0x5C61,  // RV280 M9+

//#define DEVICE_ID_RV280_5C62    0x5C62

//  DEVICE_ID_RV280_5C62  = 0x5C62,

#define DEVICE_ID_RV280_5C63    0x5C63  // RV280 M9+

  DEVICE_ID_RV280_5C63  = 0x5C63,  // RV280 M9+

// === R300 ===

// === R300 ===

#define DEVICE_ID_R300_AD       0x4144

  DEVICE_ID_R300_AD     = 0x4144,

#define DEVICE_ID_R300_AE       0x4145

  DEVICE_ID_R300_AE     = 0x4145,

#define DEVICE_ID_R300_AF       0x4146

  DEVICE_ID_R300_AF     = 0x4146,

#define DEVICE_ID_R300_AG       0x4147  // WS

  DEVICE_ID_R300_AG     = 0x4147,  // WS

#define DEVICE_ID_R300_ND       0x4E44

  DEVICE_ID_R300_ND     = 0x4E44,

#define DEVICE_ID_R300_NE       0x4E45

  DEVICE_ID_R300_NE     = 0x4E45,

#define DEVICE_ID_R300_NF       0x4E46

  DEVICE_ID_R300_NF     = 0x4E46,

#define DEVICE_ID_R300_NG       0x4E47  // WS

  DEVICE_ID_R300_NG     = 0x4E47,  // WS

// === R350 ===

// === R350 ===

#define DEVICE_ID_R350_AH       0x4148  // regular

  DEVICE_ID_R350_AH     = 0x4148,  // regular

//#define DEVICE_ID_R350_AI       0x4149

//  DEVICE_ID_R350_AI     = 0x4149,

//#define DEVICE_ID_R350_AJ       0x414A

//  DEVICE_ID_R350_AJ     = 0x414A,

#define DEVICE_ID_R350_AK       0x414B  // WS

  DEVICE_ID_R350_AK     = 0x414B,  // WS

#define DEVICE_ID_R350_NH       0x4E48  // regular

  DEVICE_ID_R350_NH     = 0x4E48,  // regular

#define DEVICE_ID_R350_NI       0x4E49  // regular

  DEVICE_ID_R350_NI     = 0x4E49,  // regular

#define DEVICE_ID_R350_NJ       0x4E4A  // regular

  DEVICE_ID_R350_NJ     = 0x4E4A,  // regular

#define DEVICE_ID_R350_NK       0x4E4B  // WS

  DEVICE_ID_R350_NK     = 0x4E4B,  // WS

// === RV350 ===

// === RV350 ===

#define DEVICE_ID_RV350_AP      0x4150  // regular

  DEVICE_ID_RV350_AP    = 0x4150,  // regular

#define DEVICE_ID_RV350_AQ      0x4151  // regular

  DEVICE_ID_RV350_AQ    = 0x4151,  // regular

#define DEVICE_ID_RV350_AR      0x4152  // regular

  DEVICE_ID_RV350_AR    = 0x4152,  // regular

//#define DEVICE_ID_RV350_AS      0x4153

//  DEVICE_ID_RV350_AS    = 0x4153,

#define DEVICE_ID_RV350_AT      0x4154  // WS

  DEVICE_ID_RV350_AT    = 0x4154,  // WS

#define DEVICE_ID_RV350_AU      0x4155  // WS

  DEVICE_ID_RV350_AU    = 0x4155,  // WS

#define DEVICE_ID_RV350_AV      0x4156  // WS

  DEVICE_ID_RV350_AV    = 0x4156,  // WS

#define DEVICE_ID_RV350_AW      0x4157  // WS

  DEVICE_ID_RV350_AW    = 0x4157,  // WS

// === M10 (Mobility version of RV350) ===

// === M10 (Mobility version of RV350) ===

#define DEVICE_ID_M10_NP        0x4E50  // regular

  DEVICE_ID_M10_NP      = 0x4E50,  // regular

#define DEVICE_ID_M10_NT        0x4E54  // WS

  DEVICE_ID_M10_NT      = 0x4E54  // WS

};

// board names

// board names

#define ADAPTER_NAME8700LE              "Fire GL 8700LE"

#define ADAPTER_NAME8700                "Fire GL 8700"

#define ADAPTER_NAME8800LE              "Fire GL 8800LE"

#define ADAPTER_NAME8800                "Fire GL 8800"

#define ADAPTER_NAMEE1                  "Fire GL E1"

#define ADAPTER_NAMEZ1AGPPRO            "Fire GL Z1"

#define ADAPTER_NAMEX1AGP               "Fire GL X1"

#define ADAPTER_NAMEX1AGPPRO            "Fire GL X1"

const char ADAPTER_NAME8700LE[]    = "Fire GL 8700LE";

const char ADAPTER_NAME8700[]      = "Fire GL 8700";

const char ADAPTER_NAME8800LE[]    = "Fire GL 8800LE";

const char ADAPTER_NAME8800[]      = "Fire GL 8800";

const char ADAPTER_NAMEE1[]        = "Fire GL E1";

const char ADAPTER_NAMEZ1AGPPRO[]  = "Fire GL Z1";

const char ADAPTER_NAMEX1AGP[]     = "Fire GL X1";

const char ADAPTER_NAMEX1AGPPRO[]  = "Fire GL X1";

enum SubdeviceID

// ATI subedvice IDs for R200

// ATI subedvice IDs for R200

#define SUBSYSTEMID_8700LE              0x0162  // 32 MB

  SUBSYSTEMID_8700LE            = 0x0162,  // 32 MB

#define SUBSYSTEMID_8700                0x0172  // 64 MB

  SUBSYSTEMID_8700              = 0x0172,  // 64 MB

#define SUBSYSTEMID_8800LE              0x010A  // 64 MB

  SUBSYSTEMID_8800LE            = 0x010A,  // 64 MB

#define SUBSYSTEMID_8800                0x0152  // 128 MB

  SUBSYSTEMID_8800              = 0x0152,  // 128 MB

#define SUBSYSTEMID_E1                  0x110A  // 64 MB

  SUBSYSTEMID_E1                = 0x110A,  // 64 MB

// ATI subedvice IDs for R300

// ATI subedvice IDs for R300

#define SUBSYSTEMID_FIREGLZ1AGPPRO      0x010A  // 128 MB

  SUBSYSTEMID_FIREGLZ1AGPPRO    = 0x010A,  // 128 MB

#define SUBSYSTEMID_FIREGLX1AGPPRO      0x0152  // 128/256 MB

  SUBSYSTEMID_FIREGLX1AGPPRO    = 0x0152,  // 128/256 MB

#define SUBSYSTEMID_OEM1_FIREGLX1AGP    0x0172  // 128 MB (?)

  SUBSYSTEMID_OEM1_FIREGLX1AGP  = 0x0172  // 128 MB (?)

};

// misc defines

// misc defines

#define MEMORY_TYPE                     L"DDR SDRAM"

const wchar_t MEMORY_TYPE[]      = L"DDR SDRAM";

#define DAC_SPEED                       400

const int DAC_SPEED              = 400;

const char BIOS_PN_PREFIX[]      = "BIOS P/N ";                 // ATI BIOS P/N prefix

const char BIOS_RAGE128_PREFIX[] = "ATI Technologies Inc. ";    // ATI BIOS prefix for pre-production BIOS

const char BIOS_AURORA[]         = ".AUR";                      // ATI BIOS string to detect Aurora

const int BIOS_STRING_LENGTH     = 43;                          // Max length of ATI BIOS P/N string

const int ADAPTER_STRING_LENGTH  = 45;                          // Max length of Adapter ID

#define BIOS_PN_PREFIX                  "BIOS P/N "                 // ATI BIOS P/N prefix

#endif // _BOARDINFO_

#define BIOS_RAGE128_PREFIX             "ATI Technologies Inc. "    // ATI BIOS prefix for pre-production BIOS

#define BIOS_AURORA                     ".AUR"                      // ATI BIOS string to detect Aurora

#define BIOS_STRING_LENGTH              43                          // Max length of ATI BIOS P/N string

#define ADAPTER_STRING_LENGTH           45                          // Max length of Adapter ID

/* ### EOF ### */

/* ### EOF ### */

(-) fglrx_panel_sources.orig/DualScreenPage.cpp (-9 / +9 lines)

Lines 25-35	Link Here

#endif // DEBUG

#endif // DEBUG

DualScreenPage::DualScreenPage ( QWidget *parent ) : QWidget ( parent, 0 )

DualScreenPage::DualScreenPage ( QWidget *parent ) : QWidget ( parent, 0 ),

  m_Init ( FALSE ), m_Changed ( FALSE ),

  m_Init = FALSE ;

  m_Primary ( 0 ), m_Desktop ( 0 ), pPrimary ( 0 ), pDesktop ( 0 ), pSingle1 ( 0 ),

  m_Changed = FALSE ;

  pSingle2 ( 0 ), pDisable ( 0 ), pLeft ( 0 ), pRight ( 0 ), pTop ( 0 ), pBottom ( 0 )

{ }

void DualScreenPage::Init ( )

void DualScreenPage::Init ( )

Lines 164-170	Link Here

  switch ( m_Desktop )

  switch ( m_Desktop )

    case 0 : //Disable SecondaryMonitor

    case DisableSecondary : //Disable SecondaryMonitor

      pSingle1->show ( ) ;

      pSingle1->show ( ) ;

      pSingle2->hide ( ) ;

      pSingle2->hide ( ) ;

Lines 175-181	Link Here

      pBottom->hide ( ) ;

      pBottom->hide ( ) ;

      break ;

      break ;

    case 1 : //Clone Mode

    case CloneMode : //Clone Mode

      pSingle1->show ( ) ;

      pSingle1->show ( ) ;

      pSingle2->show ( ) ;

      pSingle2->show ( ) ;

Lines 186-192	Link Here

      pBottom->hide ( ) ;

      pBottom->hide ( ) ;

      break ;

      break ;

    case 2 : //Extended Desktop Horizontal

    case ExtendedHorizontal : //Extended Desktop Horizontal

      pSingle1->hide ( ) ;

      pSingle1->hide ( ) ;

      pSingle2->hide ( ) ;

      pSingle2->hide ( ) ;

Lines 197-203	Link Here

      pBottom->hide ( ) ;

      pBottom->hide ( ) ;

      break ;

      break ;

    case 3 : //Extended Desktop Vertical

    case ExtendedVertical : //Extended Desktop Vertical

      pSingle1->hide ( ) ;

      pSingle1->hide ( ) ;

      pSingle2->hide ( ) ;

      pSingle2->hide ( ) ;

(-) fglrx_panel_sources.orig/DualScreenPage.h (-1 / +12 lines)

Lines 1-3	Link Here

#ifndef _DUALSCREENPAGE_

#define _DUALSCREENPAGE_

#include <qstring.h>

#include <qstring.h>

#include <qwidget.h>

#include <qwidget.h>

#include <qvbox.h>

#include <qvbox.h>

Lines 8-13	Link Here

#include <qradiobutton.h>

#include <qradiobutton.h>

enum DesktopMode

  DisableSecondary   = 0,

  CloneMode,

  ExtendedHorizontal,

  ExtendedVertical

};

class DualScreenPage: public QWidget

class DualScreenPage: public QWidget

  Q_OBJECT

  Q_OBJECT

Lines 36-42	Link Here

} ;

} ;

#endif // _DUALSCREENPAGE_

(-) fglrx_panel_sources.orig/FireGLControl.h (+5 lines)

Lines 1-3	Link Here

#ifndef _FIREGLCONTROL_

#define _FIREGLCONTROL_

#include <stdlib.h>

#include <stdlib.h>

#include <qapplication.h>

#include <qapplication.h>

Lines 28-30	Link Here

#include "Sheet.h"

#include "Sheet.h"

extern CBoardInfo BoardInfo ;

extern CBoardInfo BoardInfo ;

#endif // _FIREGLCONTROL_

(-) fglrx_panel_sources.orig/Globals.h (-17 / +23 lines)

Lines 1-25	Link Here

#ifndef _GLOBALS_

#define _GLOBALS_

// Where the software is installed

// Where the software is installed

#define PROFILE_FILE		"/usr/X11R6/bin/FireGL1Profiles"

const char PROFILE_FILE[] = "/usr/X11R6/bin/FireGL1Profiles";

#define PROFILE_NAME		".FireGL1Profiles"

const char PROFILE_NAME[] = ".FireGL1Profiles";

#define CONFIG_NAME    	".FireGL1"

const char CONFIG_NAME[]  = ".FireGL1";

//Apply Flags

//Apply Flags

#define APPLY_OK                        0x00000000

enum ApplyFlags

#define APPLY_OK_RESTART                0x00000001

#define APPLY_NOT_OK                    0x10000000

  APPLY_OK         = 0x00000000,

  APPLY_OK_RESTART = 0x00000001,

  APPLY_NOT_OK     = 0x10000000

};

// PropertyPages

// PropertyPages

#define INFO_PAGE       0

enum PropertyPages

#define DUALSCREEN_PAGE 1

#define CONFIG_PAGE     2

  INFO_PAGE       = 0,

#define ADJUST_PAGE     3

  DUALSCREEN_PAGE,

#define ATITVO_PAGE     4

  CONFIG_PAGE,

  ADJUST_PAGE,

  ATITVO_PAGE

};

//Geometry

//Geometry

#define PANEL_WIDTH     480

const int PANEL_WIDTH  = 480;

#define PANEL_HEIGHT    480

const int PANEL_HEIGHT = 480;

#endif // _GLOBALS_

(-) fglrx_panel_sources.orig/InfoPage.cpp (-5 / +3 lines)

Lines 2-12	Link Here

#include "watermark.xpm"

#include "watermark.xpm"

#include "atilogo.xpm"

#include "atilogo.xpm"

InfoPage::InfoPage ( QWidget *parent, bool is_firegl ) : QWidget ( parent, 0 )

InfoPage::InfoPage ( QWidget *parent, bool is_firegl ) : QWidget ( parent, 0 ),

   m_Init ( FALSE ), m_IsFireGL ( is_firegl )

  m_Init = FALSE ;

{ }

  m_IsFireGL = is_firegl;

void InfoPage::Init ( )

void InfoPage::Init ( )

(-) fglrx_panel_sources.orig/InfoPage.h (+5 lines)

Lines 1-3	Link Here

#ifndef _INFOPAGE_

#define _INFOPAGE_

#include <qstring.h>

#include <qstring.h>

#include <qwidget.h>

#include <qwidget.h>

#include <qvbox.h>

#include <qvbox.h>

Lines 23-26	Link Here

} ;

} ;

#endif // _INFOPAGE_

// ### EOF ###

// ### EOF ###

(-) fglrx_panel_sources.orig/Page.cpp (-1 / +3 lines)

Lines 12-18	Link Here

extern unsigned long ulDesktopSetup;

extern unsigned long ulDesktopSetup;

Page::Page( QWidget *parent, int Type, bool is_firegl ) : QWidget( parent, 0 )

Page::Page( QWidget *parent, PropertyPages Type, bool is_firegl ) : QWidget( parent, 0 )

  QFrame *Frame ;

  QFrame *Frame ;

  int     Cnt ;

  int     Cnt ;

Lines 122-127	Link Here

      break ;

      break ;

#endif // FGL_TVOUT

#endif // FGL_TVOUT

    default:;

      // what todo with CONFIG_PAGE ?

(-) fglrx_panel_sources.orig/Page.h (-2 / +7 lines)

Lines 1-12	Link Here

#include <qlabel.h>

#ifndef _PAGE_

#define _PAGE_

#include <qlabel.h>

#include "Globals.h"

class Page : public QWidget

class Page : public QWidget

    Q_OBJECT

    Q_OBJECT

public:

public:

    Page( QWidget *parent, int Type, bool is_firegl );

    Page( QWidget *parent, PropertyPages Type, bool is_firegl );

private slots:

private slots:

Lines 14-17	Link Here

};

};

#endif // _PAGE_

// ### EOF ###

// ### EOF ###

(-) fglrx_panel_sources.orig/R200_extensions.h (-13 / +16 lines)

Lines 31-51	Link Here

#endif

#endif

// === FGL ===

// === FGL ===

#define ATIFGL_EXTENSION_NAME       "ATIFGLEXTENSION"

#define  ATIFGL_EXTENSION_NAME     "ATIFGLEXTENSION"

#define ATIFGL_NUMBER_EVENTS            7

const int ATIFGL_NUMBER_EVENTS        = 7;

#define ATIFGL_NUMBER_ERRORS            0

const int ATIFGL_NUMBER_ERRORS        = 0;

#define X_FGLGetDriverData              0

enum

#define X_FGLGetDisplaySettings         1

#define X_FGLSetDisplaySettings         2

  X_FGLGetDriverData = 0,

#define X_FGLVidModePanelSetGammaData   3

  X_FGLGetDisplaySettings,

#define X_FGLVidModeSetGammaRamp        4

  X_FGLSetDisplaySettings,

#define X_FGLVidModeGetGammaRamp        5

  X_FGLVidModePanelSetGammaData,

#define X_FGLVidModeGetGammaRampSize    6

  X_FGLVidModeSetGammaRamp,

#define X_FGLReserved_0007              7

  X_FGLVidModeGetGammaRamp,

#define X_FGLReserved_0008              8

  X_FGLVidModeGetGammaRampSize,

#define X_FGLReserved_0009              9

  X_FGLReserved_0007,

  X_FGLReserved_0008,

  X_FGLReserved_0009

};

//////////////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////////

// ProcFGLGetDriverData

// ProcFGLGetDriverData

(-) fglrx_panel_sources.orig/Radeon_extension_tvout.h (-8 / +11 lines)

Lines 15-29	Link Here

#define ATITVOUT_EXTENSION_NAME     "ATITVOUT"

#define ATITVOUT_EXTENSION_NAME     "ATITVOUT"

#define ATITVOUT_NUMBER_EVENTS          6

const int ATITVOUT_NUMBER_EVENTS      = 6;

#define ATITVOUT_NUMBER_ERRORS          0

const int ATITVOUT_NUMBER_ERRORS      = 0;

#define X_ATITVOEnableDisable           0

enum

#define X_ATITVOSetStandard             1

#define X_ATITVOGetData                 2

  X_ATITVOEnableDisable = 0,

#define X_ATITVOAdjustPosition          3

  X_ATITVOSetStandard,

#define X_ATITVOAdjustSize              4

  X_ATITVOGetData,

#define X_ATITVOAdjustColor             5

  X_ATITVOAdjustPosition,

  X_ATITVOAdjustSize ,

  X_ATITVOAdjustColor

};

#define XREP_SZ(name)       sizeof(x##name##Reply)

#define XREP_SZ(name)       sizeof(x##name##Reply)

#define XREQ_SZ(name)       sizeof(x##name##Req)

#define XREQ_SZ(name)       sizeof(x##name##Req)

(-) fglrx_panel_sources.orig/Sheet.cpp (-1 / +2 lines)

Lines 10-16	Link Here

extern QString InstallPath ;

extern QString InstallPath ;

Sheet::Sheet( QWidget *parent, const char *name, bool is_firegl, bool has_dual, bool has_gamma ) : QTabDialog( parent, name )

Sheet::Sheet( QWidget *parent, const char *name, bool is_firegl, bool has_dual, bool has_gamma ) : QTabDialog( parent, name ),

  ApplyOK ( 0 ), pInfo ( 0 ), pDual ( 0 ), pConfig ( 0 ), pAdjust ( 0 ), pTVout ( 0 )

  QString Str ;

  QString Str ;

  bool has_tvout = FALSE;

  bool has_tvout = FALSE;

(-) fglrx_panel_sources.orig/Sheet.h (+5 lines)

Lines 1-3	Link Here

#ifndef _SHEET_

#define _SHEET_

#include <qtabdialog.h>

#include <qtabdialog.h>

#include <qlabel.h>

#include <qlabel.h>

Lines 32-35	Link Here

};

};

#endif // _SHEET_

// ### EOF ###

// ### EOF ###

(-) fglrx_panel_sources.orig/TVOExt.h (-8 / +11 lines)

Lines 22-36	Link Here

//////////////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////////

// extension specific data

// extension specific data

#define ATITVOUT_NUMBER_EVENTS          6

const int ATITVOUT_NUMBER_EVENTS      = 6;

#define ATITVOUT_NUMBER_ERRORS          0

const int ATITVOUT_NUMBER_ERRORS      = 0;

#define X_ATITVOEnableDisable           0

enum

#define X_ATITVOSetStandard             1

#define X_ATITVOGetData                 2

  X_ATITVOEnableDisable = 0,

#define X_ATITVOAdjustPosition          3

  X_ATITVOSetStandard,

#define X_ATITVOAdjustSize              4

  X_ATITVOGetData,

#define X_ATITVOAdjustColor             5

  X_ATITVOAdjustPosition,

  X_ATITVOAdjustSize,

  X_ATITVOAdjustColor

};

// extension protocoll defines

// extension protocoll defines

#define XREP_SZ(name)       sizeof(x##name##Reply)

#define XREP_SZ(name)       sizeof(x##name##Reply)

(-) fglrx_panel_sources.orig/TVoutAdjustPage.cpp (-22 / +33 lines)

Lines 22-39	Link Here

    Bool ExtATITVOSetData(ATITVOGetDataPtr pATITVOGetData);

    Bool ExtATITVOSetData(ATITVOGetDataPtr pATITVOGetData);

#define TVO_BORDER_HSIZELOW       -30

const int  TVO_BORDER_HSIZELOW     = -30;

#define TVO_BORDER_HSIZEHIGH       30

const int  TVO_BORDER_HSIZEHIGH    =  30;

#define TVO_BORDER_VSIZELOW        -6

const int  TVO_BORDER_VSIZELOW     =  -6;

#define TVO_BORDER_VSIZEHIGH        6

const int  TVO_BORDER_VSIZEHIGH    =   6;

#define TVO_BORDER_HPOSLOW        -30

const int  TVO_BORDER_HPOSLOW      = -30;

#define TVO_BORDER_HPOSHIGH        30

const int  TVO_BORDER_HPOSHIGH     =  30;

#define TVO_BORDER_VPOSLOW         -6

const int  TVO_BORDER_VPOSLOW      =  -6;

#define TVO_BORDER_VPOSHIGH         6

const int  TVO_BORDER_VPOSHIGH     =   6;

#define TVO_BORDER_HSTARTLOW      -30

const int  TVO_BORDER_HSTARTLOW    = -30;

#define TVO_BORDER_HSTARTHIGH      30

const int  TVO_BORDER_HSTARTHIGH   =  30;

#define TVO_BORDER_COLORLOW         0

const int  TVO_BORDER_COLORLOW     =   0;

#define TVO_BORDER_COLORHIGH      255

const int  TVO_BORDER_COLORHIGH    = 255;

#ifdef DEBUG_TVOUT

#ifdef DEBUG_TVOUT

#define DEB(s)  s

#define DEB(s)  s

Lines 42-58	Link Here

#endif // DEBUG

#endif // DEBUG

#define BUTTON_PRESS_ADD_VALUE 2

const int BUTTON_PRESS_ADD_VALUE = 2;

TVoutAdjustPage::TVoutAdjustPage ( QWidget *parent ) : QWidget ( parent, 0 )

TVoutAdjustPage::TVoutAdjustPage ( QWidget *parent ) : QWidget ( parent, 0 ),

  m_Init ( FALSE ), m_TVOStdChanged ( FALSE ), m_TVOOnOffChanged ( FALSE ),

  m_Init = FALSE ;

  m_TVOAdjSizeChanged ( FALSE ),  m_TVOAdjPosChanged ( FALSE ),

  m_TVOAdjColorChanged ( FALSE ), m_PressLeft ( 0 ),

  m_TVConnect ( 0 ), m_TVStd ( 0 ), m_MVMode ( 0 ), m_tvHSizeAdj ( 0 ), m_tvVSizeAdj ( 0 ),

  m_tvHPosAdj ( 0 ), m_tvVPosAdj ( 0 ), m_tvHStartAdj ( 0 ), m_tvColorAdj ( 0 ),

#define POS_ADD 0

  m_CurrentTVConnect ( 0 ), m_CurrentTVStd ( 0 ), m_CurrentMVMode ( 0 ),

#define SIZE_ADD 157

  m_CurrenttvHSizeAdj ( 0 ), m_CurrenttvVSizeAdj ( 0 ), m_CurrenttvHPosAdj ( 0 ),

#define START_ADD 295

  m_CurrenttvVPosAdj ( 0 ), m_CurrenttvHStartAdj ( 0 ), m_CurrenttvColorAdj ( 0 ),

  pTVOn ( 0 ), pTVLeft ( 0 ), pTVRight ( 0 ), pTVUp ( 0 ), pTVDown ( 0 ),

  pTVWider ( 0 ), pTVSmaler ( 0 ), pTVHigher ( 0 ), pTVLower ( 0 ), pTVStartLeft ( 0 ),

  pTVStartRight ( 0 ), pTVSTD ( 0 ), pSliderTVColor ( 0 ), pTVPosition ( 0 ), pTVSize ( 0 ),

  pTVStart ( 0 ), pTextSliderTVColor ( 0 ), pTextPosH ( 0 ), pTextPosV ( 0 ), pTextSizeH ( 0 ),

  pTextSizeV ( 0 ), pTextStartH ( 0 ), pTextInfo ( 0 )

{ }

const int POS_ADD   =   0;

const int SIZE_ADD  = 157;

const int START_ADD = 295;

(-) fglrx_panel_sources.orig/TVoutAdjustPage.h (+3 lines)

Lines 1-3	Link Here

#ifndef _TVOUTADJUSTPAGE_

#define _TVOUTADJUSTPAGE_

#include <qstring.h>

#include <qstring.h>

#include <qwidget.h>

#include <qwidget.h>

Lines 88-90	Link Here

} ;

} ;

#endif // _TVOUTADJUSTPAGE_

Attachment #42419: effcpp.patch for bug #66368