From 364bb57e766ce59a1ab1b1bb85a9257df69d127c Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Mon, 24 Feb 2003 15:44:37 +0000 Subject: [PATCH] Updated sources to reflect changes in git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2832 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Application.cpp | 16 ++++++++-------- src/kits/app/Cursor.cpp | 2 +- src/kits/interface/Window.cpp | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp index dd582ba4b6..8d3a2259b2 100644 --- a/src/kits/app/Application.cpp +++ b/src/kits/app/Application.cpp @@ -372,20 +372,20 @@ void BApplication::ShowCursor() { // Because we're just sending an opcode, we can skip the PortLink and simply // call write_port top the server communications port. - write_port(fServerTo,SHOW_CURSOR,NULL,0); + write_port(fServerTo,AS_SHOW_CURSOR,NULL,0); } //------------------------------------------------------------------------------ void BApplication::HideCursor() { // Because we're just sending an opcode, we can skip the PortLink and simply // call write_port top the server communications port. - write_port(fServerTo,HIDE_CURSOR,NULL,0); + write_port(fServerTo,AS_HIDE_CURSOR,NULL,0); } //------------------------------------------------------------------------------ void BApplication::ObscureCursor() { PortLink *link=new PortLink(fServerTo); - link->SetOpCode(OBSCURE_CURSOR); + link->SetOpCode(AS_OBSCURE_CURSOR); link->Flush(); delete link; } @@ -395,7 +395,7 @@ bool BApplication::IsCursorHidden() const PortLink::ReplyData data; PortLink *link=new PortLink(fServerTo); - link->SetOpCode(QUERY_CURSOR_HIDDEN); + link->SetOpCode(AS_QUERY_CURSOR_HIDDEN); link->FlushWithReply(&data); delete link; @@ -415,7 +415,7 @@ void BApplication::SetCursor(const BCursor* cursor, bool sync) { // TODO: add sync support - working on updating FlushWithReply --DW PortLink *link=new PortLink(fServerTo); - link->SetOpCode(SET_CURSOR_BCURSOR); + link->SetOpCode(AS_SET_CURSOR_BCURSOR); link->Attach(sync); link->Attach(cursor->m_serverToken); link->Flush(); @@ -757,7 +757,7 @@ void BApplication::InitData(const char* signature, status_t* error) void BApplication::BeginRectTracking(BRect r, bool trackWhole) { PortLink *link=new PortLink(fServerTo); - link->SetOpCode(BEGIN_RECT_TRACKING); + link->SetOpCode(AS_BEGIN_RECT_TRACKING); link->Attach(r); link->Attach(trackWhole); link->Flush(); @@ -768,7 +768,7 @@ void BApplication::EndRectTracking() { // Because we're just sending an opcode, we can skip the PortLink and simply // call write_port top the server communications port. - write_port(fServerTo,END_RECT_TRACKING,NULL,0); + write_port(fServerTo,AS_END_RECT_TRACKING,NULL,0); } //------------------------------------------------------------------------------ void BApplication::get_scs() @@ -802,7 +802,7 @@ void BApplication::connect_to_app_server() // 3) attach application's "inbox" port // 4) attach length of signature // 5) attach signature - // 6) set opcode to CREATE_APP, Flush(), and wait for reply + // 6) set opcode to AS_CREATE_APP, Flush(), and wait for reply // 7) receive from the server the message with the buffer being a port_id *. // 8) set fServerTo to the value of the returned port_id } diff --git a/src/kits/app/Cursor.cpp b/src/kits/app/Cursor.cpp index dcf09f248e..e20c6502cc 100644 --- a/src/kits/app/Cursor.cpp +++ b/src/kits/app/Cursor.cpp @@ -68,7 +68,7 @@ BCursor::BCursor(const void *cursorData) // Send data directly to server BPrivate::BAppServerLink *serverlink = new BPrivate::BAppServerLink; serverlink->Init(); - serverlink->portlink->SetOpCode(SET_CURSOR_BCURSOR); + serverlink->portlink->SetOpCode(AS_SET_CURSOR_BCURSOR); serverlink->portlink->Attach((void *)cursorData,68); //Rumor has it that this API will be cleaned up later diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index fdd6a57c1d..eefbbf270f 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -67,7 +67,7 @@ BWindow::BWindow(BRect frame, // Notify app that we exist BWindow *win=this; PortLink *link=new PortLink(be_app->fServerFrom); - link->SetOpCode(CREATE_WINDOW); + link->SetOpCode(AS_CREATE_WINDOW); link->Attach(&win,sizeof(BWindow*)); link->Flush(); delete link; @@ -86,7 +86,7 @@ BWindow::BWindow(BRect frame, if(be_app->fServerTo!=B_NAME_NOT_FOUND) { // Notify server of window's existence - link->SetOpCode(CREATE_WINDOW); + link->SetOpCode(AS_CREATE_WINDOW); link->Attach(fFrame); link->Attach((int32)fLook); link->Attach((int32)fFeel); @@ -147,7 +147,7 @@ BWindow::BWindow(BRect frame, // Notify app that we exist BWindow *win=this; PortLink *link=new PortLink(be_app->fServerFrom); - link->SetOpCode(CREATE_WINDOW); + link->SetOpCode(AS_CREATE_WINDOW); link->Attach(&win,sizeof(BWindow*)); link->Flush(); delete link; @@ -166,7 +166,7 @@ BWindow::BWindow(BRect frame, if(be_app->fServerTo!=B_NAME_NOT_FOUND) { // Notify server of window's existence - link->SetOpCode(CREATE_WINDOW); + link->SetOpCode(AS_CREATE_WINDOW); link->Attach(fFrame); link->Attach((int32)fLook); link->Attach((int32)fFeel); @@ -221,13 +221,13 @@ BWindow::Quit() // I hope this works. If it doesn't, we'll need to do a synchronous msg BWindow *win=this; PortLink *link=new PortLink(be_app->fServerFrom); - link->SetOpCode(DELETE_WINDOW); + link->SetOpCode(AS_DELETE_WINDOW); link->Attach(&win,sizeof(BWindow *)); link->Flush(); delete link; // Server will need to be notified of window destruction PortLink *serverlink=new PortLink(be_app->fServerTo); - serverlink->SetOpCode(DELETE_WINDOW); + serverlink->SetOpCode(AS_DELETE_WINDOW); // serverlink->Attach(&ID,sizeof(int32)); XXX What is ID??? /* MAYBE */ serverlink->Attach(&win,sizeof(BWindow *)); serverlink->Flush(); @@ -593,7 +593,7 @@ BWindow::Show() { // Notify App_server that it should show the window PortLink *serverlink= new PortLink(be_app->fServerTo); - serverlink->SetOpCode(SHOW_WINDOW); + serverlink->SetOpCode(AS_SHOW_WINDOW); serverlink->Flush(); delete serverlink; } @@ -608,7 +608,7 @@ BWindow::Hide() { // Notify App_server that it should hide this window PortLink *serverlink= new PortLink(be_app->fServerTo); - serverlink->SetOpCode(HIDE_WINDOW); + serverlink->SetOpCode(AS_HIDE_WINDOW); serverlink->Flush(); delete serverlink; } @@ -643,7 +643,7 @@ BWindow::Sync() const ssize_t buffersize; PortLink *drawmsglink=new PortLink(be_app->fServerFrom); - drawmsglink->SetOpCode(GFX_SYNC); + drawmsglink->SetOpCode(AS_SYNC); // Reply received: // Code: SYNC