Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set up alternative definitions for some window messages #2925

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Set up alternative definitions for some window messages #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions neutrinordp/xrdp-color.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#endif

#include "xrdp-neutrinordp.h"
#include "defines.h"
#include "log.h"
#include "os_calls.h"
#include "string_calls.h"

char *
convert_bitmap(int in_bpp, int out_bpp, char *bmpdata,
Expand Down
13 changes: 12 additions & 1 deletion neutrinordp/xrdp-neutrinordp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
* limitations under the License.
*/

#include <freerdp/freerdp.h>
#include <freerdp/codec/bitmap.h>

// FreeRDP defines some macros that we have different values for.
// To catch this we need to include the freerdp includes before our
// local ones (see gcc bug #16358)
#undef WM_LBUTTONUP
#undef WM_LBUTTONDOWN
#undef WM_RBUTTONUP
#undef WM_RBUTTONDOWN

#if defined(HAVE_CONFIG_H)
#include <config_ac.h>
#endif
Expand All @@ -26,8 +37,8 @@
#include "xrdp_rail.h"
#include "trans.h"
#include "log.h"
#include "os_calls.h"
#include "string_calls.h"
#include <freerdp/settings.h>

#if defined(VERSION_STRUCT_RDP_FREERDP)
#if VERSION_STRUCT_RDP_FREERDP > 1
Expand Down
19 changes: 6 additions & 13 deletions neutrinordp/xrdp-neutrinordp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,15 @@
#ifndef XRDP_NEUTRINORDP_H
#define XRDP_NEUTRINORDP_H

/* include other h files */
#include "arch.h"
#include "parse.h"
#include "os_calls.h"
#include "defines.h"
#include "xrdp_rail.h"
#include "xrdp_client_info.h"
#include "xrdp_constants.h"
#include "xrdp_client_info.h"

/* this is the freerdp main header */
#include <freerdp/freerdp.h>
#include <freerdp/rail.h>
#include <freerdp/rail/rail.h>
#include <freerdp/codec/bitmap.h>
//#include <freerdp/utils/memory.h>
//#include "/home/jay/git/jsorg71/staging/include/freerdp/freerdp.h"
/* Incomplete type definitions, referenced below */
struct rail_window_state_order;
struct rail_notify_state_order;
struct rail_monitored_desktop_order;
struct rail_icon_info;

struct bitmap_item
{
Expand Down
Loading