|
11 | 11 | {$ifdef FPC}{$mode objfpc}{$h+}{$goto on}{$endif} |
12 | 12 | interface |
13 | 13 | uses |
14 | | - {$ifdef use_xcb}mxcb{$else}mxlib{$endif},mxft, |
| 14 | + mxlib,mxft, |
15 | 15 | {$ifdef FPC}dynlibs,{$endif} |
16 | 16 | msegraphics,mseguiglob,msestrings,msegraphutils,mseguiintf,msetypes, |
17 | 17 | msectypes,msefontconfig,msetriaglob; |
@@ -143,7 +143,6 @@ x11fontdataty = record |
143 | 143 | XftDrawSrcPicture: function(draw: pXftDraw; color: pXftColor): tpicture; cdecl; |
144 | 144 | {$endif} |
145 | 145 |
|
146 | | -{$ifndef use_xcb} |
147 | 146 | var |
148 | 147 | XRenderSetPictureClipRectangles: procedure(dpy:PDisplay; picture:TPicture; |
149 | 148 | xOrigin:longint; yOrigin:longint; rects:PXRectangle; n:longint); |
@@ -196,8 +195,6 @@ x11fontdataty = record |
196 | 195 | XRenderChangePicture: procedure(dpy: pdisplay; picture: tpicture; |
197 | 196 | valuemask: culong; attributes: PXRenderPictureAttributes); cdecl; |
198 | 197 |
|
199 | | -{$endif} |
200 | | - |
201 | 198 | implementation |
202 | 199 | uses |
203 | 200 | msesys,msesonames,sysutils,msefcfontselect,msedynload, |
@@ -400,17 +397,9 @@ procedure init(const adisp: pdisplay; const avisual: msepvisual; |
400 | 397 | argbrenderpictformat:= xrenderfindstandardformat(appdisp,pictstandardargb32); |
401 | 398 | end; |
402 | 399 |
|
403 | | - {$ifdef use_xcb} |
404 | | - noxft := true; |
405 | | - {$endif} |
406 | 400 | if not noxft then begin |
407 | | - {$ifndef use_xcb} |
408 | 401 | fhasxft:= fhasxft and xftdefaulthasrender(appdisp) and (xftgetversion() >= 20000); |
409 | | - {$else} |
410 | | - fhasxft := true; |
411 | | - {$endif} |
412 | | - |
413 | | - if fhasxft then begin |
| 402 | + if fhasxft then begin |
414 | 403 | fhasxft:= xftinit(nil); |
415 | 404 | if fhasxft then begin |
416 | 405 | fhasxft:= xftinitftlibrary(); |
@@ -3233,7 +3222,6 @@ function getxftlib: boolean; |
3233 | 3222 | result:= true; |
3234 | 3223 | end; |
3235 | 3224 |
|
3236 | | -{$ifndef use_xcb} |
3237 | 3225 | function getxrenderlib: boolean; |
3238 | 3226 | const |
3239 | 3227 | funcs: array[0..14] of funcinfoty = ( |
@@ -3288,16 +3276,6 @@ function getxrenderlib: boolean; |
3288 | 3276 | end; |
3289 | 3277 | end; |
3290 | 3278 |
|
3291 | | -{$else} |
3292 | | - |
3293 | | -function getxrenderlib: boolean; |
3294 | | -begin |
3295 | | - createcolorpic:= @createcolorpic2; |
3296 | | - result := true; |
3297 | | -end; |
3298 | | - |
3299 | | -{$endif} |
3300 | | - |
3301 | 3279 | const |
3302 | 3280 | gdifunctions: gdifunctionaty = ( |
3303 | 3281 | {$ifdef FPC}@{$endif}gdi_creategc, |
|
0 commit comments