From a10835d34fc89dbc99d6c22cd8f009abcaf6d70a Mon Sep 17 00:00:00 2001 From: Matthias Seidel Date: Wed, 10 Dec 2025 17:21:04 +0100 Subject: [PATCH 01/12] New design for table selection --- main/vcl/aqua/source/app/saldata.cxx | 441 +++++++++++++-------------- 1 file changed, 220 insertions(+), 221 deletions(-) diff --git a/main/vcl/aqua/source/app/saldata.cxx b/main/vcl/aqua/source/app/saldata.cxx index 95db94022be..5f2fedc5f5f 100644 --- a/main/vcl/aqua/source/app/saldata.cxx +++ b/main/vcl/aqua/source/app/saldata.cxx @@ -19,8 +19,6 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" @@ -34,257 +32,258 @@ oslThreadKey SalData::s_aAutoReleaseKey = 0; static void SAL_CALL releasePool( void* pPool ) { - if( pPool ) - [(NSAutoreleasePool*)pPool release]; + if( pPool ) + [(NSAutoreleasePool*)pPool release]; } SalData::SalData() : - mpTimerProc( NULL ), - mpFirstInstance( NULL ), - mpFirstObject( NULL ), - mpFirstVD( NULL ), - mpFirstPrinter( NULL ), - mpFontList( NULL ), - mpStatusItem( nil ), - mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ), - mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ), - mxP50Space( NULL ), - mxP50Pattern( NULL ), - maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), - mbIsScrollbarDoubleMax( false ), - mnSystemVersion( OSX_VER_LION ), - mpAppleRemoteMainController( NULL ), - mpDockIconClickHandler( nil ), - mnDPIX( 0 ), - mnDPIY( 0 ) + mpTimerProc( NULL ), + mpFirstInstance( NULL ), + mpFirstObject( NULL ), + mpFirstVD( NULL ), + mpFirstPrinter( NULL ), + mpFontList( NULL ), + mpStatusItem( nil ), + mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ), + mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ), + mxP50Space( NULL ), + mxP50Pattern( NULL ), + maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), + mbIsScrollbarDoubleMax( false ), + mnSystemVersion( OSX_VER_LION ), + mpAppleRemoteMainController( NULL ), + mpDockIconClickHandler( nil ), + mnDPIX( 0 ), + mnDPIY( 0 ) { - if( s_aAutoReleaseKey == 0 ) - s_aAutoReleaseKey = osl_createThreadKey( releasePool ); + if( s_aAutoReleaseKey == 0 ) + s_aAutoReleaseKey = osl_createThreadKey( releasePool ); } SalData::~SalData() { - CGPatternRelease( mxP50Pattern ); - CGColorSpaceRelease( mxP50Space ); - CGColorSpaceRelease( mxRGBSpace ); - CGColorSpaceRelease( mxGraySpace ); - for( unsigned int i = 0; i < maCursors.size(); i++ ) - { - NSCursor* pCurs = maCursors[i]; - if( pCurs && pCurs != INVALID_CURSOR_PTR ) - [pCurs release]; - } - if( s_aAutoReleaseKey ) - { - // release the last pool - NSAutoreleasePool* pPool = nil; - pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); - if( pPool ) - { - osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); - [pPool release]; - } + CGPatternRelease( mxP50Pattern ); + CGColorSpaceRelease( mxP50Space ); + CGColorSpaceRelease( mxRGBSpace ); + CGColorSpaceRelease( mxGraySpace ); + for( unsigned int i = 0; i < maCursors.size(); i++ ) + { + NSCursor* pCurs = maCursors[i]; + if( pCurs && pCurs != INVALID_CURSOR_PTR ) + [pCurs release]; + } + if( s_aAutoReleaseKey ) + { + // release the last pool + NSAutoreleasePool* pPool = nil; + pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + if( pPool ) + { + osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); + [pPool release]; + } - osl_destroyThreadKey( s_aAutoReleaseKey ); - s_aAutoReleaseKey = 0; - } - if ( mpAppleRemoteMainController ) - [mpAppleRemoteMainController release]; + osl_destroyThreadKey( s_aAutoReleaseKey ); + s_aAutoReleaseKey = 0; + } + if ( mpAppleRemoteMainController ) + [mpAppleRemoteMainController release]; } void SalData::ensureThreadAutoreleasePool() { - NSAutoreleasePool* pPool = nil; - if( s_aAutoReleaseKey ) - { - pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); - if( ! pPool ) - { - pPool = [[NSAutoreleasePool alloc] init]; - osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); - } - } - else - { - DBG_ERROR( "no autorelease key" ); - } + NSAutoreleasePool* pPool = nil; + if( s_aAutoReleaseKey ) + { + pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + if( ! pPool ) + { + pPool = [[NSAutoreleasePool alloc] init]; + osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); + } + } + else + { + DBG_ERROR( "no autorelease key" ); + } } void SalData::drainThreadAutoreleasePool() { - NSAutoreleasePool* pPool = nil; - if( s_aAutoReleaseKey ) - { - pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); - if( pPool ) - { - // osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); - // [pPool release]; - [pPool drain]; - } - else - { - pPool = [[NSAutoreleasePool alloc] init]; - osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); - } - } - else - { - DBG_ERROR( "no autorelease key" ); - } + NSAutoreleasePool* pPool = nil; + if( s_aAutoReleaseKey ) + { + pPool = reinterpret_cast( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + if( pPool ) + { + // osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); + // [pPool release]; + [pPool drain]; + } + else + { + pPool = [[NSAutoreleasePool alloc] init]; + osl_setThreadKeyData( s_aAutoReleaseKey, pPool ); + } + } + else + { + DBG_ERROR( "no autorelease key" ); + } } - struct curs_ent { - const char* pBaseName; - const NSPoint aHotSpot; + const char* pBaseName; + const NSPoint aHotSpot; } const aCursorTab[ POINTER_COUNT ] = { -{ NULL, { 0, 0 } }, //POINTER_ARROW -{ "nullptr", { 16, 16 } }, //POINTER_NULL -{ "hourglass", { 15, 15 } }, //POINTER_WAIT -{ NULL, { 0, 0 } }, //POINTER_TEXT -{ "help", { 0, 0 } }, //POINTER_HELP -{ NULL, { 0, 0 } }, //POINTER_CROSS -{ NULL, { 0, 0 } }, //POINTER_MOVE -{ NULL, { 0, 0 } }, //POINTER_NSIZE -{ NULL, { 0, 0 } }, //POINTER_SSIZE -{ NULL, { 0, 0 } }, //POINTER_WSIZE -{ NULL, { 0, 0 } }, //POINTER_ESIZE -{ "nwsesize", { 15, 15 } }, //POINTER_NWSIZE -{ "neswsize", { 15, 15 } }, //POINTER_NESIZE -{ "neswsize", { 15, 15 } }, //POINTER_SWSIZE -{ "nwsesize", { 15, 15 } }, //POINTER_SESIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_NSIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_SSIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_WSIZE -{ NULL, { 0, 0 } }, //POINTER_WINDOW_ESIZE -{ "nwsesize", { 15, 15 } }, //POINTER_WINDOW_NWSIZE -{ "neswsize", { 15, 15 } }, //POINTER_WINDOW_NESIZE -{ "neswsize", { 15, 15 } }, //POINTER_WINDOW_SWSIZE -{ "nwsesize", { 15, 15 } }, //POINTER_WINDOW_SESIZE -{ NULL, { 0, 0 } }, //POINTER_HSPLIT -{ NULL, { 0, 0 } }, //POINTER_VSPLIT -{ NULL, { 0, 0 } }, //POINTER_HSIZEBAR -{ NULL, { 0, 0 } }, //POINTER_VSIZEBAR -{ NULL, { 0, 0 } }, //POINTER_HAND -{ NULL, { 0, 0 } }, //POINTER_REFHAND -{ "pen", { 3, 27 } }, //POINTER_PEN -{ "magnify", { 12, 13 } }, //POINTER_MAGNIFY -{ "fill", { 10, 22 } }, //POINTER_FILL -{ "rotate", { 15, 15 } }, //POINTER_ROTATE -{ "hshear", { 15, 15 } }, //POINTER_HSHEAR -{ "vshear", { 15, 15 } }, //POINTER_VSHEAR -{ "mirror", { 14, 12 } }, //POINTER_MIRROR -{ "crook", { 15, 14 } }, //POINTER_CROOK -{ "crop", { 9, 9 } }, //POINTER_CROP -{ "movept", { 0, 0 } }, //POINTER_MOVEPOINT -{ "movebw", { 0, 0 } }, //POINTER_MOVEBEZIERWEIGHT -{ "movedata", { 0, 0 } }, //POINTER_MOVEDATA -{ "copydata", { 0, 0 } }, //POINTER_COPYDATA -{ "linkdata", { 0, 0 } }, //POINTER_LINKDATA -{ "movedlnk", { 0, 0 } }, //POINTER_MOVEDATALINK -{ "copydlnk", { 0, 0 } }, //POINTER_COPYDATALINK -{ "movef", { 8, 8 } }, //POINTER_MOVEFILE -{ "copyf", { 8, 8 } }, //POINTER_COPYFILE -{ "linkf", { 8, 8 } }, //POINTER_LINKFILE -{ "moveflnk", { 8, 8 } }, //POINTER_MOVEFILELINK -{ "copyflnk", { 8, 8 } }, //POINTER_COPYFILELINK -{ "movef2", { 7, 8 } }, //POINTER_MOVEFILES -{ "copyf2", { 7, 8 } }, //POINTER_COPYFILES -{ "notallow", { 15, 15 } }, //POINTER_NOTALLOWED -{ "dline", { 8, 8 } }, //POINTER_DRAW_LINE -{ "drect", { 8, 8 } }, //POINTER_DRAW_RECT -{ "dpolygon", { 8, 8 } }, //POINTER_DRAW_POLYGON -{ "dbezier", { 8, 8 } }, //POINTER_DRAW_BEZIER -{ "darc", { 8, 8 } }, //POINTER_DRAW_ARC -{ "dpie", { 8, 8 } }, //POINTER_DRAW_PIE -{ "dcirccut", { 8, 8 } }, //POINTER_DRAW_CIRCLECUT -{ "dellipse", { 8, 8 } }, //POINTER_DRAW_ELLIPSE -{ "dfree", { 8, 8 } }, //POINTER_DRAW_FREEHAND -{ "dconnect", { 8, 8 } }, //POINTER_DRAW_CONNECT -{ "dtext", { 8, 8 } }, //POINTER_DRAW_TEXT -{ "dcapt", { 8, 8 } }, //POINTER_DRAW_CAPTION -{ "chart", { 15, 16 } }, //POINTER_CHART -{ "detectiv", { 12, 13 } }, //POINTER_DETECTIVE -{ "pivotcol", { 7, 5 } }, //POINTER_PIVOT_COL -{ "pivotrow", { 8, 7 } }, //POINTER_PIVOT_ROW -{ "pivotfld", { 8, 7 } }, //POINTER_PIVOT_FIELD -{ "chain", { 0, 2 } }, //POINTER_CHAIN -{ "chainnot", { 2, 2 } }, //POINTER_CHAIN_NOTALLOWED -{ "timemove", { 16, 16 } }, //POINTER_TIMEEVENT_MOVE -{ "timesize", { 16, 17 } }, //POINTER_TIMEEVENT_SIZE -{ "asn", { 16, 12 } }, //POINTER_AUTOSCROLL_N -{ "ass", { 15, 19 } }, //POINTER_AUTOSCROLL_S -{ "asw", { 12, 15 } }, //POINTER_AUTOSCROLL_W -{ "ase", { 19, 16 } }, //POINTER_AUTOSCROLL_E -{ "asnw", { 10, 10 } }, //POINTER_AUTOSCROLL_NW -{ "asne", { 21, 10 } }, //POINTER_AUTOSCROLL_NE -{ "assw", { 21, 21 } }, //POINTER_AUTOSCROLL_SW -{ "asse", { 21, 21 } }, //POINTER_AUTOSCROLL_SE -{ "asns", { 15, 15 } }, //POINTER_AUTOSCROLL_NS -{ "aswe", { 15, 15 } }, //POINTER_AUTOSCROLL_WE -{ "asnswe", { 15, 15 } }, //POINTER_AUTOSCROLL_NSWE -{ "airbrush", { 5, 22 } }, //POINTER_AIRBRUSH -{ "vtext", { 15, 15 } }, //POINTER_TEXT_VERTICAL -{ "pivotdel", { 18, 15 } }, //POINTER_PIVOT_DELETE -{ "tblsels", { 15, 30 } }, //POINTER_TAB_SELECT_S -{ "tblsele", { 30, 16 } }, //POINTER_TAB_SELECT_E -{ "tblselse", { 30, 30 } }, //POINTER_TAB_SELECT_SE -{ "tblselw", { 1, 16 } }, //POINTER_TAB_SELECT_W -{ "tblselsw", { 1, 30 } }, //POINTER_TAB_SELECT_SW -{ "pntbrsh", { 9, 16 } } //POINTER_PAINTBRUSH +{ NULL, { 0, 0 } }, // POINTER_ARROW +{ "nullptr", { 16, 16 } }, // POINTER_NULL +{ "hourglass", { 15, 15 } }, // POINTER_WAIT +{ NULL, { 0, 0 } }, // POINTER_TEXT +{ "help", { 0, 0 } }, // POINTER_HELP +{ NULL, { 0, 0 } }, // POINTER_CROSS +{ NULL, { 0, 0 } }, // POINTER_MOVE +{ NULL, { 0, 0 } }, // POINTER_NSIZE +{ NULL, { 0, 0 } }, // POINTER_SSIZE +{ NULL, { 0, 0 } }, // POINTER_WSIZE +{ NULL, { 0, 0 } }, // POINTER_ESIZE +{ "nwsesize", { 15, 15 } }, // POINTER_NWSIZE +{ "neswsize", { 15, 15 } }, // POINTER_NESIZE +{ "neswsize", { 15, 15 } }, // POINTER_SWSIZE +{ "nwsesize", { 15, 15 } }, // POINTER_SESIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_NSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_SSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_WSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_ESIZE +{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_NWSIZE +{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_NESIZE +{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_SWSIZE +{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_SESIZE +{ NULL, { 0, 0 } }, // POINTER_HSPLIT +{ NULL, { 0, 0 } }, // POINTER_VSPLIT +{ NULL, { 0, 0 } }, // POINTER_HSIZEBAR +{ NULL, { 0, 0 } }, // POINTER_VSIZEBAR +{ NULL, { 0, 0 } }, // POINTER_HAND +{ NULL, { 0, 0 } }, // POINTER_REFHAND +{ "pen", { 3, 27 } }, // POINTER_PEN +{ "magnify", { 12, 13 } }, // POINTER_MAGNIFY +{ "fill", { 10, 22 } }, // POINTER_FILL +{ "rotate", { 15, 15 } }, // POINTER_ROTATE +{ "hshear", { 15, 15 } }, // POINTER_HSHEAR +{ "vshear", { 15, 15 } }, // POINTER_VSHEAR +{ "mirror", { 14, 12 } }, // POINTER_MIRROR +{ "crook", { 15, 14 } }, // POINTER_CROOK +{ "crop", { 9, 9 } }, // POINTER_CROP +{ "movept", { 0, 0 } }, // POINTER_MOVEPOINT +{ "movebw", { 0, 0 } }, // POINTER_MOVEBEZIERWEIGHT +{ "movedata", { 0, 0 } }, // POINTER_MOVEDATA +{ "copydata", { 0, 0 } }, // POINTER_COPYDATA +{ "linkdata", { 0, 0 } }, // POINTER_LINKDATA +{ "movedlnk", { 0, 0 } }, // POINTER_MOVEDATALINK +{ "copydlnk", { 0, 0 } }, // POINTER_COPYDATALINK +{ "movef", { 8, 8 } }, // POINTER_MOVEFILE +{ "copyf", { 8, 8 } }, // POINTER_COPYFILE +{ "linkf", { 8, 8 } }, // POINTER_LINKFILE +{ "moveflnk", { 8, 8 } }, // POINTER_MOVEFILELINK +{ "copyflnk", { 8, 8 } }, // POINTER_COPYFILELINK +{ "movef2", { 7, 8 } }, // POINTER_MOVEFILES +{ "copyf2", { 7, 8 } }, // POINTER_COPYFILES +{ "notallow", { 15, 15 } }, // POINTER_NOTALLOWED +{ "dline", { 8, 8 } }, // POINTER_DRAW_LINE +{ "drect", { 8, 8 } }, // POINTER_DRAW_RECT +{ "dpolygon", { 8, 8 } }, // POINTER_DRAW_POLYGON +{ "dbezier", { 8, 8 } }, // POINTER_DRAW_BEZIER +{ "darc", { 8, 8 } }, // POINTER_DRAW_ARC +{ "dpie", { 8, 8 } }, // POINTER_DRAW_PIE +{ "dcirccut", { 8, 8 } }, // POINTER_DRAW_CIRCLECUT +{ "dellipse", { 8, 8 } }, // POINTER_DRAW_ELLIPSE +{ "dfree", { 8, 8 } }, // POINTER_DRAW_FREEHAND +{ "dconnect", { 8, 8 } }, // POINTER_DRAW_CONNECT +{ "dtext", { 8, 8 } }, // POINTER_DRAW_TEXT +{ "dcapt", { 8, 8 } }, // POINTER_DRAW_CAPTION +{ "chart", { 15, 16 } }, // POINTER_CHART +{ "detectiv", { 12, 13 } }, // POINTER_DETECTIVE +{ "pivotcol", { 7, 5 } }, // POINTER_PIVOT_COL +{ "pivotrow", { 8, 7 } }, // POINTER_PIVOT_ROW +{ "pivotfld", { 8, 7 } }, // POINTER_PIVOT_FIELD +{ "chain", { 0, 2 } }, // POINTER_CHAIN +{ "chainnot", { 2, 2 } }, // POINTER_CHAIN_NOTALLOWED +{ "timemove", { 16, 16 } }, // POINTER_TIMEEVENT_MOVE +{ "timesize", { 16, 17 } }, // POINTER_TIMEEVENT_SIZE +{ "asn", { 16, 12 } }, // POINTER_AUTOSCROLL_N +{ "ass", { 15, 19 } }, // POINTER_AUTOSCROLL_S +{ "asw", { 12, 15 } }, // POINTER_AUTOSCROLL_W +{ "ase", { 19, 16 } }, // POINTER_AUTOSCROLL_E +{ "asnw", { 10, 10 } }, // POINTER_AUTOSCROLL_NW +{ "asne", { 21, 10 } }, // POINTER_AUTOSCROLL_NE +{ "assw", { 21, 21 } }, // POINTER_AUTOSCROLL_SW +{ "asse", { 21, 21 } }, // POINTER_AUTOSCROLL_SE +{ "asns", { 15, 15 } }, // POINTER_AUTOSCROLL_NS +{ "aswe", { 15, 15 } }, // POINTER_AUTOSCROLL_WE +{ "asnswe", { 15, 15 } }, // POINTER_AUTOSCROLL_NSWE +{ "airbrush", { 5, 22 } }, // POINTER_AIRBRUSH +{ "vtext", { 15, 15 } }, // POINTER_TEXT_VERTICAL +{ "pivotdel", { 18, 15 } }, // POINTER_PIVOT_DELETE +{ "tblsels", { 15, 30 } }, // POINTER_TAB_SELECT_S +{ "tblsele", { 30, 16 } }, // POINTER_TAB_SELECT_E +{ "tblselse", { 30, 30 } }, // POINTER_TAB_SELECT_SE +{ "tblselw", { 1, 16 } }, // POINTER_TAB_SELECT_W +{ "tblselsw", { 1, 30 } }, // POINTER_TAB_SELECT_SW +{ "pntbrsh", { 9, 16 } } // POINTER_PAINTBRUSH }; NSCursor* SalData::getCursor( PointerStyle i_eStyle ) { - if( i_eStyle >= POINTER_COUNT ) - return nil; + if( i_eStyle >= POINTER_COUNT ) + return nil; - NSCursor* pCurs = maCursors[ i_eStyle ]; - if( pCurs == INVALID_CURSOR_PTR ) - { - pCurs = nil; - if( aCursorTab[ i_eStyle ].pBaseName ) - { - NSPoint aHotSpot = aCursorTab[ i_eStyle ].aHotSpot; - CFStringRef pCursorName = - CFStringCreateWithCStringNoCopy( - kCFAllocatorDefault, - aCursorTab[ i_eStyle ].pBaseName, - kCFStringEncodingASCII, - kCFAllocatorNull ); - CFBundleRef hMain = CFBundleGetMainBundle(); - CFURLRef hURL = CFBundleCopyResourceURL( hMain, pCursorName, CFSTR("png"), CFSTR("cursors") ); - if( hURL ) - { - pCurs = [[NSCursor alloc] initWithImage: [[NSImage alloc] initWithContentsOfURL: (NSURL*)hURL] hotSpot: aHotSpot]; - CFRelease( hURL ); - } - CFRelease( pCursorName ); - } - maCursors[ i_eStyle ] = pCurs; - } - return pCurs; + NSCursor* pCurs = maCursors[ i_eStyle ]; + if( pCurs == INVALID_CURSOR_PTR ) + { + pCurs = nil; + if( aCursorTab[ i_eStyle ].pBaseName ) + { + NSPoint aHotSpot = aCursorTab[ i_eStyle ].aHotSpot; + CFStringRef pCursorName = + CFStringCreateWithCStringNoCopy( + kCFAllocatorDefault, + aCursorTab[ i_eStyle ].pBaseName, + kCFStringEncodingASCII, + kCFAllocatorNull ); + CFBundleRef hMain = CFBundleGetMainBundle(); + CFURLRef hURL = CFBundleCopyResourceURL( hMain, pCursorName, CFSTR("png"), CFSTR("cursors") ); + if( hURL ) + { + pCurs = [[NSCursor alloc] initWithImage: [[NSImage alloc] initWithContentsOfURL: (NSURL*)hURL] hotSpot: aHotSpot]; + CFRelease( hURL ); + } + CFRelease( pCursorName ); + } + maCursors[ i_eStyle ] = pCurs; + } + return pCurs; } NSStatusItem* SalData::getStatusItem() { - SalData* pData = GetSalData(); - if( ! pData->mpStatusItem ) - { - NSStatusBar* pStatBar =[NSStatusBar systemStatusBar]; - if( pStatBar ) - { - pData->mpStatusItem = [pStatBar statusItemWithLength: NSVariableStatusItemLength]; - [pData->mpStatusItem retain]; - OOStatusItemView* pView = [[OOStatusItemView alloc] init]; - [pData->mpStatusItem setView: pView ]; - [pView display]; - } - } - return pData->mpStatusItem; + SalData* pData = GetSalData(); + if( ! pData->mpStatusItem ) + { + NSStatusBar* pStatBar =[NSStatusBar systemStatusBar]; + if( pStatBar ) + { + pData->mpStatusItem = [pStatBar statusItemWithLength: NSVariableStatusItemLength]; + [pData->mpStatusItem retain]; + OOStatusItemView* pView = [[OOStatusItemView alloc] init]; + [pData->mpStatusItem setView: pView ]; + [pView display]; + } + } + return pData->mpStatusItem; } + +/* vim: set noet sw=4 ts=4: */ From dcc1a39b36e37c89d13a07422588ce0c029d6df4 Mon Sep 17 00:00:00 2001 From: mseidel Date: Wed, 10 Dec 2025 17:23:32 +0100 Subject: [PATCH 02/12] New cursors --- main/vcl/aqua/source/res/cursors/tblsele.png | Bin 174 -> 267 bytes main/vcl/aqua/source/res/cursors/tblsels.png | Bin 171 -> 244 bytes main/vcl/aqua/source/res/cursors/tblselse.png | Bin 183 -> 245 bytes main/vcl/aqua/source/res/cursors/tblselsw.png | Bin 183 -> 254 bytes main/vcl/aqua/source/res/cursors/tblselw.png | Bin 174 -> 262 bytes main/vcl/os2/source/src/tblsele.ptr | Bin 1190 -> 1190 bytes main/vcl/os2/source/src/tblsels.ptr | Bin 1190 -> 1190 bytes main/vcl/os2/source/src/tblselse.ptr | Bin 1190 -> 1190 bytes main/vcl/os2/source/src/tblselsw.ptr | Bin 1190 -> 1190 bytes main/vcl/os2/source/src/tblselw.ptr | Bin 1190 -> 1190 bytes main/vcl/win/source/src/tblsele.cur | Bin 326 -> 326 bytes main/vcl/win/source/src/tblsels.cur | Bin 326 -> 326 bytes main/vcl/win/source/src/tblselse.cur | Bin 326 -> 326 bytes main/vcl/win/source/src/tblselsw.cur | Bin 326 -> 326 bytes main/vcl/win/source/src/tblselw.cur | Bin 326 -> 326 bytes 15 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/vcl/aqua/source/res/cursors/tblsele.png b/main/vcl/aqua/source/res/cursors/tblsele.png index a2da05e009d10ac74ec3805aaf67377f037904ef..fbc9338522be835088d81c727dfeccaba8b64421 100644 GIT binary patch delta 251 zcmZ3-*v&LSqMn0|fq|j8s_F}nVo7)Ob!1@J*w6hZkrl{iEDmyaV!U}$ryj^rNcITw zWnidMV_;}#VPNM1 zMG8=`#M8wwB;xSfYu;Q8h8)ZnX8gW?^JWR(rG9B;;~Axj{HvB8NHO}EX;VGnZii9B z?&ShHd)rx>o*pi63^1C=&XStF(J^4xY;KmP{4NeB7zHmf85lEc5Ie9thOgsk(1BGk vY&WKQGc5m9bYShCU(Sy*e6oM0d|GScyi8R>SXpBo&;bmdu6{1-oD!M<08v)v delta 158 zcmeBXTE{p+qMnhNfq}tu%Zu$miY>q=#1%*b!P4}d=YbSsNswPKgTu2MX&_FLx4R2N z2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*{^d6@#<>iaU>i83MqQJIEHXsPfl3C xqtU>@ERe`}&U>cv7h@-A}f&3SRCZ;#CY?hPCbyLkn9oU z%fL{j#=y|f!octgDAe$RfuYoZf#FpG1B2BJ1_tqhIlBUFfD)Vq9+AZi419+{nDKc2 ziWHz=tfz}(NW|f{=M04!9C(~A7W{WkPL6$^!C|%R;Z|$ux=-FJ VOw~C%7Xoc!@O1TaS?83{1OOT0OCkUO delta 155 zcmeyuxSDZ-L_H%j0|SHSmKWQB6kC8#h%1l=f~Dy@&jTsOk|4ie28U-i(m&U>cv7h@-A}f&3SRCZ;#CY?hPCbyLkn9oU z%fL{j#=y|f!octgDAe$RfuYoZf#FpG1B2BJ1_tqhIlBUFfD)Vq9+AZi419+{nDKc2 ziWHz=oTrOpNW|f{R}A?Y3xey1Syfbu%7j7MD!dh=vIbfvTLJd9*KT;X;=WS>=n6#I>^`s#`QYuT?X W)O)i^WZfyCRScf4elF{r5}E+9T2KoB delta 167 zcmey$xSer=L_H%j0|SHSmKWQB6kC8#h%1l=f~Dy@&jTsOk|4ie28U-i(mmaw diff --git a/main/vcl/aqua/source/res/cursors/tblselsw.png b/main/vcl/aqua/source/res/cursors/tblselsw.png index 11d7cb34d64d86f61bc78cd297ff68fafd48d9e9..a23192f472353eb2cde2be9695fef9c4a1fe1969 100644 GIT binary patch delta 238 zcmdna_>XadL_G%^0|P^GRn-?D#ggvm>&U>cv7h@-A}f&3SRCZ;#CY?hPCbyLkn9oU z%fL{j#=y|f!octgDAe$RfuYoZf#FpG1B2BJ1_tqhIlBUFfD)Vq9+AZi419+{nDKc2 ziWHz=x~Gd{NW|f{Q@yzkDDbeBzN>#;qMk1DJ1}b!SN=79iwQ@jD76SUaeNfkd7ZdP zbyma7r5**ZoSRtg8nAd5SWavdy0gx80!#mHNri*2*&pg0^f(dRbaBCS7UM*I&NS{Y h?<@V~3-apQ_#Jih-b{PDsRL*ygQu&X%Q~loCIF|&P>}!t delta 167 zcmeyzxSer=L_H%j0|SHSmKWQB6kC8#h%1l=f~Dy@&jTsOk|4ie28U-i(mM1 zMG87Pu7 z2D5s}3tH=$ZarPj&{ZSuFgcwu=KRpQ{DyBmRaGkCiCxvXq=#1%*b!P4}d=YbSsNswPKgTu2MX&_FLx4R2N z2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*{^d6@#-mf|J!W}6jJnbaSY+Oo}93N xVM7CloPZ*;(wqMboxki2rt!o~YZb52W(aU%@w&flZY)qWgQu&X%Q~loCIGy?DF*-m diff --git a/main/vcl/os2/source/src/tblsele.ptr b/main/vcl/os2/source/src/tblsele.ptr index ddff735278b38945a6f2b4569480085588e102a7..3fc148a36a154d17f254dd7177cd2280afbe7535 100644 GIT binary patch literal 1190 zcmd5*F>b;@5S$Z8X(C;bjv}F?OiSg&@BkM)CLJb`5HH~!sZ#kdltdKE%sEJV4lZbb zJMB&!zc`=q{u)49HHO1k037w)kGtnCgb1z za=BCOZ+b`1-@x=0m~Vj3HL+^FxZS1z&@Lp2-o7$-oFS1?x z*>Tdk>0txlLJ^MHl6r**FWNaJ#vX=?aLzS&h5{dxor(u?F66nCH$_o+&%ya}D(xak zeP0y`*;#!T>O1-E+wAL;MpQg-UnERiQzG7TMww7dY3VEO`GmGNM!fpq*8J2hSle=8 zquSRCu&5KlQ=L#URYI5V)@$eH{@$;uL*MTCLiDfn8`y1u(-XKoDA!=+D-QC*(0for YV&dF~bAIQ%8_vGr4=*cUaYud_zWUW8h5!Hn diff --git a/main/vcl/os2/source/src/tblsels.ptr b/main/vcl/os2/source/src/tblsels.ptr index 1cb0f74e58e360f694c880366feecd8f15a66743..6b841af496cb0873f805cbecba7feb5ea1f35949 100644 GIT binary patch delta 105 zcmZ3+xr}pzGb4Wk^Z)-0jQ{^JF#P|+z)(Ngki~3r1EbvJWsD`3{0txfAwjGUAOcRo YC148v!@!5l3z^&)Cm!&d{G53|0NJ)4?EnA( delta 99 zcmZ3+xr}pzGo#W0_W%EX*yF>K6B!*RFJmlWXZZi0f&c%9$rl-=C*NTdz=oOm|Nq~d M$mGE|`8o4`060!F_5c6? diff --git a/main/vcl/os2/source/src/tblselse.ptr b/main/vcl/os2/source/src/tblselse.ptr index a23ddfda3cc53f2c2b481945da6948f1de6410b4..bead9c51ed4c821b8a7ba64e8c3d0b5ea0659963 100644 GIT binary patch delta 241 zcmZ3+xr}pz4x?EEP=Y{{iuT5N-tGgFyTch(7}HPays~Ig!z2 z@-jvVcYYub2tF{t0EC6$^MfT2d&c&MSdieVAD|4099>n MWHMl!yq)*QsOqKpia|1jE4mShr`%*n*B_JM%`h+u%9pPzvNh+u&K14#A*!(?eDX(ombliiu* UnHc_Wp2(!eIPrk!3V(ezPV`6Hn^ z)vGV|ZyE2{uUx(JyM&B)o(Fi|c^=?7i_?0_j!R2)$tjQjiOvV=brqz#3LGc%JU>6O z`ys!7)~^%(A1gM%LkSGVH;5~*+|wQyjWTUco!~Ivd73|y&a-|v0tcW+90KM)4;+l) K6}hH9d$$YR+9Ejs literal 1190 zcmd^8u?@m75WGMnB7tNiIvP^41rQdXU>G_wP3Fh|8G@3Ilt>`VokK!mQ9zY~kM8aJ zd;4Sgooto>4uovGo6`p{$T&`j7;Ex?Ggxa|IzyEnQw^m9DL;_*CqAn_`_e>omp3+Bu+eLPNc6r)Fo=P0`i8jTijB`e6nWa3I>E>M fORs*+eXQ8@3pPKmt%kVbw+kP}sDiIaw@3Q~mvtZ! diff --git a/main/vcl/win/source/src/tblsele.cur b/main/vcl/win/source/src/tblsele.cur index 8314841c253d2dd45d618477499b4524003d674e..5e8dc327fe5ca8d871a01b2bdd346b935a2ed1e4 100644 GIT binary patch literal 326 zcmajZu?>ST6olb36qKZ*B$Sldz}XB&V-!Z9Bm&9#58PTD`gHcQ3`muNhC%A}(kDor zq!EntMc}!T%j+uhI;G@#h;P(3W5J3IJI>tRd+zfYy1zs{gnuaHVE)5y6C&Pd(V#}i Q?Y-wdkC>3|`+iS3f4EVBc>n+a literal 326 zcma)$yA6Oa3`EZXi4rPGNJ+^CVKhogMqrd|7M`OFkc*zq-^fysDMo42qSK^R(gBoo zf$^%Ec^n!Zmr~q%l^OitW%H5l5%|vCbFbHa#=FH0y-E!3Fmv_<16Xr%uh)LUyY&M^ C8htzf diff --git a/main/vcl/win/source/src/tblsels.cur b/main/vcl/win/source/src/tblsels.cur index cb92ea198ad284f103297abf422971e1c0804230..75006ffb693db2d878f14613b601d8d23c5b4800 100644 GIT binary patch delta 74 zcmX@cbc|_&w-N&oFaj}i0|Nv50R{&C2Mi4I9~cP?MtJ}P%@>oO(4M1#sV*mgE diff --git a/main/vcl/win/source/src/tblselse.cur b/main/vcl/win/source/src/tblselse.cur index 5a0d7bd2503123e98e35cfa5de4a113d7627db42..c385f3ab8f1ee30ea157175af6151fd7af9cc1bf 100644 GIT binary patch literal 326 zcmb`>F%E)25JusDz{JLcj>_nklpcVBgHgcE@-2gH)L<1Z}Md(Tdh>cl#+B| zZYI@|8t|kJ#_Z)4cag>I?y+*$O{#E234=n97H6Drz~ABzG?@DxGgdsY;R6pNCMp> zAz%&c#E6rG^VeXtHv_e2W|^9FHdayft@nCQS1{Yd;_THcY^{x$%Q*56>Ki?so>E@f TM_$X!$1(GM5$mVCWgPtgd8~ZX diff --git a/main/vcl/win/source/src/tblselsw.cur b/main/vcl/win/source/src/tblselsw.cur index 940b372ff62fb05b698df8702977f32ce8e5b7de..bfa5c8a9e53fe8fcd640f33faac047b7fb48cb3c 100644 GIT binary patch literal 326 zcmb`>F%m#95QX6v3Z+g-N~Ka^#LdJgl#bvi9K{ioy7*%p!OMKvo!w@oL`K$%zf@zS zLQ)Mz8en*Dz7qT76Z;TCEN|Q`xeF%_c(Ccwp+y6WKf?{d8>GmPqk_W-_7i3-Sg~Qp GA9(L~oMMU&W%Y3eignWBU4jZ)SKnhesYVJTEZTe(UJPVg}Qio#a1g?h2DV Wa(K*c()%oZPSSetB6yjf*-0BC8hr5p diff --git a/main/vcl/win/source/src/tblselw.cur b/main/vcl/win/source/src/tblselw.cur index 5c60eecbf893b437428093d21bab6f2496bde0e3..89c4450eb1431bedcddb2fd83dd0810715b3c298 100644 GIT binary patch literal 326 zcmaiuyAgvh5JXoHIK+`t2pzfuD2+~NMV;Uh2niU@Z#4=Tyqc%g{WK>vN*V@nKlMq{ zOVS%iX@bNls^)i7@jD`H_nIhY{(=@B&_NGlb;r)T?mqXI1+af&hik2*7w98SIADhj VzK~(A?%4Sq+~ Date: Thu, 11 Dec 2025 09:54:47 +0100 Subject: [PATCH 03/12] Smoother Windows cursors --- main/vcl/aqua/source/app/saldata.cxx | 188 +++++++++++++-------------- main/vcl/win/source/src/tblsele.cur | Bin 326 -> 4286 bytes main/vcl/win/source/src/tblsels.cur | Bin 326 -> 4286 bytes main/vcl/win/source/src/tblselse.cur | Bin 326 -> 4286 bytes main/vcl/win/source/src/tblselsw.cur | Bin 326 -> 4286 bytes main/vcl/win/source/src/tblselw.cur | Bin 326 -> 4286 bytes 6 files changed, 94 insertions(+), 94 deletions(-) diff --git a/main/vcl/aqua/source/app/saldata.cxx b/main/vcl/aqua/source/app/saldata.cxx index 5f2fedc5f5f..158e114da4a 100644 --- a/main/vcl/aqua/source/app/saldata.cxx +++ b/main/vcl/aqua/source/app/saldata.cxx @@ -140,100 +140,100 @@ struct curs_ent } const aCursorTab[ POINTER_COUNT ] = { -{ NULL, { 0, 0 } }, // POINTER_ARROW -{ "nullptr", { 16, 16 } }, // POINTER_NULL -{ "hourglass", { 15, 15 } }, // POINTER_WAIT -{ NULL, { 0, 0 } }, // POINTER_TEXT -{ "help", { 0, 0 } }, // POINTER_HELP -{ NULL, { 0, 0 } }, // POINTER_CROSS -{ NULL, { 0, 0 } }, // POINTER_MOVE -{ NULL, { 0, 0 } }, // POINTER_NSIZE -{ NULL, { 0, 0 } }, // POINTER_SSIZE -{ NULL, { 0, 0 } }, // POINTER_WSIZE -{ NULL, { 0, 0 } }, // POINTER_ESIZE -{ "nwsesize", { 15, 15 } }, // POINTER_NWSIZE -{ "neswsize", { 15, 15 } }, // POINTER_NESIZE -{ "neswsize", { 15, 15 } }, // POINTER_SWSIZE -{ "nwsesize", { 15, 15 } }, // POINTER_SESIZE -{ NULL, { 0, 0 } }, // POINTER_WINDOW_NSIZE -{ NULL, { 0, 0 } }, // POINTER_WINDOW_SSIZE -{ NULL, { 0, 0 } }, // POINTER_WINDOW_WSIZE -{ NULL, { 0, 0 } }, // POINTER_WINDOW_ESIZE -{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_NWSIZE -{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_NESIZE -{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_SWSIZE -{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_SESIZE -{ NULL, { 0, 0 } }, // POINTER_HSPLIT -{ NULL, { 0, 0 } }, // POINTER_VSPLIT -{ NULL, { 0, 0 } }, // POINTER_HSIZEBAR -{ NULL, { 0, 0 } }, // POINTER_VSIZEBAR -{ NULL, { 0, 0 } }, // POINTER_HAND -{ NULL, { 0, 0 } }, // POINTER_REFHAND -{ "pen", { 3, 27 } }, // POINTER_PEN -{ "magnify", { 12, 13 } }, // POINTER_MAGNIFY -{ "fill", { 10, 22 } }, // POINTER_FILL -{ "rotate", { 15, 15 } }, // POINTER_ROTATE -{ "hshear", { 15, 15 } }, // POINTER_HSHEAR -{ "vshear", { 15, 15 } }, // POINTER_VSHEAR -{ "mirror", { 14, 12 } }, // POINTER_MIRROR -{ "crook", { 15, 14 } }, // POINTER_CROOK -{ "crop", { 9, 9 } }, // POINTER_CROP -{ "movept", { 0, 0 } }, // POINTER_MOVEPOINT -{ "movebw", { 0, 0 } }, // POINTER_MOVEBEZIERWEIGHT -{ "movedata", { 0, 0 } }, // POINTER_MOVEDATA -{ "copydata", { 0, 0 } }, // POINTER_COPYDATA -{ "linkdata", { 0, 0 } }, // POINTER_LINKDATA -{ "movedlnk", { 0, 0 } }, // POINTER_MOVEDATALINK -{ "copydlnk", { 0, 0 } }, // POINTER_COPYDATALINK -{ "movef", { 8, 8 } }, // POINTER_MOVEFILE -{ "copyf", { 8, 8 } }, // POINTER_COPYFILE -{ "linkf", { 8, 8 } }, // POINTER_LINKFILE -{ "moveflnk", { 8, 8 } }, // POINTER_MOVEFILELINK -{ "copyflnk", { 8, 8 } }, // POINTER_COPYFILELINK -{ "movef2", { 7, 8 } }, // POINTER_MOVEFILES -{ "copyf2", { 7, 8 } }, // POINTER_COPYFILES -{ "notallow", { 15, 15 } }, // POINTER_NOTALLOWED -{ "dline", { 8, 8 } }, // POINTER_DRAW_LINE -{ "drect", { 8, 8 } }, // POINTER_DRAW_RECT -{ "dpolygon", { 8, 8 } }, // POINTER_DRAW_POLYGON -{ "dbezier", { 8, 8 } }, // POINTER_DRAW_BEZIER -{ "darc", { 8, 8 } }, // POINTER_DRAW_ARC -{ "dpie", { 8, 8 } }, // POINTER_DRAW_PIE -{ "dcirccut", { 8, 8 } }, // POINTER_DRAW_CIRCLECUT -{ "dellipse", { 8, 8 } }, // POINTER_DRAW_ELLIPSE -{ "dfree", { 8, 8 } }, // POINTER_DRAW_FREEHAND -{ "dconnect", { 8, 8 } }, // POINTER_DRAW_CONNECT -{ "dtext", { 8, 8 } }, // POINTER_DRAW_TEXT -{ "dcapt", { 8, 8 } }, // POINTER_DRAW_CAPTION -{ "chart", { 15, 16 } }, // POINTER_CHART -{ "detectiv", { 12, 13 } }, // POINTER_DETECTIVE -{ "pivotcol", { 7, 5 } }, // POINTER_PIVOT_COL -{ "pivotrow", { 8, 7 } }, // POINTER_PIVOT_ROW -{ "pivotfld", { 8, 7 } }, // POINTER_PIVOT_FIELD -{ "chain", { 0, 2 } }, // POINTER_CHAIN -{ "chainnot", { 2, 2 } }, // POINTER_CHAIN_NOTALLOWED -{ "timemove", { 16, 16 } }, // POINTER_TIMEEVENT_MOVE -{ "timesize", { 16, 17 } }, // POINTER_TIMEEVENT_SIZE -{ "asn", { 16, 12 } }, // POINTER_AUTOSCROLL_N -{ "ass", { 15, 19 } }, // POINTER_AUTOSCROLL_S -{ "asw", { 12, 15 } }, // POINTER_AUTOSCROLL_W -{ "ase", { 19, 16 } }, // POINTER_AUTOSCROLL_E -{ "asnw", { 10, 10 } }, // POINTER_AUTOSCROLL_NW -{ "asne", { 21, 10 } }, // POINTER_AUTOSCROLL_NE -{ "assw", { 21, 21 } }, // POINTER_AUTOSCROLL_SW -{ "asse", { 21, 21 } }, // POINTER_AUTOSCROLL_SE -{ "asns", { 15, 15 } }, // POINTER_AUTOSCROLL_NS -{ "aswe", { 15, 15 } }, // POINTER_AUTOSCROLL_WE -{ "asnswe", { 15, 15 } }, // POINTER_AUTOSCROLL_NSWE -{ "airbrush", { 5, 22 } }, // POINTER_AIRBRUSH -{ "vtext", { 15, 15 } }, // POINTER_TEXT_VERTICAL -{ "pivotdel", { 18, 15 } }, // POINTER_PIVOT_DELETE -{ "tblsels", { 15, 30 } }, // POINTER_TAB_SELECT_S -{ "tblsele", { 30, 16 } }, // POINTER_TAB_SELECT_E -{ "tblselse", { 30, 30 } }, // POINTER_TAB_SELECT_SE -{ "tblselw", { 1, 16 } }, // POINTER_TAB_SELECT_W -{ "tblselsw", { 1, 30 } }, // POINTER_TAB_SELECT_SW -{ "pntbrsh", { 9, 16 } } // POINTER_PAINTBRUSH +{ NULL, { 0, 0 } }, // POINTER_ARROW +{ "nullptr", { 16, 16 } }, // POINTER_NULL +{ "hourglass", { 15, 15 } }, // POINTER_WAIT +{ NULL, { 0, 0 } }, // POINTER_TEXT +{ "help", { 0, 0 } }, // POINTER_HELP +{ NULL, { 0, 0 } }, // POINTER_CROSS +{ NULL, { 0, 0 } }, // POINTER_MOVE +{ NULL, { 0, 0 } }, // POINTER_NSIZE +{ NULL, { 0, 0 } }, // POINTER_SSIZE +{ NULL, { 0, 0 } }, // POINTER_WSIZE +{ NULL, { 0, 0 } }, // POINTER_ESIZE +{ "nwsesize", { 15, 15 } }, // POINTER_NWSIZE +{ "neswsize", { 15, 15 } }, // POINTER_NESIZE +{ "neswsize", { 15, 15 } }, // POINTER_SWSIZE +{ "nwsesize", { 15, 15 } }, // POINTER_SESIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_NSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_SSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_WSIZE +{ NULL, { 0, 0 } }, // POINTER_WINDOW_ESIZE +{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_NWSIZE +{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_NESIZE +{ "neswsize", { 15, 15 } }, // POINTER_WINDOW_SWSIZE +{ "nwsesize", { 15, 15 } }, // POINTER_WINDOW_SESIZE +{ NULL, { 0, 0 } }, // POINTER_HSPLIT +{ NULL, { 0, 0 } }, // POINTER_VSPLIT +{ NULL, { 0, 0 } }, // POINTER_HSIZEBAR +{ NULL, { 0, 0 } }, // POINTER_VSIZEBAR +{ NULL, { 0, 0 } }, // POINTER_HAND +{ NULL, { 0, 0 } }, // POINTER_REFHAND +{ "pen", { 3, 27 } }, // POINTER_PEN +{ "magnify", { 12, 13 } }, // POINTER_MAGNIFY +{ "fill", { 10, 22 } }, // POINTER_FILL +{ "rotate", { 15, 15 } }, // POINTER_ROTATE +{ "hshear", { 15, 15 } }, // POINTER_HSHEAR +{ "vshear", { 15, 15 } }, // POINTER_VSHEAR +{ "mirror", { 14, 12 } }, // POINTER_MIRROR +{ "crook", { 15, 14 } }, // POINTER_CROOK +{ "crop", { 9, 9 } }, // POINTER_CROP +{ "movept", { 0, 0 } }, // POINTER_MOVEPOINT +{ "movebw", { 0, 0 } }, // POINTER_MOVEBEZIERWEIGHT +{ "movedata", { 0, 0 } }, // POINTER_MOVEDATA +{ "copydata", { 0, 0 } }, // POINTER_COPYDATA +{ "linkdata", { 0, 0 } }, // POINTER_LINKDATA +{ "movedlnk", { 0, 0 } }, // POINTER_MOVEDATALINK +{ "copydlnk", { 0, 0 } }, // POINTER_COPYDATALINK +{ "movef", { 8, 8 } }, // POINTER_MOVEFILE +{ "copyf", { 8, 8 } }, // POINTER_COPYFILE +{ "linkf", { 8, 8 } }, // POINTER_LINKFILE +{ "moveflnk", { 8, 8 } }, // POINTER_MOVEFILELINK +{ "copyflnk", { 8, 8 } }, // POINTER_COPYFILELINK +{ "movef2", { 7, 8 } }, // POINTER_MOVEFILES +{ "copyf2", { 7, 8 } }, // POINTER_COPYFILES +{ "notallow", { 15, 15 } }, // POINTER_NOTALLOWED +{ "dline", { 8, 8 } }, // POINTER_DRAW_LINE +{ "drect", { 8, 8 } }, // POINTER_DRAW_RECT +{ "dpolygon", { 8, 8 } }, // POINTER_DRAW_POLYGON +{ "dbezier", { 8, 8 } }, // POINTER_DRAW_BEZIER +{ "darc", { 8, 8 } }, // POINTER_DRAW_ARC +{ "dpie", { 8, 8 } }, // POINTER_DRAW_PIE +{ "dcirccut", { 8, 8 } }, // POINTER_DRAW_CIRCLECUT +{ "dellipse", { 8, 8 } }, // POINTER_DRAW_ELLIPSE +{ "dfree", { 8, 8 } }, // POINTER_DRAW_FREEHAND +{ "dconnect", { 8, 8 } }, // POINTER_DRAW_CONNECT +{ "dtext", { 8, 8 } }, // POINTER_DRAW_TEXT +{ "dcapt", { 8, 8 } }, // POINTER_DRAW_CAPTION +{ "chart", { 15, 16 } }, // POINTER_CHART +{ "detectiv", { 12, 13 } }, // POINTER_DETECTIVE +{ "pivotcol", { 7, 5 } }, // POINTER_PIVOT_COL +{ "pivotrow", { 8, 7 } }, // POINTER_PIVOT_ROW +{ "pivotfld", { 8, 7 } }, // POINTER_PIVOT_FIELD +{ "chain", { 0, 2 } }, // POINTER_CHAIN +{ "chainnot", { 2, 2 } }, // POINTER_CHAIN_NOTALLOWED +{ "timemove", { 16, 16 } }, // POINTER_TIMEEVENT_MOVE +{ "timesize", { 16, 17 } }, // POINTER_TIMEEVENT_SIZE +{ "asn", { 16, 12 } }, // POINTER_AUTOSCROLL_N +{ "ass", { 15, 19 } }, // POINTER_AUTOSCROLL_S +{ "asw", { 12, 15 } }, // POINTER_AUTOSCROLL_W +{ "ase", { 19, 16 } }, // POINTER_AUTOSCROLL_E +{ "asnw", { 10, 10 } }, // POINTER_AUTOSCROLL_NW +{ "asne", { 21, 10 } }, // POINTER_AUTOSCROLL_NE +{ "assw", { 21, 21 } }, // POINTER_AUTOSCROLL_SW +{ "asse", { 21, 21 } }, // POINTER_AUTOSCROLL_SE +{ "asns", { 15, 15 } }, // POINTER_AUTOSCROLL_NS +{ "aswe", { 15, 15 } }, // POINTER_AUTOSCROLL_WE +{ "asnswe", { 15, 15 } }, // POINTER_AUTOSCROLL_NSWE +{ "airbrush", { 5, 22 } }, // POINTER_AIRBRUSH +{ "vtext", { 15, 15 } }, // POINTER_TEXT_VERTICAL +{ "pivotdel", { 18, 15 } }, // POINTER_PIVOT_DELETE +{ "tblsels", { 15, 30 } }, // POINTER_TAB_SELECT_S +{ "tblsele", { 30, 16 } }, // POINTER_TAB_SELECT_E +{ "tblselse", { 30, 30 } }, // POINTER_TAB_SELECT_SE +{ "tblselw", { 1, 16 } }, // POINTER_TAB_SELECT_W +{ "tblselsw", { 1, 30 } }, // POINTER_TAB_SELECT_SW +{ "pntbrsh", { 9, 16 } } // POINTER_PAINTBRUSH }; NSCursor* SalData::getCursor( PointerStyle i_eStyle ) diff --git a/main/vcl/win/source/src/tblsele.cur b/main/vcl/win/source/src/tblsele.cur index 5e8dc327fe5ca8d871a01b2bdd346b935a2ed1e4..f6cd4f7bd7999c8ae18cf21353e908a75b525650 100644 GIT binary patch literal 4286 zcmeH|u?oU45Qa}39CdP35d=YSa1b2CzL`FbPtvteD1}lAeFQh1;{O+}D79`$5OVN` zST6olb36qKZ*B$Sldz}XB&V-!Z9Bm&9#58PTD`gHcQ3`muNhC%A}(kDor zq!EntMc}!T%j+uhI;G@#h;P(3W5J3IJI>tRd+zfYy1zs{gnuaHVE)5y6C&Pd(V#}i Q?Y-wdkC>3|`+iS3f4EVBc>n+a diff --git a/main/vcl/win/source/src/tblsels.cur b/main/vcl/win/source/src/tblsels.cur index 75006ffb693db2d878f14613b601d8d23c5b4800..246f38ac895e7d03135daf333b059bd1c2cee6f6 100644 GIT binary patch literal 4286 zcmeH~O$x#=6ojX`a9LL_wM$Q7>(9N~<9G~rxrS{o;L=5LdEC8&<@(Gn#R^ss+cWfi?`N@#I186;=lqTy81@kuKFaodkr;xqM;H!)J@{G1 zcn2crZ`y!1pbcmP+JH8o4QK<}K->o0d3mVGYe`;KL3u4UWKOb~cmjBnugdwuO?KK0yU^rbmos za@}|(`s`)&l0qJYC!e8Md~k(kgJFm1u<`WrA2@?_n#UyVgS0i$T1rbH&AAh%_%5fg G;d@*Frhh~L diff --git a/main/vcl/win/source/src/tblselse.cur b/main/vcl/win/source/src/tblselse.cur index c385f3ab8f1ee30ea157175af6151fd7af9cc1bf..43436e33ebe6ac6ee24a49dd65e36b1d590d4b7f 100644 GIT binary patch literal 4286 zcmeH|-Acni5QQi8hk}SAqKF{9@&^$SK|}<7v^Ly^{V8=s-7L#~oq_kjHgH|X z5Y#-+f1H7Lz@}?+t9L^EqA0$dfqk%H@B3Iz=~0&Dmou;j)_fRuG|%W$Rn?~%cn(%O zcYSTo=~dVDhZ%SVR(zRG>0Z#UX`1&L_zZ?q_k2EH(z9*b*BQ76{4btoUBOI^G4v)b z-vNDp$F=pQKi^aTQ8zH9f2fc^NFXE-5(o)|1VRFHPeAoPQjO(}F;)X6-~l{=XP_ho MV_?7pJc2*h3qS&)sQ>@~ literal 326 zcmb`>F%E)25JusDz{JLcj>_nklpcVBgHgcE@-2gH)L<1Z}Md(Tdh>cl#+B| zZYI@|8t|kJ#_Z)4cag>I?y+*$O{#E234=n97H6Drz~ABzG?@DxGgdsY;R6pNCM^_4pI4cvNf{Bwwccp*rVBILlAKoZV( z_=i%WkOGQh!n&l(oM=HrYk(t40B*4orMT0m0B4} zmFM|=&cuXR_0ZB=a?24!-}hf@Ulb{R6n!UlfHH$j$yN%WQntWN)1s(kF%m#95QX6v3Z+g-N~Ka^#LdJgl#bvi9K{ioy7*%p!OMKvo!w@oL`K$%zf@zS zLQ)Mz8en*Dz7qT76Z;TCEN|Q`xeF%_c(Ccwp+y6WKf?{d8>GmPqk_W-_7i3-Sg~Qp GA9(ST5Ji770ae;iW(<$UCbStN9czRQC@G>i|64dB!XP1qbK{e~jqf~#SBtU-Rt!WvN*V@nKlMq{ zOVS%iX@bNls^)i7@jD`H_nIhY{(=@B&_NGlb;r)T?mqXI1+af&hik2*7w98SIADhj VzK~(A?%4Sq+~ Date: Thu, 11 Dec 2025 11:08:07 +0100 Subject: [PATCH 04/12] Smoother macOS cursors --- main/vcl/aqua/source/res/cursors/tblsele.png | Bin 267 -> 301 bytes main/vcl/aqua/source/res/cursors/tblsels.png | Bin 244 -> 278 bytes main/vcl/aqua/source/res/cursors/tblselse.png | Bin 245 -> 362 bytes main/vcl/aqua/source/res/cursors/tblselsw.png | Bin 254 -> 289 bytes main/vcl/aqua/source/res/cursors/tblselw.png | Bin 262 -> 254 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/vcl/aqua/source/res/cursors/tblsele.png b/main/vcl/aqua/source/res/cursors/tblsele.png index fbc9338522be835088d81c727dfeccaba8b64421..1ae8468037048e575e43bf619b4345123e91cc3f 100644 GIT binary patch delta 193 zcmV;y06zbV0<8j&bbkvI000XU0RWnu7ytkOmPtfGR9M69mN5zfFc1W<^B;mB2o@HC zh2ZPc1_B`vLLe_$8y7@WtoA@|J}^^UE@u`5!Jh&%yLkt=MqsVw8UX;V5g=X>c*Y|F zuc#yN4rK&Bp^CsaQc8@_2h2Gszsdu~7?fY+Gthgd{49S3tvWTzPx3ubYo+`s--M+U v$`A6tAm>c^-t!*VdB`^p`8E#2Aoztl>ro(Z-~q1Z00000NkvXXu0mjfVp~e5 delta 159 zcmV;Q0AT;E0*eBWbbk)R000id0mpBsWB>pFbV)=(R9M69)=LTiF$e?DnET(^*$&c= z8zVEAbs-O`rNCq|`Dr|RkllzffV-yZt-Sg};%H23`50vKtvo}fB^VPUD6Rki N002ovPDHLkV1hORK+ymI diff --git a/main/vcl/aqua/source/res/cursors/tblsels.png b/main/vcl/aqua/source/res/cursors/tblsels.png index 60f2663da5216956f9e3bad7c91abcb02ce4e261..cc217322e66b78bcdc3ae4bde25279547f2103d5 100644 GIT binary patch delta 170 zcmV;b09F6=0hR)gbbkvI000XU0RWnu7ytkOe@R3^R9M69luHVLAQVM!EvzrC-F0~1 zLS7Rc1R+Uf1owa=(Q^H?MF0Q* delta 136 zcmV;30C)eE0`vipbbk)R000id0mpBsWB>pFT}ebiR9M69&M^{zKnz0BaQ{PNW9MiH zI;P>ZI~#sgL_|bH#4v2EX#C>4H$P7-vCO}RM*&mNf+@opd?9jiw&5%j;{d4ajd`CfSJqq2cRg5bPpRa zcNJd(3d2zMvH=TMZ}ESBEbp!cyZ}f04$jWt#$5w6CuqhZH*H9n2><{907*qoM6N<$ Eg3U*4F8}}l delta 137 zcmV;40CxZC0`&oqbbk)R000id0mpBsWB>pFUP(kjR9M69)G-c#Fc1U5h5!Hg=#UU3 zBq--Aus<+c89dMPJkRrfya3oM@v4A`IDL7*1y={$aAm+Ft_o=4ihwSj9q@{01`Od@ r0mFDkz!bhZU>XP5R)2eu|9uD4p)TyI6t2nu0000h5A7D0>=U|Iwz zC0=GkkaMOtI)YLPYa=75wX$VY1k1AU&WH$FYkYEc1bdtr!7g6Ej<|HU;2YNiZzV~$ jRY<@0b8Bx$KbNE@1Ir@d6qU6M00000NkvXXu0mjf?H@pFXGugsR9M69l}if1APfa{?tkZWClvcp zYLW_X)-O1a#FQe05JCv?6D;dtvL%{;nWac@>O+DA-7o}8a5<5I65OsukOYsr86d&y z2jMKiNXS!y(V&+EGhq)2W(!tJ)Q@+dZhwXkK`bupmhG~L01E&B07*qoM6N<$g2(SV AX8-^I diff --git a/main/vcl/aqua/source/res/cursors/tblselw.png b/main/vcl/aqua/source/res/cursors/tblselw.png index af9a06e2ce0158eb46c69e56ecf2f3a3d9b3ac40..745aabf8a16ea11d9c4028db496d61945d85f9a5 100644 GIT binary patch delta 146 zcmV;D0B!$<0{#JzbbkvI000XU0RWnu7ytkOXGugsR9M69mcb2xFbo4d8rx@%Ok#dW z2m2ZJNRc#X>gzys%0GyU{Oy1oi0hgSlJm4l*2R!7;fLFOH;8U&$SjrUvtSYY9 z{shMFfW<4Y_y;V0LW@~oF%2#D0gH_&guOWdgtj5rB89&T01E&B07*qoM6N<$f>Pf% APXGV_ delta 154 zcmV;L0A>IF0fqvQbbk)R000id0mpBsWB>pFZ%IT!R9M69mcb3cAPfUZ_utw5A{0m; zjonJV0l0gRz!=7uAAycTFQxox0Dv}s8PF=P0@~%L0E&DUK$B+yRQVb}m(Kwb`5X`t zAq|j4te21;k&PiWVz-EB5vNs5iKreU*>q(80em6C81p(eZWD(k7{R>Vu>b%707*qo IM6N<$g6b+gn*aa+ From 6b793de003cc0d810bb6cbdc4f48a14bab137567 Mon Sep 17 00:00:00 2001 From: mseidel Date: Tue, 16 Dec 2025 15:04:33 +0100 Subject: [PATCH 05/12] Updated X11 cursor --- main/vcl/inc/unx/x11_cursors/tblselse_curs.h | 33 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblselse_mask.h | 33 ++++++++++---------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h index 4ac5722dfd3..dc0c2e249c4 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h @@ -19,26 +19,25 @@ * *************************************************************/ - #define tblselse_curs_width 16 #define tblselse_curs_height 16 #define tblselse_curs_x_hot 14 #define tblselse_curs_y_hot 14 static const unsigned char tblselse_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x60,0x00, - 0xf0,0x00, - 0xf0,0x01, - 0xe0,0x03, - 0xc0,0x47, - 0x80,0x6f, - 0x00,0x7f, - 0x00,0x7e, - 0x00,0x7c, - 0x00,0x7e, - 0x00,0x7f, - 0x00,0x00}; + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x02, // 0000 0000 0000 0100 + 0x00,0x03, // 0000 0000 0000 1100 + 0x00,0x83, // 0000 0000 0001 1100 + 0x00,0xC3, // 0000 0000 0011 1100 + 0x00,0xE3, // 0000 0000 0111 1100 + 0x00,0xF3, // 0000 0000 1111 1100 + 0x08,0xF3, // 0000 0001 1111 1100 + 0x0C,0xF3, // 0000 0011 1111 1100 + 0x0E,0xF3, // 0000 0111 1111 1100 + 0x0F,0xF3, // 0000 1111 1111 1100 + 0x8F,0xF3, // 0001 1111 1111 1100 + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x00}; // 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h index 83bf5ee858a..e859e7ab395 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h @@ -19,26 +19,25 @@ * *************************************************************/ - #define tblselse_mask_width 16 #define tblselse_mask_height 16 #define tblselse_mask_x_hot 14 #define tblselse_mask_y_hot 14 static const unsigned char tblselse_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x60,0x00, - 0xf0,0x00, - 0xf8,0x01, - 0xf8,0x03, - 0xf0,0xc7, - 0xe0,0xef, - 0xc0,0xff, - 0x80,0xff, - 0x00,0xff, - 0x00,0xfe, - 0x00,0xff, - 0x80,0xff, - 0x80,0xff}; + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x04, // 0000 0000 0000 0010 + 0x00,0x06, // 0000 0000 0000 0110 + 0x00,0x07, // 0000 0000 0000 1110 + 0x00,0x87, // 0000 0000 0001 1110 + 0x00,0xC7, // 0000 0000 0011 1110 + 0x00,0xE7, // 0000 0000 0111 1110 + 0x00,0xF7, // 0000 0000 1111 1110 + 0x08,0xF7, // 0000 0001 1111 1110 + 0x0C,0xF7, // 0000 0011 1111 1110 + 0x0E,0xF7, // 0000 0111 1111 1110 + 0x0F,0xF7, // 0000 1111 1111 1110 + 0x8F,0xF7, // 0001 1111 1111 1110 + 0xCF,0xF7, // 0011 1111 1111 1110 + 0xEF,0xF7, // 0111 1111 1111 1110 + 0x00,0x00}; // 0000 0000 0000 0000 From 56f6108c19104a09e3db4b4e6a75ddee5e807a44 Mon Sep 17 00:00:00 2001 From: mseidel Date: Tue, 16 Dec 2025 16:07:40 +0100 Subject: [PATCH 06/12] Next updated X11 cursor --- main/vcl/inc/unx/x11_cursors/tblselsw_curs.h | 39 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblselsw_mask.h | 33 ++++++++--------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h b/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h index f9f71a4ddcf..377f3d1eb54 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h @@ -4,7 +4,7 @@ * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License,Version 2.0 (the + * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * @@ -12,33 +12,32 @@ * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an - * "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND,either express or implied. See the License for the + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. * *************************************************************/ - #define tblselsw_curs_width 16 #define tblselsw_curs_height 16 #define tblselsw_curs_x_hot 1 #define tblselsw_curs_y_hot 14 static const unsigned char tblselsw_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x06, - 0x00,0x0f, - 0x80,0x0f, - 0xc0,0x07, - 0xe2,0x03, - 0xf6,0x01, - 0xfe,0x00, - 0x7e,0x00, - 0x3e,0x00, - 0x7e,0x00, - 0xfe,0x00, - 0x00,0x00}; + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x00, // 0000 0000 0000 0000 + 0x40,0x00, // 0010 0000 0000 0000 + 0xC0,0x00, // 0011 0000 0000 0000 + 0xC1,0x00, // 0011 1000 0000 0000 + 0xC3,0x00, // 0011 1100 0000 0000 + 0xC7,0x00, // 0011 1110 0000 0000 + 0xCF,0x00, // 0011 1111 0000 0000 + 0xCF,0x10, // 0011 1111 1000 0000 + 0xCF,0x30, // 0011 1111 1100 0000 + 0xCF,0x70, // 0011 1111 1110 0000 + 0xCF,0xF0, // 0011 1111 1111 0000 + 0xCF,0xF1, // 0011 1111 1111 1000 + 0x00,0x00, // 0000 0000 0000 0000 + 0x00,0x00}; // 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h index aee71d9a628..b312151c7fd 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h @@ -19,26 +19,25 @@ * *************************************************************/ - #define tblselsw_mask_width 16 #define tblselsw_mask_height 16 #define tblselsw_mask_x_hot 1 #define tblselsw_mask_y_hot 14 static const unsigned char tblselsw_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x06, - 0x00,0x0f, - 0x80,0x1f, - 0xc0,0x1f, - 0xe3,0x0f, - 0xf7,0x07, - 0xff,0x03, - 0xff,0x01, - 0xff,0x00, - 0x7f,0x00, - 0xff,0x00, - 0xff,0x01, - 0xff,0x01}; + 0x00,0x00, // 0000 0000 0000 0000 + 0x20,0x00, // 0100 0000 0000 0000 + 0x60,0x00, // 0110 0000 0000 0000 + 0xE0,0x00, // 0111 0000 0000 0000 + 0xE1,0x00, // 0111 1000 0000 0000 + 0xE3,0x00, // 0111 1100 0000 0000 + 0xE7,0x00, // 0111 1110 0000 0000 + 0xEF,0x00, // 0111 1111 0000 0000 + 0xEF,0x10, // 0111 1111 1000 0000 + 0xEF,0x30, // 0111 1111 1100 0000 + 0xEF,0x70, // 0111 1111 1110 0000 + 0xEF,0xF0, // 0111 1111 1111 0000 + 0xEF,0xF1, // 0111 1111 1111 1000 + 0xEF,0xF3, // 0111 1111 1111 1100 + 0xEF,0xF7, // 0111 1111 1111 1110 + 0x00,0x00}; // 0000 0000 0000 0000 From 31fad8c139fb6f10681576bb8d5174762c4bb65f Mon Sep 17 00:00:00 2001 From: mseidel Date: Tue, 16 Dec 2025 17:21:43 +0100 Subject: [PATCH 07/12] Next updated X11 cursor --- main/vcl/inc/unx/x11_cursors/tblsels_curs.h | 49 ++++++++++++--------- main/vcl/inc/unx/x11_cursors/tblsels_mask.h | 49 ++++++++++++--------- 2 files changed, 56 insertions(+), 42 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h index a617c1ea30c..28a71d304a6 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsels_curs_width 16 -#define tblsels_curs_height 16 -#define tblsels_curs_x_hot 7 -#define tblsels_curs_y_hot 14 +#define tblsels_curs_width 24 +#define tblsels_curs_height 24 +#define tblsels_curs_x_hot 11 +#define tblsels_curs_y_hot 22 static const unsigned char tblsels_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xc0,0x01, - 0xf8,0x0f, - 0xf0,0x07, - 0xe0,0x03, - 0xc0,0x01, - 0x80,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x0F,0xFF,0x70, // 0000 1111 1111 1111 1110 0000 + 0x0E,0xFF,0x30, // 0000 0111 1111 1111 1100 0000 + 0x0C,0xFF,0x10, // 0000 0011 1111 1111 1000 0000 + 0x08,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 + 0x00,0xF7,0x00, // 0000 0000 1111 1110 0000 0000 + 0x00,0xE3,0x00, // 0000 0000 0111 1100 0000 0000 + 0x00,0xC1,0x00, // 0000 0000 0011 1000 0000 0000 + 0x00,0x80,0x00, // 0000 0000 0001 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h index 78e9be0bb9e..cbfafa46944 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsels_mask_width 16 -#define tblsels_mask_height 16 -#define tblsels_curs_x_hot 7 -#define tblsels_curs_y_hot 14 +#define tblsels_mask_width 24 +#define tblsels_mask_height 24 +#define tblsels_curs_x_hot 11 +#define tblsels_curs_y_hot 22 static const unsigned char tblsels_mask_bits[] = { - 0x00,0x00, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xe0,0x03, - 0xfc,0x1f, - 0xfc,0x1f, - 0xf8,0x0f, - 0xf0,0x07, - 0xe0,0x03, - 0xc0,0x01, - 0x80,0x00}; + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0xCF,0xFF,0xF1, // 0011 1111 1111 1111 1111 1000 + 0x8F,0xFF,0xF0, // 0001 1111 1111 1111 1111 0000 + 0x0F,0xFF,0x70, // 0000 1111 1111 1111 1110 0000 + 0x0E,0xFF,0x30, // 0000 0111 1111 1111 1100 0000 + 0x0C,0xFF,0x10, // 0000 0011 1111 1111 1000 0000 + 0x08,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 + 0x00,0xF7,0x00, // 0000 0000 1111 1110 0000 0000 + 0x00,0xE3,0x00, // 0000 0000 0111 1100 0000 0000 + 0x00,0xC1,0x00, // 0000 0000 0011 1000 0000 0000 + 0x00,0x80,0x00, // 0000 0000 0001 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 From 1d547442eb744c9dd2105936d8ba6a0219a17cbf Mon Sep 17 00:00:00 2001 From: mseidel Date: Tue, 16 Dec 2025 20:49:53 +0100 Subject: [PATCH 08/12] Last updated X11 cursor --- main/vcl/inc/unx/x11_cursors/tblsele_curs.h | 49 +++++++++++--------- main/vcl/inc/unx/x11_cursors/tblsele_mask.h | 49 +++++++++++--------- main/vcl/inc/unx/x11_cursors/tblsels_mask.h | 4 +- main/vcl/inc/unx/x11_cursors/tblselsw_mask.h | 46 ++++++++++-------- main/vcl/inc/unx/x11_cursors/tblselw_curs.h | 47 +++++++++++-------- main/vcl/inc/unx/x11_cursors/tblselw_mask.h | 47 +++++++++++-------- 6 files changed, 139 insertions(+), 103 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblsele_curs.h b/main/vcl/inc/unx/x11_cursors/tblsele_curs.h index 8df7c07cc92..cb01e191b60 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsele_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsele_curs.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsele_curs_width 16 -#define tblsele_curs_height 16 -#define tblsele_curs_x_hot 14 -#define tblsele_curs_y_hot 8 +#define tblsele_curs_width 24 +#define tblsele_curs_height 24 +#define tblsele_curs_x_hot 22 +#define tblsele_curs_y_hot 11 static const unsigned char tblsele_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x04, - 0x00,0x0c, - 0x00,0x1c, - 0xfc,0x3f, - 0xfc,0x7f, - 0xfc,0x3f, - 0x00,0x1c, - 0x00,0x0c, - 0x00,0x04, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x04,0x00, // 0000 0000 0000 0010 0000 0000 + 0x00,0x0C,0x00, // 0000 0000 0000 0011 0000 0000 + 0x00,0x0C,0x10, // 0000 0000 0000 0011 1000 0000 + 0x00,0x0C,0x30, // 0000 0000 0000 0011 1100 0000 + 0x00,0x0C,0x70, // 0000 0000 0000 0011 1110 0000 + 0x00,0x0C,0xF0, // 0000 0000 0000 0011 1111 0000 + 0x00,0x0C,0xF1, // 0000 0000 0000 0011 1111 1000 + 0x00,0x0C,0xF3, // 0000 0000 0000 0011 1111 1100 + 0x00,0x0C,0xF1, // 0000 0000 0000 0011 1111 1000 + 0x00,0x0C,0xF0, // 0000 0000 0000 0011 1111 0000 + 0x00,0x0C,0x70, // 0000 0000 0000 0011 1110 0000 + 0x00,0x0C,0x30, // 0000 0000 0000 0011 1100 0000 + 0x00,0x0C,0x10, // 0000 0000 0000 0011 1000 0000 + 0x00,0x0C,0x00, // 0000 0000 0000 0011 0000 0000 + 0x00,0x04,0x00, // 0000 0000 0000 0010 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblsele_mask.h b/main/vcl/inc/unx/x11_cursors/tblsele_mask.h index 0bb5cbfdf82..edb13d2151b 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsele_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsele_mask.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblsele_mask_width 16 -#define tblsele_mask_height 16 -#define tblsele_mask_x_hot 14 -#define tblsele_mask_y_hot 8 +#define tblsele_mask_width 24 +#define tblsele_mask_height 24 +#define tblsele_mask_x_hot 22 +#define tblsele_mask_y_hot 11 static const unsigned char tblsele_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x06, - 0x00,0x0e, - 0x00,0x1e, - 0xfe,0x3f, - 0xfe,0x7f, - 0xfe,0xff, - 0xfe,0x7f, - 0xfe,0x3f, - 0x00,0x1e, - 0x00,0x0e, - 0x00,0x06, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x02,0x00, // 0000 0000 0000 0100 0000 0000 + 0x00,0x06,0x00, // 0000 0000 0000 0110 0000 0000 + 0x00,0x0E,0x00, // 0000 0000 0000 0111 0000 0000 + 0x00,0x0E,0x10, // 0000 0000 0000 0111 1000 0000 + 0x00,0x0E,0x30, // 0000 0000 0000 0111 1100 0000 + 0x00,0x0E,0x70, // 0000 0000 0000 0111 1110 0000 + 0x00,0x0E,0xF0, // 0000 0000 0000 0111 1111 0000 + 0x00,0x0E,0xF1, // 0000 0000 0000 0111 1111 1000 + 0x00,0x0E,0xF3, // 0000 0000 0000 0111 1111 1100 + 0x00,0x0E,0xF7, // 0000 0000 0000 0111 1111 1110 + 0x00,0x0E,0xF3, // 0000 0000 0000 0111 1111 1100 + 0x00,0x0E,0xF1, // 0000 0000 0000 0111 1111 1000 + 0x00,0x0E,0xF0, // 0000 0000 0000 0111 1111 0000 + 0x00,0x0E,0x70, // 0000 0000 0000 0111 1110 0000 + 0x00,0x0E,0x30, // 0000 0000 0000 0111 1100 0000 + 0x00,0x0E,0x10, // 0000 0000 0000 0111 1000 0000 + 0x00,0x0E,0x00, // 0000 0000 0000 0111 0000 0000 + 0x00,0x06,0x00, // 0000 0000 0000 0110 0000 0000 + 0x00,0x02,0x00, // 0000 0000 0000 0100 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h index cbfafa46944..05d23ce19c6 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h @@ -21,8 +21,8 @@ #define tblsels_mask_width 24 #define tblsels_mask_height 24 -#define tblsels_curs_x_hot 11 -#define tblsels_curs_y_hot 22 +#define tblsels_mask_x_hot 11 +#define tblsels_mask_y_hot 22 static const unsigned char tblsels_mask_bits[] = { 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h index b312151c7fd..aa93d0edfd6 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h @@ -19,25 +19,33 @@ * *************************************************************/ -#define tblselsw_mask_width 16 -#define tblselsw_mask_height 16 +#define tblselsw_mask_width 24 +#define tblselsw_mask_height 24 #define tblselsw_mask_x_hot 1 -#define tblselsw_mask_y_hot 14 +#define tblselsw_mask_y_hot 11 static const unsigned char tblselsw_mask_bits[] = { - 0x00,0x00, // 0000 0000 0000 0000 - 0x20,0x00, // 0100 0000 0000 0000 - 0x60,0x00, // 0110 0000 0000 0000 - 0xE0,0x00, // 0111 0000 0000 0000 - 0xE1,0x00, // 0111 1000 0000 0000 - 0xE3,0x00, // 0111 1100 0000 0000 - 0xE7,0x00, // 0111 1110 0000 0000 - 0xEF,0x00, // 0111 1111 0000 0000 - 0xEF,0x10, // 0111 1111 1000 0000 - 0xEF,0x30, // 0111 1111 1100 0000 - 0xEF,0x70, // 0111 1111 1110 0000 - 0xEF,0xF0, // 0111 1111 1111 0000 - 0xEF,0xF1, // 0111 1111 1111 1000 - 0xEF,0xF3, // 0111 1111 1111 1100 - 0xEF,0xF7, // 0111 1111 1111 1110 - 0x00,0x00}; // 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 + 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 + 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 + 0x00,0x70,0x00, // 0000 0001 1110 0000 0000 0000 + 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 + 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 + 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 + 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 + 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 + 0xEF,0x70,0x00, // 0111 1111 1110 0000 0000 0000 + 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 + 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 + 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 + 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 + 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 + 0x00,0x70,0x00, // 0000 0001 1110 0000 0000 0000 + 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 + 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 + 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblselw_curs.h b/main/vcl/inc/unx/x11_cursors/tblselw_curs.h index 489912bf52e..b7cde28f50b 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselw_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselw_curs.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblselw_curs_width 16 -#define tblselw_curs_height 16 +#define tblselw_curs_width 24 +#define tblselw_curs_height 24 #define tblselw_curs_x_hot 1 -#define tblselw_curs_y_hot 8 +#define tblselw_curs_y_hot 11 static const unsigned char tblselw_curs_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x20,0x00, - 0x30,0x00, - 0x38,0x00, - 0xfc,0x3f, - 0xfe,0x3f, - 0xfc,0x3f, - 0x38,0x00, - 0x30,0x00, - 0x20,0x00, - 0x00,0x00, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x20,0x00, // 0000 0000 0100 0000 0000 0000 + 0x00,0x30,0x00, // 0000 0000 1100 0000 0000 0000 + 0x08,0x30,0x00, // 0000 0001 1100 0000 0000 0000 + 0x0C,0x30,0x00, // 0000 0011 1100 0000 0000 0000 + 0x0E,0x30,0x00, // 0000 0111 1100 0000 0000 0000 + 0x0F,0x30,0x00, // 0000 1111 1100 0000 0000 0000 + 0x8F,0x30,0x00, // 0001 1111 1100 0000 0000 0000 + 0xCF,0x30,0x00, // 0011 1111 1100 0000 0000 0000 + 0x8F,0x30,0x00, // 0001 1111 1100 0000 0000 0000 + 0x0F,0x30,0x00, // 0000 1111 1100 0000 0000 0000 + 0x0E,0x30,0x00, // 0000 0111 1100 0000 0000 0000 + 0x0C,0x30,0x00, // 0000 0011 1100 0000 0000 0000 + 0x08,0x30,0x00, // 0000 0001 1100 0000 0000 0000 + 0x00,0x30,0x00, // 0000 0000 1100 0000 0000 0000 + 0x00,0x20,0x00, // 0000 0000 0100 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblselw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselw_mask.h index f5c52c6fdc4..5be884c700c 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselw_mask.h @@ -19,26 +19,33 @@ * *************************************************************/ - -#define tblselw_mask_width 16 -#define tblselw_mask_height 16 +#define tblselw_mask_width 24 +#define tblselw_mask_height 24 #define tblselw_mask_x_hot 1 -#define tblselw_mask_y_hot 8 +#define tblselw_mask_y_hot 11 static const unsigned char tblselw_mask_bits[] = { - 0x00,0x00, - 0x00,0x00, - 0x00,0x00, - 0x60,0x00, - 0x70,0x00, - 0x78,0x00, - 0xfc,0x7f, - 0xfe,0x7f, - 0xff,0x7f, - 0xfe,0x7f, - 0xfc,0x7f, - 0x78,0x00, - 0x70,0x00, - 0x60,0x00, - 0x00,0x00, - 0x00,0x00}; + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 + 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 + 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 + 0x08,0x70,0x00, // 0000 0001 1110 0000 0000 0000 + 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 + 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 + 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 + 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 + 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 + 0xEF,0x70,0x00, // 0111 1111 1110 0000 0000 0000 + 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 + 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 + 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 + 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 + 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 + 0x08,0x70,0x00, // 0000 0001 1110 0000 0000 0000 + 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 + 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 + 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 From 8c3d6ba67c6aac85d04d64af9178f3d9427a822d Mon Sep 17 00:00:00 2001 From: mseidel Date: Tue, 16 Dec 2025 21:02:39 +0100 Subject: [PATCH 09/12] Corrected X11 cursor --- main/vcl/inc/unx/x11_cursors/tblselsw_mask.h | 46 ++++++++------------ 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h index aa93d0edfd6..b312151c7fd 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h @@ -19,33 +19,25 @@ * *************************************************************/ -#define tblselsw_mask_width 24 -#define tblselsw_mask_height 24 +#define tblselsw_mask_width 16 +#define tblselsw_mask_height 16 #define tblselsw_mask_x_hot 1 -#define tblselsw_mask_y_hot 11 +#define tblselsw_mask_y_hot 14 static const unsigned char tblselsw_mask_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 - 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 - 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 - 0x00,0x70,0x00, // 0000 0001 1110 0000 0000 0000 - 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 - 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 - 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 - 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 - 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 - 0xEF,0x70,0x00, // 0111 1111 1110 0000 0000 0000 - 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 - 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 - 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 - 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 - 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 - 0x00,0x70,0x00, // 0000 0001 1110 0000 0000 0000 - 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 - 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 - 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00, // 0000 0000 0000 0000 + 0x20,0x00, // 0100 0000 0000 0000 + 0x60,0x00, // 0110 0000 0000 0000 + 0xE0,0x00, // 0111 0000 0000 0000 + 0xE1,0x00, // 0111 1000 0000 0000 + 0xE3,0x00, // 0111 1100 0000 0000 + 0xE7,0x00, // 0111 1110 0000 0000 + 0xEF,0x00, // 0111 1111 0000 0000 + 0xEF,0x10, // 0111 1111 1000 0000 + 0xEF,0x30, // 0111 1111 1100 0000 + 0xEF,0x70, // 0111 1111 1110 0000 + 0xEF,0xF0, // 0111 1111 1111 0000 + 0xEF,0xF1, // 0111 1111 1111 1000 + 0xEF,0xF3, // 0111 1111 1111 1100 + 0xEF,0xF7, // 0111 1111 1111 1110 + 0x00,0x00}; // 0000 0000 0000 0000 From 02645d362beb3a39e14a9e0e28142c4cd7107d81 Mon Sep 17 00:00:00 2001 From: mseidel Date: Wed, 17 Dec 2025 22:25:53 +0100 Subject: [PATCH 10/12] Hopefully corrected X11 cursor --- main/vcl/inc/unx/x11_cursors/tblselse_curs.h | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h index dc0c2e249c4..fe36fc5f3ba 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h @@ -28,16 +28,16 @@ static const unsigned char tblselse_curs_bits[] = { 0x00,0x00, // 0000 0000 0000 0000 0x00,0x00, // 0000 0000 0000 0000 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x02, // 0000 0000 0000 0100 - 0x00,0x03, // 0000 0000 0000 1100 - 0x00,0x83, // 0000 0000 0001 1100 - 0x00,0xC3, // 0000 0000 0011 1100 - 0x00,0xE3, // 0000 0000 0111 1100 - 0x00,0xF3, // 0000 0000 1111 1100 - 0x08,0xF3, // 0000 0001 1111 1100 - 0x0C,0xF3, // 0000 0011 1111 1100 - 0x0E,0xF3, // 0000 0111 1111 1100 - 0x0F,0xF3, // 0000 1111 1111 1100 - 0x8F,0xF3, // 0001 1111 1111 1100 + 0x00,0x20, // 0000 0000 0000 0100 + 0x00,0x30, // 0000 0000 0000 1100 + 0x00,0x38, // 0000 0000 0001 1100 + 0x00,0x3C, // 0000 0000 0011 1100 + 0x00,0x3E, // 0000 0000 0111 1100 + 0x00,0x3F, // 0000 0000 1111 1100 + 0x08,0x3F, // 0000 0001 1111 1100 + 0xC0,0x3F, // 0000 0011 1111 1100 + 0xE0,0x3F, // 0000 0111 1111 1100 + 0xF0,0x3F, // 0000 1111 1111 1100 + 0xF8,0x3F, // 0001 1111 1111 1100 0x00,0x00, // 0000 0000 0000 0000 0x00,0x00}; // 0000 0000 0000 0000 From 98fa4abaeab68cd22cc8ecc883ca788ecd8363ed Mon Sep 17 00:00:00 2001 From: mseidel Date: Wed, 17 Dec 2025 22:52:20 +0100 Subject: [PATCH 11/12] Hopefully corrected X11 cursors --- main/vcl/inc/unx/x11_cursors/tblsels_curs.h | 16 +++++------ main/vcl/inc/unx/x11_cursors/tblsels_mask.h | 20 +++++++------- main/vcl/inc/unx/x11_cursors/tblselse_mask.h | 28 ++++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h index 28a71d304a6..224cac29714 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h @@ -39,13 +39,13 @@ static const unsigned char tblsels_curs_bits[] = { 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x0F,0xFF,0x70, // 0000 1111 1111 1111 1110 0000 - 0x0E,0xFF,0x30, // 0000 0111 1111 1111 1100 0000 - 0x0C,0xFF,0x10, // 0000 0011 1111 1111 1000 0000 - 0x08,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 - 0x00,0xF7,0x00, // 0000 0000 1111 1110 0000 0000 - 0x00,0xE3,0x00, // 0000 0000 0111 1100 0000 0000 - 0x00,0xC1,0x00, // 0000 0000 0011 1000 0000 0000 - 0x00,0x80,0x00, // 0000 0000 0001 0000 0000 0000 + 0xF0,0xFF,0x07, // 0000 1111 1111 1111 1110 0000 + 0xE0,0xFF,0x03, // 0000 0111 1111 1111 1100 0000 + 0xC0,0xFF,0x01, // 0000 0011 1111 1111 1000 0000 + 0x80,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 + 0x00,0x7F,0x00, // 0000 0000 1111 1110 0000 0000 + 0x00,0x3E,0x00, // 0000 0000 0111 1100 0000 0000 + 0x00,0x1C,0x00, // 0000 0000 0011 1000 0000 0000 + 0x00,0x08,0x00, // 0000 0000 0001 0000 0000 0000 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h index 05d23ce19c6..03f25718184 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h @@ -38,14 +38,14 @@ static const unsigned char tblsels_mask_bits[] = { 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0xCF,0xFF,0xF1, // 0011 1111 1111 1111 1111 1000 - 0x8F,0xFF,0xF0, // 0001 1111 1111 1111 1111 0000 - 0x0F,0xFF,0x70, // 0000 1111 1111 1111 1110 0000 - 0x0E,0xFF,0x30, // 0000 0111 1111 1111 1100 0000 - 0x0C,0xFF,0x10, // 0000 0011 1111 1111 1000 0000 - 0x08,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 - 0x00,0xF7,0x00, // 0000 0000 1111 1110 0000 0000 - 0x00,0xE3,0x00, // 0000 0000 0111 1100 0000 0000 - 0x00,0xC1,0x00, // 0000 0000 0011 1000 0000 0000 - 0x00,0x80,0x00, // 0000 0000 0001 0000 0000 0000 + 0xFC,0xFF,0x1F, // 0011 1111 1111 1111 1111 1000 + 0xF8,0xFF,0x0F, // 0001 1111 1111 1111 1111 0000 + 0xF0,0xFF,0x07, // 0000 1111 1111 1111 1110 0000 + 0xE0,0xFF,0x03, // 0000 0111 1111 1111 1100 0000 + 0xC0,0xFF,0x01, // 0000 0011 1111 1111 1000 0000 + 0x80,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 + 0x00,0x7F,0x00, // 0000 0000 1111 1110 0000 0000 + 0x00,0x3E,0x00, // 0000 0000 0111 1100 0000 0000 + 0x00,0x1C,0x00, // 0000 0000 0011 1000 0000 0000 + 0x00,0x08,0x00, // 0000 0000 0001 0000 0000 0000 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h index e859e7ab395..15e398a5afc 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h @@ -26,18 +26,18 @@ static const unsigned char tblselse_mask_bits[] = { 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x04, // 0000 0000 0000 0010 - 0x00,0x06, // 0000 0000 0000 0110 - 0x00,0x07, // 0000 0000 0000 1110 - 0x00,0x87, // 0000 0000 0001 1110 - 0x00,0xC7, // 0000 0000 0011 1110 - 0x00,0xE7, // 0000 0000 0111 1110 - 0x00,0xF7, // 0000 0000 1111 1110 - 0x08,0xF7, // 0000 0001 1111 1110 - 0x0C,0xF7, // 0000 0011 1111 1110 - 0x0E,0xF7, // 0000 0111 1111 1110 - 0x0F,0xF7, // 0000 1111 1111 1110 - 0x8F,0xF7, // 0001 1111 1111 1110 - 0xCF,0xF7, // 0011 1111 1111 1110 - 0xEF,0xF7, // 0111 1111 1111 1110 + 0x00,0x40, // 0000 0000 0000 0010 + 0x00,0x60, // 0000 0000 0000 0110 + 0x00,0x70, // 0000 0000 0000 1110 + 0x00,0x78, // 0000 0000 0001 1110 + 0x00,0x7C, // 0000 0000 0011 1110 + 0x00,0x7E, // 0000 0000 0111 1110 + 0x00,0x7F, // 0000 0000 1111 1110 + 0x80,0x7F, // 0000 0001 1111 1110 + 0xC0,0x7F, // 0000 0011 1111 1110 + 0xE0,0x7F, // 0000 0111 1111 1110 + 0xF0,0x7F, // 0000 1111 1111 1110 + 0xF8,0x7F, // 0001 1111 1111 1110 + 0xFC,0x7F, // 0011 1111 1111 1110 + 0xFE,0x7F, // 0111 1111 1111 1110 0x00,0x00}; // 0000 0000 0000 0000 From 86e3d0683722aae5bd73de8bff3ff0efc2888b4b Mon Sep 17 00:00:00 2001 From: mseidel Date: Thu, 18 Dec 2025 10:26:30 +0100 Subject: [PATCH 12/12] Corrected X11 cursors --- main/vcl/inc/unx/x11_cursors/tblsele_curs.h | 48 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblsele_mask.h | 48 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblsels_curs.h | 48 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblsels_mask.h | 48 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblselse_curs.h | 32 ++++++------- main/vcl/inc/unx/x11_cursors/tblselse_mask.h | 32 ++++++------- main/vcl/inc/unx/x11_cursors/tblselsw_curs.h | 32 ++++++------- main/vcl/inc/unx/x11_cursors/tblselsw_mask.h | 32 ++++++------- main/vcl/inc/unx/x11_cursors/tblselw_curs.h | 48 ++++++++++---------- main/vcl/inc/unx/x11_cursors/tblselw_mask.h | 48 ++++++++++---------- 10 files changed, 208 insertions(+), 208 deletions(-) diff --git a/main/vcl/inc/unx/x11_cursors/tblsele_curs.h b/main/vcl/inc/unx/x11_cursors/tblsele_curs.h index cb01e191b60..49f12b184f7 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsele_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsele_curs.h @@ -25,27 +25,27 @@ #define tblsele_curs_y_hot 11 static const unsigned char tblsele_curs_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x04,0x00, // 0000 0000 0000 0010 0000 0000 - 0x00,0x0C,0x00, // 0000 0000 0000 0011 0000 0000 - 0x00,0x0C,0x10, // 0000 0000 0000 0011 1000 0000 - 0x00,0x0C,0x30, // 0000 0000 0000 0011 1100 0000 - 0x00,0x0C,0x70, // 0000 0000 0000 0011 1110 0000 - 0x00,0x0C,0xF0, // 0000 0000 0000 0011 1111 0000 - 0x00,0x0C,0xF1, // 0000 0000 0000 0011 1111 1000 - 0x00,0x0C,0xF3, // 0000 0000 0000 0011 1111 1100 - 0x00,0x0C,0xF1, // 0000 0000 0000 0011 1111 1000 - 0x00,0x0C,0xF0, // 0000 0000 0000 0011 1111 0000 - 0x00,0x0C,0x70, // 0000 0000 0000 0011 1110 0000 - 0x00,0x0C,0x30, // 0000 0000 0000 0011 1100 0000 - 0x00,0x0C,0x10, // 0000 0000 0000 0011 1000 0000 - 0x00,0x0C,0x00, // 0000 0000 0000 0011 0000 0000 - 0x00,0x04,0x00, // 0000 0000 0000 0010 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x40,0x00, + 0x00,0xC0,0x00, + 0x00,0xC0,0x01, + 0x00,0xC0,0x03, + 0x00,0xC0,0x07, + 0x00,0xC0,0x0F, + 0x00,0xC0,0x1F, + 0x00,0xC0,0x3F, + 0x00,0xC0,0x1F, + 0x00,0xC0,0x0F, + 0x00,0xC0,0x07, + 0x00,0xC0,0x03, + 0x00,0xC0,0x01, + 0x00,0xC0,0x00, + 0x00,0x40,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblsele_mask.h b/main/vcl/inc/unx/x11_cursors/tblsele_mask.h index edb13d2151b..e9f9512e713 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsele_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsele_mask.h @@ -25,27 +25,27 @@ #define tblsele_mask_y_hot 11 static const unsigned char tblsele_mask_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x02,0x00, // 0000 0000 0000 0100 0000 0000 - 0x00,0x06,0x00, // 0000 0000 0000 0110 0000 0000 - 0x00,0x0E,0x00, // 0000 0000 0000 0111 0000 0000 - 0x00,0x0E,0x10, // 0000 0000 0000 0111 1000 0000 - 0x00,0x0E,0x30, // 0000 0000 0000 0111 1100 0000 - 0x00,0x0E,0x70, // 0000 0000 0000 0111 1110 0000 - 0x00,0x0E,0xF0, // 0000 0000 0000 0111 1111 0000 - 0x00,0x0E,0xF1, // 0000 0000 0000 0111 1111 1000 - 0x00,0x0E,0xF3, // 0000 0000 0000 0111 1111 1100 - 0x00,0x0E,0xF7, // 0000 0000 0000 0111 1111 1110 - 0x00,0x0E,0xF3, // 0000 0000 0000 0111 1111 1100 - 0x00,0x0E,0xF1, // 0000 0000 0000 0111 1111 1000 - 0x00,0x0E,0xF0, // 0000 0000 0000 0111 1111 0000 - 0x00,0x0E,0x70, // 0000 0000 0000 0111 1110 0000 - 0x00,0x0E,0x30, // 0000 0000 0000 0111 1100 0000 - 0x00,0x0E,0x10, // 0000 0000 0000 0111 1000 0000 - 0x00,0x0E,0x00, // 0000 0000 0000 0111 0000 0000 - 0x00,0x06,0x00, // 0000 0000 0000 0110 0000 0000 - 0x00,0x02,0x00, // 0000 0000 0000 0100 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x20,0x00, + 0x00,0x60,0x00, + 0x00,0xE0,0x00, + 0x00,0xE0,0x01, + 0x00,0xE0,0x03, + 0x00,0xE0,0x07, + 0x00,0xE0,0x0F, + 0x00,0xE0,0x1F, + 0x00,0xE0,0x3F, + 0x00,0xE0,0x7F, + 0x00,0xE0,0x3F, + 0x00,0xE0,0x1F, + 0x00,0xE0,0x0F, + 0x00,0xE0,0x07, + 0x00,0xE0,0x03, + 0x00,0xE0,0x01, + 0x00,0xE0,0x00, + 0x00,0x60,0x00, + 0x00,0x20,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h index 224cac29714..cdfbb5e4958 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_curs.h @@ -25,27 +25,27 @@ #define tblsels_curs_y_hot 22 static const unsigned char tblsels_curs_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0xF0,0xFF,0x07, // 0000 1111 1111 1111 1110 0000 - 0xE0,0xFF,0x03, // 0000 0111 1111 1111 1100 0000 - 0xC0,0xFF,0x01, // 0000 0011 1111 1111 1000 0000 - 0x80,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 - 0x00,0x7F,0x00, // 0000 0000 1111 1110 0000 0000 - 0x00,0x3E,0x00, // 0000 0000 0111 1100 0000 0000 - 0x00,0x1C,0x00, // 0000 0000 0011 1000 0000 0000 - 0x00,0x08,0x00, // 0000 0000 0001 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0xF0,0xFF,0x07, + 0xE0,0xFF,0x03, + 0xC0,0xFF,0x01, + 0x80,0xFF,0x00, + 0x00,0x7F,0x00, + 0x00,0x3E,0x00, + 0x00,0x1C,0x00, + 0x00,0x08,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h index 03f25718184..2f35ad9faec 100644 --- a/main/vcl/inc/unx/x11_cursors/tblsels_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblsels_mask.h @@ -25,27 +25,27 @@ #define tblsels_mask_y_hot 22 static const unsigned char tblsels_mask_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0xFC,0xFF,0x1F, // 0011 1111 1111 1111 1111 1000 - 0xF8,0xFF,0x0F, // 0001 1111 1111 1111 1111 0000 - 0xF0,0xFF,0x07, // 0000 1111 1111 1111 1110 0000 - 0xE0,0xFF,0x03, // 0000 0111 1111 1111 1100 0000 - 0xC0,0xFF,0x01, // 0000 0011 1111 1111 1000 0000 - 0x80,0xFF,0x00, // 0000 0001 1111 1111 0000 0000 - 0x00,0x7F,0x00, // 0000 0000 1111 1110 0000 0000 - 0x00,0x3E,0x00, // 0000 0000 0111 1100 0000 0000 - 0x00,0x1C,0x00, // 0000 0000 0011 1000 0000 0000 - 0x00,0x08,0x00, // 0000 0000 0001 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0xFC,0xFF,0x1F, + 0xF8,0xFF,0x0F, + 0xF0,0xFF,0x07, + 0xE0,0xFF,0x03, + 0xC0,0xFF,0x01, + 0x80,0xFF,0x00, + 0x00,0x7F,0x00, + 0x00,0x3E,0x00, + 0x00,0x1C,0x00, + 0x00,0x08,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h index fe36fc5f3ba..da41dab54cf 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_curs.h @@ -25,19 +25,19 @@ #define tblselse_curs_y_hot 14 static const unsigned char tblselse_curs_bits[] = { - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x20, // 0000 0000 0000 0100 - 0x00,0x30, // 0000 0000 0000 1100 - 0x00,0x38, // 0000 0000 0001 1100 - 0x00,0x3C, // 0000 0000 0011 1100 - 0x00,0x3E, // 0000 0000 0111 1100 - 0x00,0x3F, // 0000 0000 1111 1100 - 0x08,0x3F, // 0000 0001 1111 1100 - 0xC0,0x3F, // 0000 0011 1111 1100 - 0xE0,0x3F, // 0000 0111 1111 1100 - 0xF0,0x3F, // 0000 1111 1111 1100 - 0xF8,0x3F, // 0001 1111 1111 1100 - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x00}; // 0000 0000 0000 0000 + 0x00,0x00, + 0x00,0x00, + 0x00,0x00, + 0x00,0x20, + 0x00,0x30, + 0x00,0x38, + 0x00,0x3C, + 0x00,0x3E, + 0x00,0x3F, + 0x80,0x3F, + 0xC0,0x3F, + 0xE0,0x3F, + 0xF0,0x3F, + 0xF8,0x3F, + 0x00,0x00, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h index 15e398a5afc..394376a6d3a 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselse_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselse_mask.h @@ -25,19 +25,19 @@ #define tblselse_mask_y_hot 14 static const unsigned char tblselse_mask_bits[] = { - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x40, // 0000 0000 0000 0010 - 0x00,0x60, // 0000 0000 0000 0110 - 0x00,0x70, // 0000 0000 0000 1110 - 0x00,0x78, // 0000 0000 0001 1110 - 0x00,0x7C, // 0000 0000 0011 1110 - 0x00,0x7E, // 0000 0000 0111 1110 - 0x00,0x7F, // 0000 0000 1111 1110 - 0x80,0x7F, // 0000 0001 1111 1110 - 0xC0,0x7F, // 0000 0011 1111 1110 - 0xE0,0x7F, // 0000 0111 1111 1110 - 0xF0,0x7F, // 0000 1111 1111 1110 - 0xF8,0x7F, // 0001 1111 1111 1110 - 0xFC,0x7F, // 0011 1111 1111 1110 - 0xFE,0x7F, // 0111 1111 1111 1110 - 0x00,0x00}; // 0000 0000 0000 0000 + 0x00,0x00, + 0x00,0x40, + 0x00,0x60, + 0x00,0x70, + 0x00,0x78, + 0x00,0x7C, + 0x00,0x7E, + 0x00,0x7F, + 0x80,0x7F, + 0xC0,0x7F, + 0xE0,0x7F, + 0xF0,0x7F, + 0xF8,0x7F, + 0xFC,0x7F, + 0xFE,0x7F, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h b/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h index 377f3d1eb54..36256682ece 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h @@ -25,19 +25,19 @@ #define tblselsw_curs_y_hot 14 static const unsigned char tblselsw_curs_bits[] = { - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x00, // 0000 0000 0000 0000 - 0x40,0x00, // 0010 0000 0000 0000 - 0xC0,0x00, // 0011 0000 0000 0000 - 0xC1,0x00, // 0011 1000 0000 0000 - 0xC3,0x00, // 0011 1100 0000 0000 - 0xC7,0x00, // 0011 1110 0000 0000 - 0xCF,0x00, // 0011 1111 0000 0000 - 0xCF,0x10, // 0011 1111 1000 0000 - 0xCF,0x30, // 0011 1111 1100 0000 - 0xCF,0x70, // 0011 1111 1110 0000 - 0xCF,0xF0, // 0011 1111 1111 0000 - 0xCF,0xF1, // 0011 1111 1111 1000 - 0x00,0x00, // 0000 0000 0000 0000 - 0x00,0x00}; // 0000 0000 0000 0000 + 0x00,0x00, + 0x00,0x00, + 0x00,0x00, + 0x04,0x00, + 0x0C,0x00, + 0x1C,0x00, + 0x3C,0x00, + 0x7C,0x00, + 0xFC,0x00, + 0xFC,0x01, + 0xFC,0x03, + 0xFC,0x07, + 0xFC,0x0F, + 0xFC,0x1F, + 0x00,0x00, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h index b312151c7fd..24243452d53 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h @@ -25,19 +25,19 @@ #define tblselsw_mask_y_hot 14 static const unsigned char tblselsw_mask_bits[] = { - 0x00,0x00, // 0000 0000 0000 0000 - 0x20,0x00, // 0100 0000 0000 0000 - 0x60,0x00, // 0110 0000 0000 0000 - 0xE0,0x00, // 0111 0000 0000 0000 - 0xE1,0x00, // 0111 1000 0000 0000 - 0xE3,0x00, // 0111 1100 0000 0000 - 0xE7,0x00, // 0111 1110 0000 0000 - 0xEF,0x00, // 0111 1111 0000 0000 - 0xEF,0x10, // 0111 1111 1000 0000 - 0xEF,0x30, // 0111 1111 1100 0000 - 0xEF,0x70, // 0111 1111 1110 0000 - 0xEF,0xF0, // 0111 1111 1111 0000 - 0xEF,0xF1, // 0111 1111 1111 1000 - 0xEF,0xF3, // 0111 1111 1111 1100 - 0xEF,0xF7, // 0111 1111 1111 1110 - 0x00,0x00}; // 0000 0000 0000 0000 + 0x00,0x00, + 0x02,0x00, + 0x06,0x00, + 0x0E,0x00, + 0x1E,0x00, + 0x3E,0x00, + 0x7E,0x00, + 0xFE,0x00, + 0xFE,0x01, + 0xFE,0x03, + 0xFE,0x07, + 0xFE,0x0F, + 0xFE,0x1F, + 0xFE,0x3F, + 0xFE,0x7F, + 0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselw_curs.h b/main/vcl/inc/unx/x11_cursors/tblselw_curs.h index b7cde28f50b..3b2656c7fe9 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselw_curs.h +++ b/main/vcl/inc/unx/x11_cursors/tblselw_curs.h @@ -25,27 +25,27 @@ #define tblselw_curs_y_hot 11 static const unsigned char tblselw_curs_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x20,0x00, // 0000 0000 0100 0000 0000 0000 - 0x00,0x30,0x00, // 0000 0000 1100 0000 0000 0000 - 0x08,0x30,0x00, // 0000 0001 1100 0000 0000 0000 - 0x0C,0x30,0x00, // 0000 0011 1100 0000 0000 0000 - 0x0E,0x30,0x00, // 0000 0111 1100 0000 0000 0000 - 0x0F,0x30,0x00, // 0000 1111 1100 0000 0000 0000 - 0x8F,0x30,0x00, // 0001 1111 1100 0000 0000 0000 - 0xCF,0x30,0x00, // 0011 1111 1100 0000 0000 0000 - 0x8F,0x30,0x00, // 0001 1111 1100 0000 0000 0000 - 0x0F,0x30,0x00, // 0000 1111 1100 0000 0000 0000 - 0x0E,0x30,0x00, // 0000 0111 1100 0000 0000 0000 - 0x0C,0x30,0x00, // 0000 0011 1100 0000 0000 0000 - 0x08,0x30,0x00, // 0000 0001 1100 0000 0000 0000 - 0x00,0x30,0x00, // 0000 0000 1100 0000 0000 0000 - 0x00,0x20,0x00, // 0000 0000 0100 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x02,0x00, + 0x00,0x03,0x00, + 0x80,0x03,0x00, + 0xC0,0x03,0x00, + 0xE0,0x03,0x00, + 0xF0,0x03,0x00, + 0xF8,0x03,0x00, + 0xFC,0x03,0x00, + 0xF8,0x03,0x00, + 0xF0,0x03,0x00, + 0xE0,0x03,0x00, + 0xC0,0x03,0x00, + 0x80,0x03,0x00, + 0x00,0x03,0x00, + 0x00,0x02,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00}; diff --git a/main/vcl/inc/unx/x11_cursors/tblselw_mask.h b/main/vcl/inc/unx/x11_cursors/tblselw_mask.h index 5be884c700c..583ac3e3193 100644 --- a/main/vcl/inc/unx/x11_cursors/tblselw_mask.h +++ b/main/vcl/inc/unx/x11_cursors/tblselw_mask.h @@ -25,27 +25,27 @@ #define tblselw_mask_y_hot 11 static const unsigned char tblselw_mask_bits[] = { - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 - 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 - 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 - 0x08,0x70,0x00, // 0000 0001 1110 0000 0000 0000 - 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 - 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 - 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 - 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 - 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 - 0xEF,0x70,0x00, // 0111 1111 1110 0000 0000 0000 - 0xCF,0x70,0x00, // 0011 1111 1110 0000 0000 0000 - 0x8F,0x70,0x00, // 0001 1111 1110 0000 0000 0000 - 0x0F,0x70,0x00, // 0000 1111 1110 0000 0000 0000 - 0x0E,0x70,0x00, // 0000 0111 1110 0000 0000 0000 - 0x0C,0x70,0x00, // 0000 0011 1110 0000 0000 0000 - 0x08,0x70,0x00, // 0000 0001 1110 0000 0000 0000 - 0x00,0x70,0x00, // 0000 0000 1110 0000 0000 0000 - 0x00,0x60,0x00, // 0000 0000 0110 0000 0000 0000 - 0x00,0x40,0x00, // 0000 0000 0010 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00, // 0000 0000 0000 0000 0000 0000 - 0x00,0x00,0x00}; // 0000 0000 0000 0000 0000 0000 + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x04,0x00, + 0x00,0x06,0x00, + 0x00,0x07,0x00, + 0x80,0x07,0x00, + 0xC0,0x07,0x00, + 0xE0,0x07,0x00, + 0xF0,0x07,0x00, + 0xF8,0x07,0x00, + 0xFC,0x07,0x00, + 0xFE,0x07,0x00, + 0xFC,0x07,0x00, + 0xF8,0x07,0x00, + 0xF0,0x07,0x00, + 0xE0,0x07,0x00, + 0xC0,0x07,0x00, + 0x80,0x07,0x00, + 0x00,0x07,0x00, + 0x00,0x06,0x00, + 0x00,0x04,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00, + 0x00,0x00,0x00};