[haiku-commits] Re: r36837 - haiku/branches/features/stack-and-tile/src/servers/app
- From: Wim van der Meer <wpjvandermeer@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 17 May 2010 15:25:43 +0900
On Mon, May 17, 2010 at 3:22 PM, Wim van der Meer
<wpjvandermeer@xxxxxxxxx>wrote:
>
>
> On Mon, May 17, 2010 at 1:13 PM, <clemens.zeidler@xxxxxxxxxxxxxx> wrote:
>
>> Author: czeidler
>> Date: 2010-05-17 06:13:21 +0200 (Mon, 17 May 2010)
>> New Revision: 36837
>> Changeset: http://dev.haiku-os.org/changeset/36837/haiku
>>
>> Modified:
>>
>> haiku/branches/features/stack-and-tile/src/servers/app/ProfileMessageSupport.cpp
>> haiku/branches/features/stack-and-tile/src/servers/app/ServerApp.cpp
>> Log:
>> Sync with the current app server.
>>
>> Modified:
>> haiku/branches/features/stack-and-tile/src/servers/app/ProfileMessageSupport.cpp
>> ===================================================================
>> ---
>> haiku/branches/features/stack-and-tile/src/servers/app/ProfileMessageSupport.cpp
>> 2010-05-17 03:47:24 UTC (rev 36836)
>> +++
>> haiku/branches/features/stack-and-tile/src/servers/app/ProfileMessageSupport.cpp
>> 2010-05-17 04:13:21 UTC (rev 36837)
>> @@ -61,9 +61,6 @@
>>
>> CODE(AS_BEGIN_RECT_TRACKING);
>> CODE(AS_END_RECT_TRACKING);
>> -
>> - CODE(AS_GET_CURSOR_POSITION);
>> - CODE(AS_GET_CURSOR_BITMAP);
>>
>> // Window definitions
>> CODE(AS_SHOW_WINDOW);
>>
>> Modified:
>> haiku/branches/features/stack-and-tile/src/servers/app/ServerApp.cpp
>> ===================================================================
>> --- haiku/branches/features/stack-and-tile/src/servers/app/ServerApp.cpp
>> 2010-05-17 03:47:24 UTC (rev 36836)
>> +++ haiku/branches/features/stack-and-tile/src/servers/app/ServerApp.cpp
>> 2010-05-17 04:13:21 UTC (rev 36837)
>> @@ -11,7 +11,6 @@
>> * Jérôme Duval, jerome.duval@xxxxxxx
>> * Andrej Spielmann, <andrej.spielmann@xxxxxxxxxxxx>
>> * Philippe Saint-Pierre, stpere@xxxxxxxxx
>> - * Wim van der Meer, <WPJvanderMeer@xxxxxxxxx>
>> */
>>
>>
>> @@ -622,7 +621,6 @@
>>
>> fDesktop->BroadcastToAllApps(AS_UPDATE_DECORATOR);
>> break;
>> }
>> -
>> case AS_COUNT_DECORATORS:
>> {
>> fLink.StartMessage(B_OK);
>> @@ -630,7 +628,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_DECORATOR:
>> {
>> fLink.StartMessage(B_OK);
>> @@ -638,7 +635,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_DECORATOR_NAME:
>> {
>> int32 index;
>> @@ -654,7 +650,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_R5_SET_DECORATOR:
>> {
>> // Sort of supports Tracker's nifty Easter Egg. It
>> was easy to do
>> @@ -675,7 +670,6 @@
>>
>> break;
>> }
>> -
>> case AS_CREATE_BITMAP:
>> {
>> STRACE(("ServerApp %s: Received BBitmap creation
>> request\n",
>> @@ -742,7 +736,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_DELETE_BITMAP:
>> {
>> STRACE(("ServerApp %s: received BBitmap delete
>> request\n",
>> @@ -766,7 +759,6 @@
>> fMapLocker.Unlock();
>> break;
>> }
>> -
>> case AS_GET_BITMAP_OVERLAY_RESTRICTIONS:
>> {
>> overlay_restrictions restrictions;
>> @@ -794,7 +786,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_BITMAP_SUPPORT_FLAGS:
>> {
>> uint32 colorSpace;
>> @@ -970,7 +961,6 @@
>>
>> fDesktop->HWInterface()->SetCursorVisible(fCursorHideLevel == 0);
>> break;
>> }
>> -
>> case AS_HIDE_CURSOR:
>> {
>> STRACE(("ServerApp %s: Hide Cursor\n",
>> Signature()));
>> @@ -978,14 +968,12 @@
>>
>> fDesktop->HWInterface()->SetCursorVisible(fCursorHideLevel == 0);
>> break;
>> }
>> -
>> case AS_OBSCURE_CURSOR:
>> {
>> STRACE(("ServerApp %s: Obscure Cursor\n",
>> Signature()));
>> fDesktop->HWInterface()->ObscureCursor();
>> break;
>> }
>> -
>> case AS_QUERY_CURSOR_HIDDEN:
>> {
>> STRACE(("ServerApp %s: Received IsCursorHidden
>> request\n",
>> @@ -995,7 +983,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_SET_CURSOR:
>> {
>> STRACE(("ServerApp %s: SetCursor\n", Signature()));
>> @@ -1035,7 +1022,6 @@
>> }
>> break;
>> }
>> -
>> case AS_SET_VIEW_CURSOR:
>> {
>> STRACE(("ServerApp %s: AS_SET_VIEW_CURSOR:\n",
>> Signature()));
>> @@ -1092,11 +1078,9 @@
>> }
>> break;
>> }
>> -
>> case AS_CREATE_CURSOR:
>> {
>> STRACE(("ServerApp %s: Create Cursor\n",
>> Signature()));
>> -
>> // Attached data:
>> // 1) 68 bytes of fAppCursor data
>> // 2) port_id reply port
>> @@ -1139,14 +1123,11 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_REFERENCE_CURSOR:
>> {
>> STRACE(("ServerApp %s: Reference BCursor\n",
>> Signature()));
>> -
>> // Attached data:
>> // 1) int32 token ID of the cursor to reference
>> -
>> int32 token;
>> if (link.Read<int32>(&token) != B_OK)
>> break;
>> @@ -1163,14 +1144,11 @@
>>
>> break;
>> }
>> -
>> case AS_DELETE_CURSOR:
>> {
>> STRACE(("ServerApp %s: Delete BCursor\n",
>> Signature()));
>> -
>> // Attached data:
>> // 1) int32 token ID of the cursor to delete
>> -
>> int32 token;
>> if (link.Read<int32>(&token) != B_OK)
>> break;
>> @@ -1187,54 +1165,7 @@
>>
>> break;
>> }
>> -
>> - case AS_GET_CURSOR_POSITION:
>> - {
>> - STRACE(("ServerApp %s: Get Cursor position\n",
>> Signature()));
>>
>> - // Returns
>> - // 1) BPoint mouse location
>> - // 2) int32 button state
>> -
>> - BPoint where;
>> - int32 buttons;
>> - fDesktop->GetLastMouseState(&where, &buttons);
>> - fLink.StartMessage(B_OK);
>> - fLink.Attach<BPoint>(where);
>> - fLink.Attach<int32>(buttons);
>> - fLink.Flush();
>> - break;
>> - }
>> -
>> - case AS_GET_CURSOR_BITMAP:
>> - {
>> - STRACE(("ServerApp %s: Get Cursor bitmap\n",
>> Signature()));
>> -
>> - // Returns
>> - // 1) uint32 number of data bytes of the bitmap
>> - // 2) uint32 cursor width in number of pixels
>> - // 3) uint32 cursor height in number of pixels
>> - // 4) BPoint cursor hot spot
>> - // 5) cursor bitmap data
>> -
>> - ServerCursorReference cursorRef =
>> fDesktop->Cursor();
>> - ServerCursor* cursor = cursorRef.Get();
>> - if (cursor != NULL) {
>> - uint32 size = cursor->BitsLength();
>> - fLink.StartMessage(B_OK);
>> - fLink.Attach<uint32>(size);
>> - fLink.Attach<uint32>(cursor->Width());
>> - fLink.Attach<uint32>(cursor->Height());
>> -
>> fLink.Attach<BPoint>(cursor->GetHotSpot());
>> - fLink.Attach(cursor->Bits(), size);
>> - } else
>> - fLink.StartMessage(B_ERROR);
>> -
>> - fLink.Flush();
>> -
>> - break;
>> - }
>> -
>> case AS_GET_SCROLLBAR_INFO:
>> {
>> STRACE(("ServerApp %s: Get ScrollBar info\n",
>> Signature()));
>> @@ -1250,17 +1181,14 @@
>> } else
>> fLink.StartMessage(B_ERROR);
>>
>> - fLink.Flush();
>> + fLink.Flush();
>> break;
>> }
>> -
>> case AS_SET_SCROLLBAR_INFO:
>> {
>> STRACE(("ServerApp %s: Set ScrollBar info\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) scroll_bar_info scroll bar info structure
>> -
>> scroll_bar_info info;
>> if (link.Read<scroll_bar_info>(&info) == B_OK) {
>> LockedDesktopSettings settings(fDesktop);
>> @@ -1290,7 +1218,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_SET_MENU_INFO:
>> {
>> STRACE(("ServerApp %s: Set menu info\n",
>> Signature()));
>> @@ -1311,10 +1238,8 @@
>> {
>> STRACE(("ServerApp %s: Set Mouse Focus mode\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) enum mode_mouse mouse focus mode
>> -
>> mode_mouse mouseMode;
>> if (link.Read<mode_mouse>(&mouseMode) == B_OK) {
>> LockedDesktopSettings settings(fDesktop);
>> @@ -1322,7 +1247,6 @@
>> }
>> break;
>> }
>> -
>> case AS_GET_MOUSE_MODE:
>> {
>> STRACE(("ServerApp %s: Get Mouse Focus mode\n",
>> @@ -1341,14 +1265,11 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_SET_FOCUS_FOLLOWS_MOUSE_MODE:
>> {
>> STRACE(("ServerApp %s: Set Focus Follows Mouse
>> mode\n", Signature()));
>> -
>> // Attached Data:
>> // 1) enum mode_focus_follows_mouse FFM mouse mode
>> -
>> mode_focus_follows_mouse focusFollowsMousMode;
>> if
>> (link.Read<mode_focus_follows_mouse>(&focusFollowsMousMode) == B_OK) {
>> LockedDesktopSettings settings(fDesktop);
>> @@ -1356,7 +1277,6 @@
>> }
>> break;
>> }
>> -
>> case AS_GET_FOCUS_FOLLOWS_MOUSE_MODE:
>> {
>> STRACE(("ServerApp %s: Get Focus Follows Mouse
>> mode\n", Signature()));
>> @@ -1375,14 +1295,11 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_SET_ACCEPT_FIRST_CLICK:
>> {
>> STRACE(("ServerApp %s: Set Accept First Click\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) bool accept_first_click
>> -
>> bool acceptFirstClick;
>> if (link.Read<bool>(&acceptFirstClick) == B_OK) {
>> LockedDesktopSettings settings(fDesktop);
>> @@ -1390,7 +1307,6 @@
>> }
>> break;
>> }
>> -
>> case AS_GET_ACCEPT_FIRST_CLICK:
>> {
>> STRACE(("ServerApp %s: Get Accept First Click\n",
>> Signature()));
>> @@ -1506,7 +1422,6 @@
>> }
>> break;
>> }
>> -
>> case AS_GET_SYSTEM_DEFAULT_FONT:
>> {
>> // input:
>> @@ -1543,7 +1458,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_SYSTEM_FONTS:
>> {
>> FTRACE(("ServerApp %s: AS_GET_SYSTEM_FONTS\n",
>> Signature()));
>> @@ -1580,12 +1494,10 @@
>> font = &fPlainFont;
>>
>> fLink.AttachString("plain");
>> break;
>> -
>> case 1:
>> font = &fBoldFont;
>> fLink.AttachString("bold");
>> break;
>> -
>> case 2:
>> font = &fFixedFont;
>>
>> fLink.AttachString("fixed");
>> @@ -1603,7 +1515,6 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_FONT_LIST_REVISION:
>> {
>> STRACE(("ServerApp %s:
>> AS_GET_FONT_LIST_REVISION\n", Signature()));
>> @@ -1614,11 +1525,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_FAMILY_AND_STYLES:
>> {
>> FTRACE(("ServerApp %s: AS_GET_FAMILY_AND_STYLES\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) int32 the index of the font family to get
>>
>> @@ -1659,11 +1568,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_FAMILY_AND_STYLE:
>> {
>> FTRACE(("ServerApp %s: AS_GET_FAMILY_AND_STYLE\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -1671,7 +1578,6 @@
>> // Returns:
>> // 1) font_family The name of the font family
>> // 2) font_style - name of the style
>> -
>> uint16 familyID, styleID;
>> link.Read<uint16>(&familyID);
>> link.Read<uint16>(&styleID);
>> @@ -1690,7 +1596,6 @@
>> gFontManager->Unlock();
>> break;
>> }
>> -
>> case AS_GET_FAMILY_AND_STYLE_IDS:
>> {
>> FTRACE(("ServerApp %s:
>> AS_GET_FAMILY_AND_STYLE_IDS\n",
>> @@ -1742,11 +1647,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_FONT_FILE_FORMAT:
>> {
>> FTRACE(("ServerApp %s: AS_GET_FONT_FILE_FORMAT\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -1771,11 +1674,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_STRING_WIDTHS:
>> {
>> FTRACE(("ServerApp %s: AS_GET_STRING_WIDTHS\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 ID of family
>> // 2) uint16 ID of style
>> @@ -1840,12 +1741,10 @@
>> }
>> break;
>> }
>> -
>> case AS_GET_FONT_BOUNDING_BOX:
>> {
>> FTRACE(("ServerApp %s: AS_GET_BOUNDING_BOX
>> unimplemented\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -1858,18 +1757,15 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_TUNED_COUNT:
>> {
>> FTRACE(("ServerApp %s: AS_GET_TUNED_COUNT\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>>
>> // Returns:
>> // 1) int32 - number of font strikes available
>> -
>> uint16 familyID, styleID;
>> link.Read<uint16>(&familyID);
>> link.Read<uint16>(&styleID);
>> @@ -1887,12 +1783,10 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_TUNED_INFO:
>> {
>> FTRACE(("ServerApp %s: AS_GET_TUNED_INFO
>> unimplmemented\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -1901,24 +1795,20 @@
>> // Returns:
>> // 1) tuned_font_info - info on the strike
>> specified
>> // ToDo: implement me!
>> -
>> fLink.StartMessage(B_ERROR);
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_EXTRA_FONT_FLAGS:
>> {
>> FTRACE(("ServerApp %s: AS_GET_EXTRA_FONT_FLAGS\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>>
>> // Returns:
>> // 1) uint32 - extra font flags
>> -
>> uint16 familyID, styleID;
>> link.Read<uint16>(&familyID);
>> link.Read<uint16>(&styleID);
>> @@ -1936,16 +1826,13 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_FONT_HEIGHT:
>> {
>> FTRACE(("ServerApp %s: AS_GET_FONT_HEIGHT\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 family ID
>> // 2) uint16 style ID
>> // 3) float size
>> -
>> uint16 familyID, styleID;
>> float size;
>> link.Read<uint16>(&familyID);
>> @@ -1968,11 +1855,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_GLYPH_SHAPES:
>> {
>> FTRACE(("ServerApp %s: AS_GET_GLYPH_SHAPES\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -2038,11 +1923,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_HAS_GLYPHS:
>> {
>> FTRACE(("ServerApp %s: AS_GET_HAS_GLYPHS\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -2078,11 +1961,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_EDGES:
>> {
>> FTRACE(("ServerApp %s: AS_GET_EDGES\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -2120,11 +2001,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_ESCAPEMENTS:
>> {
>> FTRACE(("ServerApp %s: AS_GET_ESCAPEMENTS\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -2216,11 +2095,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_ESCAPEMENTS_AS_FLOATS:
>> {
>> FTRACE(("ServerApp %s:
>> AS_GET_ESCAPEMENTS_AS_FLOATS\n", Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -2228,8 +2105,10 @@
>> // 4) uint8 - spacing
>> // 5) float - rotation
>> // 6) uint32 - flags
>> +
>> // 7) float - additional "nonspace" delta
>> // 8) float - additional "space" delta
>> +
>> // 9) int32 - numChars
>> // 10) int32 - numBytes
>> // 11) char - the char buffer with size numBytes
>> @@ -2299,12 +2178,10 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_GET_BOUNDINGBOXES_CHARS:
>> case AS_GET_BOUNDINGBOXES_STRING:
>> {
>> FTRACE(("ServerApp %s:
>> AS_GET_BOUNDINGBOXES_CHARS\n", Signature()));
>> -
>> // Attached Data:
>> // 1) uint16 - family ID
>> // 2) uint16 - style ID
>> @@ -2314,9 +2191,12 @@
>> // 6) float - false bold width
>> // 7) uint8 - spacing
>> // 8) uint32 - flags
>> +
>> // 9) font_metric_mode - mode
>> // 10) bool - string escapement
>> +
>> // 11) escapement_delta - additional delta
>> +
>> // 12) int32 - numChars
>> // 13) int32 - numBytes
>> // 14) char - the char buffer with size numBytes
>> @@ -2389,7 +2269,6 @@
>> delete[] rectArray;
>> break;
>> }
>> -
>> case AS_GET_BOUNDINGBOXES_STRINGS:
>> {
>> FTRACE(("ServerApp %s:
>> AS_GET_BOUNDINGBOXES_STRINGS\n",
>> @@ -2404,8 +2283,10 @@
>> // 6) float - false bold width
>> // 7) uint8 - spacing
>> // 8) uint32 - flags
>> +
>> // 9) font_metric_mode - mode
>> // 10) int32 numStrings
>> +
>> // 11) escapement_delta - additional delta
>> (numStrings times)
>> // 12) int32 string length to measure (numStrings
>> times)
>> // 13) string - string (numStrings times)
>> @@ -2480,7 +2361,6 @@
>> {
>> // Attached data
>> // 1) int32 screen
>> -
>> int32 id;
>> if (link.Read<int32>(&id) == B_OK
>> && id == B_MAIN_SCREEN_ID.id)
>> @@ -2496,7 +2376,6 @@
>> {
>> // Attached data
>> // 1) int32 screen
>> -
>> int32 id;
>> link.Read<int32>(&id);
>>
>> @@ -2512,7 +2391,6 @@
>>
>> // Attached data
>> // 1) int32 - window client token
>> -
>> int32 clientToken;
>> if (link.Read<int32>(&clientToken) != B_OK)
>> status = B_BAD_DATA;
>> @@ -2554,7 +2432,6 @@
>> case AS_SCREEN_GET_MODE:
>> {
>> STRACE(("ServerApp %s: AS_SCREEN_GET_MODE\n",
>> Signature()));
>> -
>> // Attached data
>> // 1) int32 screen
>> // 2) uint32 workspace index
>> @@ -2573,11 +2450,9 @@
>> fLink.Flush();
>> break;
>> }
>> -
>> case AS_SCREEN_SET_MODE:
>> {
>> STRACE(("ServerApp %s: AS_SCREEN_SET_MODE\n",
>> Signature()));
>> -
>> // Attached data
>> // 1) int32 screen
>> // 2) workspace index
>> @@ -2671,7 +2546,6 @@
>> case AS_GET_SCREEN_FRAME:
>> {
>> STRACE(("ServerApp %s: AS_GET_SCREEN_FRAME\n",
>> Signature()));
>> -
>> // Attached data
>> // 1) int32 screen
>> // 2) uint32 workspace index
>> @@ -2763,11 +2637,9 @@
>> case AS_SET_UI_COLOR:
>> {
>> STRACE(("ServerApp %s: Set UI Color\n",
>> Signature()));
>> -
>> // Attached Data:
>> // 1) color_which which
>> // 2) rgb_color color
>> -
>> color_which which;
>> rgb_color color;
>>
>> @@ -2860,7 +2732,6 @@
>> case AS_GET_TIMING_CONSTRAINTS:
>> {
>> STRACE(("ServerApp %s: get timing constraints\n",
>> Signature()));
>> -
>> // We aren't using the screen_id for now...
>> int32 id;
>> link.Read<int32>(&id);
>>
>>
>>
>
>
> Can I ask you why you didn't do svn update before creating your patch? You
> basically removed the previous patch to ServerApp.cpp
>
> --
> Wim van der Meer
> \/\///\/\
>
Oh wait, never mind, it is a different branch, so I suppose it is OK.
--
Wim van der Meer
\/\///\/\
Other related posts:
