From 39cdc1263707040f00a53d28ca93fd7b68b63e55 Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Thu, 2 Oct 2003 01:02:10 +0000 Subject: [PATCH] Conversion to BSession API git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4924 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Globals.cpp | 113 ++++++++++++++------------------- src/kits/interface/Picture.cpp | 104 ++++++++++++++---------------- 2 files changed, 94 insertions(+), 123 deletions(-) diff --git a/src/kits/interface/Globals.cpp b/src/kits/interface/Globals.cpp index ff55e79f96..f1bec0e103 100644 --- a/src/kits/interface/Globals.cpp +++ b/src/kits/interface/Globals.cpp @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include #include @@ -54,11 +52,11 @@ _IMPEXP_BE status_t set_screen_space(int32 index, uint32 res, bool stick) { BAppServerLink link; - link.SetOpCode(AS_SET_SCREEN_MODE); - link.Attach(index); - link.Attach((int32)res); - link.Attach(stick); - link.Flush(); + link.WriteInt32(AS_SET_SCREEN_MODE); + link.WriteInt32(index); + link.WriteInt32((int32)res); + link.WriteBool(stick); + link.Sync(); //TODO: Read back the status from the app_server's reply return B_OK; @@ -68,14 +66,14 @@ set_screen_space(int32 index, uint32 res, bool stick) _IMPEXP_BE status_t set_scroll_bar_info(scroll_bar_info *info) { - BAppServerLink link; - PortMessage msg; - link.SetOpCode(AS_SET_SCROLLBAR_INFO); - link.Attach(info, sizeof(scroll_bar_info)); - link.FlushWithReply(&msg); + if(!info) + return B_ERROR; - //TODO: Read back the status from the app_server's reply - msg.Read(info,sizeof(scroll_bar_info)); + BAppServerLink link; + link.WriteInt32(AS_SET_SCROLLBAR_INFO); + link.WriteData(info, sizeof(scroll_bar_info)); + link.Sync(); + link.ReadData(info,sizeof(scroll_bar_info)); return B_OK; } @@ -251,15 +249,12 @@ keyboard_navigation_color() _IMPEXP_BE int32 count_workspaces() { - PortLink::ReplyData replydata; int32 count; BAppServerLink link; - link.SetOpCode(AS_COUNT_WORKSPACES); - link.FlushWithReply(&replydata); - - count=*((int32*)replydata.buffer); - + link.WriteInt32(AS_COUNT_WORKSPACES); + link.Sync(); + link.ReadInt32(&count); return count; } @@ -268,24 +263,21 @@ _IMPEXP_BE void set_workspace_count(int32 count) { BAppServerLink link; - link.SetOpCode(AS_SET_WORKSPACE_COUNT); - link.Attach(count); - link.Flush(); - + link.WriteInt32(AS_SET_WORKSPACE_COUNT); + link.WriteInt32(count); + link.Sync(); } _IMPEXP_BE int32 current_workspace() { - PortLink::ReplyData replydata; int32 index; BAppServerLink link; - link.SetOpCode(AS_CURRENT_WORKSPACE); - link.FlushWithReply(&replydata); - - index=*((int32*)replydata.buffer); + link.WriteInt32(AS_CURRENT_WORKSPACE); + link.Sync(); + link.ReadInt32(&index); return index; } @@ -295,23 +287,21 @@ _IMPEXP_BE void activate_workspace(int32 workspace) { BAppServerLink link; - link.SetOpCode(AS_ACTIVATE_WORKSPACE); - link.Attach(workspace); - link.Flush(); + link.WriteInt32(AS_ACTIVATE_WORKSPACE); + link.WriteInt32(workspace); + link.Sync(); } _IMPEXP_BE bigtime_t idle_time() { - PortLink::ReplyData replydata; bigtime_t idletime; BAppServerLink link; - link.SetOpCode(AS_IDLE_TIME); - link.FlushWithReply(&replydata); - - idletime=*((bigtime_t*)replydata.buffer); + link.WriteInt32(AS_IDLE_TIME); + link.Sync(); + link.ReadInt64(&idletime); return idletime; } @@ -346,24 +336,21 @@ _IMPEXP_BE void set_focus_follows_mouse(bool follow) { BAppServerLink link; - link.SetOpCode(AS_SET_FOCUS_FOLLOWS_MOUSE); - link.Attach(follow); - link.Flush(); + link.WriteInt32(AS_SET_FOCUS_FOLLOWS_MOUSE); + link.WriteBool(follow); + link.Sync(); } _IMPEXP_BE bool focus_follows_mouse() { - PortMessage pmsg; + bool ffm; BAppServerLink link; - link.SetOpCode(AS_FOCUS_FOLLOWS_MOUSE); - link.FlushWithReply(&pmsg); - - bool ffm; - pmsg.Read(&ffm); - + link.WriteInt32(AS_FOCUS_FOLLOWS_MOUSE); + link.Sync(); + link.ReadBool(&ffm); return ffm; } @@ -372,24 +359,21 @@ _IMPEXP_BE void set_mouse_mode(mode_mouse mode) { BAppServerLink link; - link.SetOpCode(AS_SET_MOUSE_MODE); - link.Attach(&mode,sizeof(mode_mouse)); - link.Flush(); + link.WriteInt32(AS_SET_MOUSE_MODE); + link.WriteData(&mode,sizeof(mode_mouse)); + link.Sync(); } _IMPEXP_BE mode_mouse mouse_mode() { - PortLink::ReplyData replydata; mode_mouse mode; BAppServerLink link; - link.SetOpCode(AS_GET_MOUSE_MODE); - link.FlushWithReply(&replydata); - - mode=*((mode_mouse*)replydata.buffer); - + link.WriteInt32(AS_GET_MOUSE_MODE); + link.Sync(); + link.ReadData(&mode,sizeof(mode_mouse)); return mode; } @@ -397,16 +381,13 @@ mouse_mode() _IMPEXP_BE rgb_color ui_color(color_which which) { - PortLink::ReplyData replydata; rgb_color color; BAppServerLink link; - link.SetOpCode(AS_GET_UI_COLOR); - link.Attach(&which, sizeof(which)); - link.FlushWithReply(&replydata); - - color=*((rgb_color*)replydata.buffer); - + link.WriteInt32(AS_GET_UI_COLOR); + link.WriteData(&which, sizeof(which)); + link.Sync(); + link.ReadData(&color,sizeof(rgb_color)); return color; } @@ -467,7 +448,7 @@ bitmaps_support_space(color_space space, uint32 * support_flags) void __set_window_decor(int32 theme) { BAppServerLink link; - link.SetOpCode(AS_R5_SET_DECORATOR); - link.Attach(theme); - link.Flush(); + link.WriteInt32(AS_R5_SET_DECORATOR); + link.WriteInt32(theme); + link.Sync(); } diff --git a/src/kits/interface/Picture.cpp b/src/kits/interface/Picture.cpp index df3b0a302b..9453d6c38d 100644 --- a/src/kits/interface/Picture.cpp +++ b/src/kits/interface/Picture.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include // Project Includes ------------------------------------------------------------ @@ -85,12 +84,11 @@ BPicture::BPicture(const BPicture &picture) { BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; - link.SetOpCode(AS_CLONE_PICTURE); - link.Attach(picture.token); - link.FlushWithReply(&replydata); - token=*((int32*)replydata.buffer); + link.WriteInt32(AS_CLONE_PICTURE); + link.WriteInt32(picture.token); + link.Sync(); + link.ReadInt32(&token); } if (picture.extent->fNewData != NULL) @@ -160,21 +158,20 @@ BPicture::BPicture(BMessage *archive) if (extent->fNewSize != 0 && extent->fNewData != 0) { BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; BPicture *pic; - link.SetOpCode(AS_CREATE_PICTURE); - link.Attach(extent->fPictures.CountItems()); + link.WriteInt32(AS_CREATE_PICTURE); + link.WriteInt32(extent->fPictures.CountItems()); for (int32 i = 0; i < extent->fPictures.CountItems(); i++) { pic=(BPicture*)extent->fPictures.ItemAt(i); if(pic) - link.Attach(pic->token); + link.WriteInt32(pic->token); } - link.Attach(extent->fNewSize); - link.Attach(extent->fNewData,extent->fNewSize); - link.FlushWithReply(&replydata); - token=*((int32*)replydata.buffer); + link.WriteInt32(extent->fNewSize); + link.WriteData(extent->fNewData,extent->fNewSize); + link.Sync(); + link.ReadInt32(&token); } } @@ -205,9 +202,9 @@ BPicture::~BPicture() { BPrivate::BAppServerLink link; - link.SetOpCode(AS_DELETE_PICTURE); - link.Attach(token); - link.Flush(); + link.WriteInt32(AS_DELETE_PICTURE); + link.WriteInt32(token); + link.Sync(); } if (extent->fNewData != NULL) @@ -341,21 +338,20 @@ status_t BPicture::Unflatten(BDataIO *stream) // swap_data(extent->fNewData, extent->fNewSize); BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; BPicture *pic; - link.SetOpCode(AS_CREATE_PICTURE); - link.Attach(extent->fPictures.CountItems()); + link.WriteInt32(AS_CREATE_PICTURE); + link.WriteInt32(extent->fPictures.CountItems()); for (int32 i = 0; i < extent->fPictures.CountItems(); i++) { pic=(BPicture*)extent->fPictures.ItemAt(i); if(pic) - link.Attach(pic->token); + link.WriteInt32(pic->token); } - link.Attach(extent->fNewSize); - link.Attach(extent->fNewData, extent->fNewSize); - link.FlushWithReply(&replydata); - token=*((int32*)replydata.buffer); + link.WriteInt32(extent->fNewSize); + link.WriteData(extent->fNewData, extent->fNewSize); + link.Sync(); + link.ReadInt32(&token); if (extent->fNewData) { @@ -395,18 +391,17 @@ void BPicture::import_data(const void *data, int32 size, BPicture **subs, return; BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; - link.SetOpCode(AS_CREATE_PICTURE); - link.Attach(subCount); + link.WriteInt32(AS_CREATE_PICTURE); + link.WriteInt32(subCount); for (int32 i = 0; i < subCount; i++) - link.Attach(subs[i]->token); + link.WriteInt32(subs[i]->token); - link.Attach(size); - link.Attach(data, size); - link.FlushWithReply(&replydata); - token=*((int32*)replydata.buffer); + link.WriteInt32(size); + link.WriteData(data, size); + link.Sync(); + link.ReadInt32(&token); } //------------------------------------------------------------------------------ void BPicture::import_old_data(const void *data, int32 size) @@ -421,14 +416,12 @@ void BPicture::import_old_data(const void *data, int32 size) convert_old_to_new(data, size, &extent->fNewData, &extent->fNewSize); BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; - - link.SetOpCode(AS_CREATE_PICTURE); - link.Attach(0L); - link.Attach(extent->fNewSize); - link.Attach(extent->fNewData,extent->fNewSize); - link.FlushWithReply(&replydata); - token=*((int32*)replydata.buffer); + link.WriteInt32(AS_CREATE_PICTURE); + link.WriteInt32(0L); + link.WriteInt32(extent->fNewSize); + link.WriteData(extent->fNewData,extent->fNewSize); + link.Sync(); + link.ReadInt32(&token) // Do we free all data now? free(extent->fNewData); @@ -453,12 +446,11 @@ bool BPicture::assert_local_copy() return false; /* BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; int32 count; - link.SetOpCode(AS_DOWNLOAD_PICTURE); - link.Attach(token); - link.FlushWithReply(&replydata); + link.WriteInt32(AS_DOWNLOAD_PICTURE); + link.WriteInt32(token); + link.Sync(); count=*((int32*)replydata.buffer); // Read sub picture tokens @@ -504,16 +496,14 @@ bool BPicture::assert_server_copy() extent->fPictures.ItemAt(i)->assert_server_copy(); BPrivate::BAppServerLink link; - PortLink::ReplyData replydata; - - link.SetOpCode(AS_CREATE_PICTURE); - link.Attach(extent->fPictures.CountItems()); + link.WriteInt32(AS_CREATE_PICTURE); + link.WriteInt32(extent->fPictures.CountItems()); for (int32 i = 0; i < extent->fPictures.CountItems(); i++) - link.Attach(extent->fPictures.ItemAt(i)->token); - link.Attach(extent->fNewSize); - link.Attach(extent->fNewData,extent->fNewSize); - link.FlushWithReply(&replydata); - token=*((int32*)replydata.buffer); + link.WriteInt32(extent->fPictures.ItemAt(i)->token); + link.WriteInt32(extent->fNewSize); + link.WriteData(extent->fNewData,extent->fNewSize); + link.Sync(); + link.ReadInt32(&token); return token != -1;*/ return true; @@ -553,9 +543,9 @@ void BPicture::usurp(BPicture *lameDuck) { BPrivate::BAppServerLink link; - link.SetOpCode(AS_DELETE_PICTURE); - link.Attach(token); - link.Flush(); + link.WriteInt32(AS_DELETE_PICTURE); + link.WriteInt32(token); + link.Sync(); } if (extent->fNewData != NULL)