Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FreeRDP/Remmina.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Panozzo <giovanni@panozzo.it>2016-02-29 00:51:33 +0300
committerGiovanni Panozzo <giovanni@panozzo.it>2016-02-29 00:51:33 +0300
commit6cf555f08092af54b881a38736221360ddabf8f6 (patch)
tree0ce502992aff1536b8560a80779e2ff9dab5fa72
parent9d3397581e1af7af63650d25e2a4bc8bb748dd04 (diff)
Remove unneded rdp_gdi.c and rdp_gdi.h files1.2.0-rcgit.9
-rw-r--r--remmina-plugins/rdp/CMakeLists.txt2
-rw-r--r--remmina-plugins/rdp/rdp_event.c1
-rw-r--r--remmina-plugins/rdp/rdp_gdi.c233
-rw-r--r--remmina-plugins/rdp/rdp_gdi.h47
-rw-r--r--remmina-plugins/rdp/rdp_plugin.c1
5 files changed, 0 insertions, 284 deletions
diff --git a/remmina-plugins/rdp/CMakeLists.txt b/remmina-plugins/rdp/CMakeLists.txt
index 04b9b52c8..878c2cc3b 100644
--- a/remmina-plugins/rdp/CMakeLists.txt
+++ b/remmina-plugins/rdp/CMakeLists.txt
@@ -45,8 +45,6 @@ set(REMMINA_PLUGIN_RDP_SRCS
rdp_file.h
rdp_settings.c
rdp_settings.h
- rdp_gdi.c
- rdp_gdi.h
rdp_graphics.c
rdp_graphics.h
rdp_cliprdr.c
diff --git a/remmina-plugins/rdp/rdp_event.c b/remmina-plugins/rdp/rdp_event.c
index 19ccac46c..5e45d8856 100644
--- a/remmina-plugins/rdp/rdp_event.c
+++ b/remmina-plugins/rdp/rdp_event.c
@@ -37,7 +37,6 @@
#include "rdp_plugin.h"
#include "rdp_event.h"
-#include "rdp_gdi.h"
#include "rdp_cliprdr.h"
#include <gdk/gdkkeysyms.h>
#include <cairo/cairo-xlib.h>
diff --git a/remmina-plugins/rdp/rdp_gdi.c b/remmina-plugins/rdp/rdp_gdi.c
deleted file mode 100644
index 3030100fd..000000000
--- a/remmina-plugins/rdp/rdp_gdi.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010 Jay Sorg
- * Copyright (C) 2010-2011 Vic Lee
- * Copyright (C) 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
- * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL. * If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. * If you
- * do not wish to do so, delete this exception statement from your
- * version. * If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-/* rdp gdi functions, run inside the rdp thread */
-
-#include "rdp_plugin.h"
-#include "rdp_event.h"
-#include "rdp_gdi.h"
-#include <freerdp/freerdp.h>
-#include <freerdp/constants.h>
-#include <freerdp/cache/cache.h>
-
-static BOOL rf_desktop_resize(rdpContext* context)
-{
- TRACE_CALL("rf_desktop_resize");
- RemminaProtocolWidget* gp;
- RemminaPluginRdpUiObject* ui;
- rfContext* rfi;
-
- rfi = (rfContext*) context;
- gp = rfi->protocol_widget;
-
- LOCK_BUFFER(TRUE)
-
- remmina_plugin_service->protocol_plugin_set_width(gp, rfi->settings->DesktopWidth);
- remmina_plugin_service->protocol_plugin_set_height(gp, rfi->settings->DesktopHeight);
-
- UNLOCK_BUFFER(TRUE)
-
- ui = g_new0(RemminaPluginRdpUiObject, 1);
- ui->sync = TRUE; // Wait for completion too
- ui->type = REMMINA_RDP_UI_EVENT;
- ui->event.type = REMMINA_RDP_UI_EVENT_UPDATE_SCALE;
- rf_queue_ui(gp, ui);
-
- remmina_plugin_service->protocol_plugin_emit_signal(gp, "desktop-resize");
-
- return TRUE;
-}
-
-static BOOL rf_gdi_palette(rdpContext* context, PALETTE_UPDATE* palette)
-{
- TRACE_CALL("rf_gdi_palette");
- g_print("palette\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_set_bounds(rdpContext* context, rdpBounds* bounds)
-{
- TRACE_CALL("rf_gdi_set_bounds");
- return TRUE;
-}
-
-static BOOL rf_gdi_dstblt(rdpContext* context, DSTBLT_ORDER* dstblt)
-{
- TRACE_CALL("rf_gdi_dstblt");
- g_print("dstblt\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
-{
- TRACE_CALL("rf_gdi_patblt");
- g_print("patblt\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_scrblt(rdpContext* context, SCRBLT_ORDER* scrblt)
-{
- TRACE_CALL("rf_gdi_scrblt");
- g_print("srcblt\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_opaque_rect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect)
-{
- TRACE_CALL("rf_gdi_opaque_rect");
- g_print("opaque_rect\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_multi_opaque_rect(rdpContext* context, MULTI_OPAQUE_RECT_ORDER* multi_opaque_rect)
-{
- TRACE_CALL("rf_gdi_multi_opaque_rect");
- g_print("multi_opaque_rect\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to)
-{
- TRACE_CALL("rf_gdi_line_to");
- g_print("line_to\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline)
-{
- TRACE_CALL("rf_gdi_polyline");
- g_print("polyline\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt)
-{
- TRACE_CALL("rf_gdi_memblt");
- g_print("memblt\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_fast_index(rdpContext* context, FAST_INDEX_ORDER* fast_index)
-{
- TRACE_CALL("rf_gdi_fast_index");
- g_print("fast_index\n");
- return TRUE;
-}
-
-static BOOL rf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surface_bits_command)
-{
- TRACE_CALL("rf_gdi_surface_bits");
- UINT8* bitmap;
- RFX_MESSAGE* message;
- RemminaPluginRdpUiObject* ui;
- rfContext* rfi = (rfContext*) context;
-
- if (surface_bits_command->codecID == RDP_CODEC_ID_REMOTEFX && rfi->rfx_context)
- {
- message = rfx_process_message(rfi->rfx_context, surface_bits_command->bitmapData,
- surface_bits_command->bitmapDataLength);
-
- ui = g_new0(RemminaPluginRdpUiObject, 1);
- ui->type = REMMINA_RDP_UI_RFX;
- ui->rfx.left = surface_bits_command->destLeft;
- ui->rfx.top = surface_bits_command->destTop;
- ui->rfx.message = message;
-
- rf_queue_ui(rfi->protocol_widget, ui);
- }
- else if (surface_bits_command->codecID == RDP_CODEC_ID_NONE)
- {
- bitmap = (UINT8*) calloc(1, surface_bits_command->width * surface_bits_command->height * 4);
-
- freerdp_image_flip(surface_bits_command->bitmapData, bitmap,
- surface_bits_command->width, surface_bits_command->height, 32);
-
- ui = g_new0(RemminaPluginRdpUiObject, 1);
- ui->type = REMMINA_RDP_UI_NOCODEC;
- ui->nocodec.left = surface_bits_command->destLeft;
- ui->nocodec.top = surface_bits_command->destTop;
- ui->nocodec.width = surface_bits_command->width;
- ui->nocodec.height = surface_bits_command->height;
- ui->nocodec.bitmap = bitmap;
-
- rf_queue_ui(rfi->protocol_widget, ui);
- }
- else
- {
- printf("Unsupported codecID %d\n", surface_bits_command->codecID);
- }
- return TRUE;
-}
-
-void rf_gdi_register_update_callbacks(rdpUpdate* update)
-{
- TRACE_CALL("rf_gdi_register_update_callbacks");
- rdpPrimaryUpdate* primary;
- rdpSecondaryUpdate* secondary;
-
- primary = update->primary;
- secondary = update->secondary;
-
- update->DesktopResize = rf_desktop_resize;
- update->Palette = rf_gdi_palette;
- update->SetBounds = rf_gdi_set_bounds;
-
- primary->DstBlt = rf_gdi_dstblt;
- primary->PatBlt = rf_gdi_patblt;
- primary->ScrBlt = rf_gdi_scrblt;
- primary->OpaqueRect = rf_gdi_opaque_rect;
- primary->DrawNineGrid = NULL;
- primary->MultiDstBlt = NULL;
- primary->MultiPatBlt = NULL;
- primary->MultiScrBlt = NULL;
- primary->MultiOpaqueRect = rf_gdi_multi_opaque_rect;
- primary->MultiDrawNineGrid = NULL;
- primary->LineTo = rf_gdi_line_to;
- primary->Polyline = rf_gdi_polyline;
- primary->MemBlt = rf_gdi_memblt;
- primary->Mem3Blt = NULL;
- primary->SaveBitmap = NULL;
- primary->GlyphIndex = NULL;
- primary->FastIndex = rf_gdi_fast_index;
- primary->FastGlyph = NULL;
- primary->PolygonSC = NULL;
- primary->PolygonCB = NULL;
- primary->EllipseSC = NULL;
- primary->EllipseCB = NULL;
-
- update->SurfaceBits = rf_gdi_surface_bits;
-}
diff --git a/remmina-plugins/rdp/rdp_gdi.h b/remmina-plugins/rdp/rdp_gdi.h
deleted file mode 100644
index c73afabeb..000000000
--- a/remmina-plugins/rdp/rdp_gdi.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Remmina - The GTK+ Remote Desktop Client
- * Copyright (C) 2010-2011 Vic Lee
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL. * If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. * If you
- * do not wish to do so, delete this exception statement from your
- * version. * If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __REMMINA_RDP_GDI_H__
-#define __REMMINA_RDP_GDI_H__
-
-#include "rdp_plugin.h"
-
-G_BEGIN_DECLS
-
-void rf_gdi_register_update_callbacks(rdpUpdate* update);
-
-G_END_DECLS
-
-#endif
-
diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c
index 74be648cf..c006dbbce 100644
--- a/remmina-plugins/rdp/rdp_plugin.c
+++ b/remmina-plugins/rdp/rdp_plugin.c
@@ -34,7 +34,6 @@
*/
#include "rdp_plugin.h"
-#include "rdp_gdi.h"
#include "rdp_event.h"
#include "rdp_graphics.h"
#include "rdp_file.h"