27 |
|
#include <libraries/asl.h> |
28 |
|
#include <libraries/gtlayout.h> |
29 |
|
#include <libraries/Picasso96.h> |
30 |
+ |
#include <cybergraphx/cybergraphics.h> |
31 |
|
#include <graphics/displayinfo.h> |
32 |
|
#include <devices/ahi.h> |
33 |
|
#include <proto/exec.h> |
38 |
|
#include <proto/graphics.h> |
39 |
|
#include <proto/asl.h> |
40 |
|
#include <proto/Picasso96.h> |
41 |
+ |
#include <proto/cybergraphics.h> |
42 |
|
#include <proto/ahi.h> |
43 |
|
|
44 |
|
#include "sysdeps.h" |
513 |
|
FreeAslRequest(dev_request); |
514 |
|
FreeAslRequest(file_request); |
515 |
|
|
516 |
+ |
// Delete menus |
517 |
+ |
LT_DisposeMenu(menu); |
518 |
+ |
|
519 |
|
// Delete handle |
520 |
|
LT_DeleteHandle(h); |
521 |
|
|
876 |
|
} |
877 |
|
} while (!done); |
878 |
|
|
874 |
– |
// Delete handle |
875 |
– |
LT_DeleteHandle(h); |
876 |
– |
|
879 |
|
// Update preferences and list view |
880 |
|
if (ok_clicked) { |
881 |
|
char str[256]; |
913 |
|
LT_SetAttributes(h2, GAD_DISK_LIST, GTLV_Labels, (ULONG)&disk_list, TAG_END); |
914 |
|
ghost_volumes_gadgets(h2); |
915 |
|
} |
916 |
+ |
|
917 |
+ |
// Delete handle |
918 |
+ |
LT_DeleteHandle(h); |
919 |
|
} |
920 |
|
|
921 |
|
// Remove volume from list |
1244 |
|
// Show screen mode requester |
1245 |
|
static void screen_mode_req(struct Window *win, struct LayoutHandle *h) |
1246 |
|
{ |
1247 |
< |
if (P96Base == NULL) |
1247 |
> |
if (P96Base == NULL && CyberGfxBase == NULL) |
1248 |
|
return; |
1249 |
|
|
1250 |
|
LT_LockWindow(win); |
1251 |
< |
ULONG id = p96RequestModeIDTags( |
1252 |
< |
P96MA_MinDepth, 8, |
1253 |
< |
P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8, |
1254 |
< |
TAG_END |
1255 |
< |
); |
1251 |
> |
|
1252 |
> |
ULONG id; |
1253 |
> |
|
1254 |
> |
if (P96Base) { |
1255 |
> |
id = p96RequestModeIDTags( |
1256 |
> |
P96MA_MinDepth, 8, |
1257 |
> |
P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8, |
1258 |
> |
TAG_END |
1259 |
> |
); |
1260 |
> |
} else { |
1261 |
> |
UWORD model_array[] = {PIXFMT_LUT8, PIXFMT_RGB16, PIXFMT_ARGB32, 0, ~0}; |
1262 |
> |
id = (ULONG) CModeRequestTags(NULL, |
1263 |
> |
CYBRMREQ_MinDepth, 8, |
1264 |
> |
CYBRMREQ_CModelArray, (ULONG)model_array, |
1265 |
> |
TAG_END |
1266 |
> |
); |
1267 |
> |
} |
1268 |
|
LT_UnlockWindow(win); |
1269 |
|
|
1270 |
|
if (id != INVALID_ID) { |