Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support to field calls for FFM functions and scroll_bar_info calls

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3937 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2003-07-10 17:48:04 +00:00
parent 642c6c32e4
commit cab59b7cf3
3 changed files with 133 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/servers/app/server/Desktop.cpp
View File

@ -63,7 +63,8 @@ namespace desktop_private {
Screen *activescreen=NULL; Screen *activescreen=NULL;
scroll_bar_info scrollbarinfo; scroll_bar_info scrollbarinfo;
menu_info menuinfo; menu_info menuinfo;
int16 ffm; mode_mouse ffm_mode;
bool ffm;
} }
//! locks layer access //! locks layer access
@ -650,12 +651,12 @@ void SetMenuInfo(const menu_info &info)
} }
/*! /*!
\brief Thread-safe way of obtaining the current focus-follows-mouse behavior \brief See if the the system is in focus-follows-mouse mode
\return Current menu behavior data \return True if enabled, false if disabled
*/ */
int16 GetFFMouse(void) bool GetFFMouse(void)
{ {
int16 value; bool value;
desktop_private::optlock.Lock(); desktop_private::optlock.Lock();
value=desktop_private::ffm; value=desktop_private::ffm;
desktop_private::optlock.Unlock(); desktop_private::optlock.Unlock();
@ -663,16 +664,40 @@ int16 GetFFMouse(void)
} }
/*! /*!
\brief Thread-safe way of setting the current focus-follows-mouse behavior \brief Enable or disable focus-follows-mouse for system
\param info Behavior data structure \param info Enable/Disable flag
*/ */
void SetFFMouse(const int16 &value) void SetFFMouse(const bool &value)
{ {
desktop_private::optlock.Lock(); desktop_private::optlock.Lock();
desktop_private::ffm=value; desktop_private::ffm=value;
desktop_private::optlock.Unlock(); desktop_private::optlock.Unlock();
} }
/*!
\brief Obtain the current focus-follows-mouse behavior
\return Current menu behavior data
*/
mode_mouse GetFFMouseMode(void)
{
mode_mouse value;
desktop_private::optlock.Lock();
value=desktop_private::ffm_mode;
desktop_private::optlock.Unlock();
return value;
}
/*!
\brief Set the focus-follows-mouse behavior
\param info Behavior data structure
*/
void SetFFMouseMode(const mode_mouse &value)
{
desktop_private::optlock.Lock();
desktop_private::ffm_mode=value;
desktop_private::optlock.Unlock();
}
/*! /*!
\brief Read in settings from R5's workspace settings file in ~/config/settings \brief Read in settings from R5's workspace settings file in ~/config/settings
\return True if successful, false unable to read and parse file. \return True if successful, false unable to read and parse file.

7
src/servers/app/server/Desktop.h
View File

@ -31,6 +31,7 @@
#include <ScrollBar.h> #include <ScrollBar.h>
#include <Menu.h> #include <Menu.h>
#include <GraphicsDefs.h> #include <GraphicsDefs.h>
#include <InterfaceDefs.h>
class ServerWindow; class ServerWindow;
class Screen; class Screen;
@ -70,8 +71,10 @@ void SetScrollBarInfo(const scroll_bar_info &info);
menu_info GetMenuInfo(void); menu_info GetMenuInfo(void);
void SetMenuInfo(const menu_info &info); void SetMenuInfo(const menu_info &info);
int16 GetFFMouse(void); bool GetFFMouse(void);
void SetFFMouse(const int16 &value); void SetFFMouse(const bool &value);
mode_mouse GetFFMouseMode(void);
void SetFFMouseMode(const mode_mouse &value);
void lock_layers(void); void lock_layers(void);
void unlock_layers(void); void unlock_layers(void);

156
src/servers/app/server/ServerApp.cpp
View File

@ -30,6 +30,7 @@
#include <PortLink.h> #include <PortLink.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ScrollBar.h>
#include <ServerProtocol.h> #include <ServerProtocol.h>
#include "BitmapManager.h" #include "BitmapManager.h"
@ -50,10 +51,8 @@
/*! /*!
\brief Constructor \brief Constructor
\param sendport port ID for the BApplication which will receive the \param sendport port ID for the BApplication which will receive the ServerApp's messages
ServerApp's messages \param rcvport port by which the ServerApp will receive messages from its BApplication.
\param rcvport port by which the ServerApp will receive messages from its
BApplication.
\param _signature NULL-terminated string which contains the BApplication's \param _signature NULL-terminated string which contains the BApplication's
MIME _signature. MIME _signature.
*/ */
@ -61,7 +60,7 @@ ServerApp::ServerApp(port_id sendport, port_id rcvport, int32 handlerID, char *s
{ {
// need to copy the _signature because the message buffer // need to copy the _signature because the message buffer
// owns the copy which we are passed as a parameter. // owns the copy which we are passed as a parameter.
_signature=(signature)?signature:"application/x-vnd.unknown-application"; _signature=(signature)?signature:"application/x-vnd.unregistered-application";
// token ID of the BApplication's BHandler object. Used for BMessage target specification // token ID of the BApplication's BHandler object. Used for BMessage target specification
_handlertoken=handlerID; _handlertoken=handlerID;
@ -92,19 +91,19 @@ ServerApp::ServerApp(port_id sendport, port_id rcvport, int32 handlerID, char *s
_driver=GetGfxDriver(ActiveScreen()); _driver=GetGfxDriver(ActiveScreen());
_cursorhidden=false; _cursorhidden=false;
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s:\n",_signature.String()); printf("ServerApp %s:\n",_signature.String());
printf("\tBApp port: %ld\n",_sender); printf("\tBApp port: %ld\n",_sender);
printf("\tReceiver port: %ld\n",_receiver); printf("\tReceiver port: %ld\n",_receiver);
#endif #endif
} }
//! Does all necessary teardown for application //! Does all necessary teardown for application
ServerApp::~ServerApp(void) ServerApp::~ServerApp(void)
{ {
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s:~ServerApp()\n",_signature.String()); printf("ServerApp %s:~ServerApp()\n",_signature.String());
#endif #endif
int32 i; int32 i;
ServerWindow *tempwin; ServerWindow *tempwin;
@ -157,9 +156,6 @@ printf("ServerApp %s:~ServerApp()\n",_signature.String());
*/ */
bool ServerApp::Run(void) bool ServerApp::Run(void)
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s:Run()\n",_signature.String());
#endif
// Unlike a BApplication, a ServerApp is *supposed* to return immediately // Unlike a BApplication, a ServerApp is *supposed* to return immediately
// when its Run() function is called. // when its Run() function is called.
_monitor_thread=spawn_thread(MonitorApp,_signature.String(),B_NORMAL_PRIORITY,this); _monitor_thread=spawn_thread(MonitorApp,_signature.String(),B_NORMAL_PRIORITY,this);
@ -243,12 +239,11 @@ int32 ServerApp::MonitorApp(void *data)
{ {
switch(msgcode) switch(msgcode)
{ {
// -------------- Messages received from the Server ------------------------
case AS_QUIT_APP: case AS_QUIT_APP:
{ {
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s:Server shutdown notification received\n",app->_signature.String()); printf("ServerApp %s:Server shutdown notification received\n",app->_signature.String());
#endif #endif
// If we are using the real, accelerated version of the // If we are using the real, accelerated version of the
// DisplayDriver, we do NOT want the user to be able shut down // DisplayDriver, we do NOT want the user to be able shut down
// the server. The results would NOT be pretty // the server. The results would NOT be pretty
@ -270,13 +265,10 @@ printf("ServerApp %s:Server shutdown notification received\n",app->_signature.St
get_port_info(app->_sender,&pi); get_port_info(app->_sender,&pi);
kill_team(pi.team); kill_team(pi.team);
app->PostMessage(B_QUIT_REQUESTED); app->PostMessage(B_QUIT_REQUESTED);
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s:Sent server shutdown message to BApp\n",app->_signature.String());
#endif
} }
break; break;
} }
// -------------- Messages received from the Application ------------------
case B_QUIT_REQUESTED: case B_QUIT_REQUESTED:
{ {
// Our BApplication sent us this message when it quit. // Our BApplication sent us this message when it quit.
@ -331,9 +323,6 @@ void ServerApp::_DispatchMessage(int32 code, int8 *buffer)
{ {
case AS_UPDATED_CLIENT_FONTLIST: case AS_UPDATED_CLIENT_FONTLIST:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Client font list update confirmed\n",_signature.String());
#endif
// received when the client-side global font list has been // received when the client-side global font list has been
// refreshed // refreshed
fontserver->Lock(); fontserver->Lock();
@ -370,11 +359,12 @@ printf("ServerApp %s: Client font list update confirmed\n",_signature.String());
ServerWindow *newwin=new ServerWindow(rect,(const char *)index, ServerWindow *newwin=new ServerWindow(rect,(const char *)index,
winlook, winfeel, winflags,this,win_port,workspace,htoken); winlook, winfeel, winflags,this,win_port,workspace,htoken);
_winlist->AddItem(newwin); _winlist->AddItem(newwin);
AddWindowToDesktop(newwin,workspace,ActiveScreen());
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s: New Window %s (%.1f,%.1f,%.1f,%.1f)\n", printf("ServerApp %s: New Window %s (%.1f,%.1f,%.1f,%.1f)\n",
_signature.String(),(const char *)index,rect.left,rect.top,rect.right,rect.bottom); _signature.String(),(const char *)index,rect.left,rect.top,rect.right,rect.bottom);
#endif #endif
// Window looper is waiting for our reply. Send back the // Window looper is waiting for our reply. Send back the
// ServerWindow's message port // ServerWindow's message port
@ -401,9 +391,9 @@ printf("ServerApp %s: New Window %s (%.1f,%.1f,%.1f,%.1f)\n",
w=(ServerWindow*)_winlist->ItemAt(i); w=(ServerWindow*)_winlist->ItemAt(i);
if(w->_token==winid) if(w->_token==winid)
{ {
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Deleting window %s\n",_signature.String(),w->Title()); printf("ServerApp %s: Deleting window %s\n",_signature.String(),w->Title());
#endif #endif
_winlist->RemoveItem(w); _winlist->RemoveItem(w);
delete w; delete w;
break; break;
@ -440,10 +430,10 @@ printf("ServerApp %s: Deleting window %s\n",_signature.String(),w->Title());
s.id=*((int32*)index); s.id=*((int32*)index);
ServerBitmap *sbmp=bitmapmanager->CreateBitmap(r,cs,f,bpr,s); ServerBitmap *sbmp=bitmapmanager->CreateBitmap(r,cs,f,bpr,s);
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Create Bitmap (%.1f,%.1f,%.1f,%.1f)\n", printf("ServerApp %s: Create Bitmap (%.1f,%.1f,%.1f,%.1f)\n",
_signature.String(),r.left,r.top,r.right,r.bottom); _signature.String(),r.left,r.top,r.right,r.bottom);
#endif #endif
if(sbmp) if(sbmp)
{ {
// list for doing faster lookups for a bitmap than what the BitmapManager // list for doing faster lookups for a bitmap than what the BitmapManager
@ -478,9 +468,9 @@ printf("ServerApp %s: Create Bitmap (%.1f,%.1f,%.1f,%.1f)\n",
ServerBitmap *sbmp=_FindBitmap(*((int32*)index)); ServerBitmap *sbmp=_FindBitmap(*((int32*)index));
if(sbmp) if(sbmp)
{ {
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Deleting Bitmap %ld\n",_signature.String(),*((int32*)index)); printf("ServerApp %s: Deleting Bitmap %ld\n",_signature.String(),*((int32*)index));
#endif #endif
_bmplist->RemoveItem(sbmp); _bmplist->RemoveItem(sbmp);
bitmapmanager->DeleteBitmap(sbmp); bitmapmanager->DeleteBitmap(sbmp);
write_port(replyport,SERVER_TRUE,NULL,0); write_port(replyport,SERVER_TRUE,NULL,0);
@ -531,9 +521,6 @@ printf("ServerApp %s: Download Picture unimplemented\n",_signature.String());
int32 workspace=*((int32*)index); index+=sizeof(int32); int32 workspace=*((int32*)index); index+=sizeof(int32);
uint32 mode=*((uint32*)index); index+=sizeof(uint32); uint32 mode=*((uint32*)index); index+=sizeof(uint32);
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: SetScreenMode: workspace %ld, mode %lu\n",_signature.String(), workspace, mode);
#endif
SetSpace(workspace,mode,ActiveScreen(),*((bool*)index)); SetSpace(workspace,mode,ActiveScreen(),*((bool*)index));
break; break;
@ -552,35 +539,23 @@ printf("ServerApp %s: SetScreenMode: workspace %ld, mode %lu\n",_signature.Strin
// call the CursorManager's version to allow for future expansion // call the CursorManager's version to allow for future expansion
case AS_SHOW_CURSOR: case AS_SHOW_CURSOR:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Show Cursor\n",_signature.String());
#endif
cursormanager->ShowCursor(); cursormanager->ShowCursor();
_cursorhidden=false; _cursorhidden=false;
break; break;
} }
case AS_HIDE_CURSOR: case AS_HIDE_CURSOR:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Hide Cursor\n",_signature.String());
#endif
cursormanager->HideCursor(); cursormanager->HideCursor();
_cursorhidden=true; _cursorhidden=true;
break; break;
} }
case AS_OBSCURE_CURSOR: case AS_OBSCURE_CURSOR:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Obscure Cursor\n",_signature.String());
#endif
cursormanager->ObscureCursor(); cursormanager->ObscureCursor();
break; break;
} }
case AS_QUERY_CURSOR_HIDDEN: case AS_QUERY_CURSOR_HIDDEN:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: Query Cursor Hidden\n",_signature.String());
#endif
// Attached data // Attached data
// 1) int32 port to reply to // 1) int32 port to reply to
write_port(*((port_id*)index),(_cursorhidden)?SERVER_TRUE:SERVER_FALSE,NULL,0); write_port(*((port_id*)index),(_cursorhidden)?SERVER_TRUE:SERVER_FALSE,NULL,0);
@ -588,9 +563,6 @@ printf("ServerApp %s: Query Cursor Hidden\n",_signature.String());
} }
case AS_SET_CURSOR_DATA: case AS_SET_CURSOR_DATA:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: SetCursor(cursor data *)\n",_signature.String());
#endif
// Attached data: 68 bytes of _appcursor data // Attached data: 68 bytes of _appcursor data
int8 cdata[68]; int8 cdata[68];
@ -611,9 +583,6 @@ printf("ServerApp %s: SetCursor(cursor data *)\n",_signature.String());
} }
case AS_SET_CURSOR_BCURSOR: case AS_SET_CURSOR_BCURSOR:
{ {
#ifdef DEBUG_SERVERAPP
printf("ServerApp %s: SetCursor(BCursor)\n",_signature.String());
#endif
// Attached data: // Attached data:
// 1) port_id reply port // 1) port_id reply port
// 2) 68 bytes of _appcursor data // 2) 68 bytes of _appcursor data
@ -636,11 +605,72 @@ printf("ServerApp %s: SetCursor(BCursor)\n",_signature.String());
replylink.Flush(); replylink.Flush();
break; break;
} }
case AS_GET_SCROLLBAR_INFO:
{
// Attached data:
// 1) port_id reply port - synchronous message
PortLink replylink( *((port_id*)index) );
scroll_bar_info sbi=GetScrollBarInfo();
replylink.SetOpCode(AS_GET_SCROLLBAR_INFO);
replylink.Attach(&sbi,sizeof(scroll_bar_info));
replylink.Flush();
break;
}
case AS_SET_SCROLLBAR_INFO:
{
// Attached Data:
// 1) scroll_bar_info scroll bar info structure
SetScrollBarInfo(*((scroll_bar_info*)index));
break;
}
case AS_FOCUS_FOLLOWS_MOUSE:
{
// Attached data:
// 1) port_id reply port - synchronous message
PortLink replylink( *((port_id*)index) );
replylink.SetOpCode(AS_FOCUS_FOLLOWS_MOUSE);
replylink.Attach(GetFFMouse());
replylink.Flush();
break;
}
case AS_SET_FOCUS_FOLLOWS_MOUSE:
{
// Attached Data:
// 1) scroll_bar_info scroll bar info structure
SetScrollBarInfo(*((scroll_bar_info*)index));
break;
}
case AS_SET_MOUSE_MODE:
{
// Attached Data:
// 1) enum mode_mouse FFM mouse mode
SetFFMouseMode(*((mode_mouse*)index));
break;
}
case AS_GET_MOUSE_MODE:
{
// Attached data:
// 1) port_id reply port - synchronous message
PortLink replylink( *((port_id*)index) );
replylink.SetOpCode(AS_FOCUS_FOLLOWS_MOUSE);
mode_mouse mode=GetFFMouseMode();
replylink.Attach(&mode,sizeof(mode_mouse));
replylink.Flush();
break;
}
default: default:
{ {
#ifdef DEBUG_SERVERAPP #ifdef DEBUG_SERVERAPP
printf("ServerApp %s received unhandled message code %lx\n",_signature.String(),code); printf("ServerApp %s received unhandled message code %lx\n",_signature.String(),code);
#endif #endif
break; break;
} }
} }