This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from f3971c9 x2gokdriveselection.c: Re-add static prototype of create_selection_window to .c file. new 995b56b x2gokdrive.c: Make function that lack prototypes in the header file static for now. Probably more static function candidates in the code, needs deeper investigation. new 15a96ca x2gokdrive.c: (in epyhrInitScreen) drop unneeded KdScreenPriv(pScreen) macro call. new 0371071 x2gokdrive.c: Fix "passing argument 2 of ‘addOutput’ discards ‘const’ qualifier from pointer target type" compiler warning. new df654fc x2gokdrive.c: Comment out EphyrKeyboardConfig() function. Obviously not needed. new 74cd23b Dissolve circular include dependency, fix RemoteHostVars declaration warnings. new d197e25 Spot more commented out code section and use double-slashes for commenting them out. new ba3e550 x2gokdrive*.c: Declare and zero-define several more variables. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2gokdrive.c | 68 ++++++++++++++++++++++++------------------------- x2gokdriveremote.c | 5 ++-- x2gokdriveremote.h | 11 ++------ x2gokdriveselection.c | 70 ++++++++++++++++++++++++--------------------------- x2gokdriveselection.h | 5 ++-- 5 files changed, 75 insertions(+), 84 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 995b56b1e2b04b1922c20e6f4a2951a747b12d51 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 16 23:51:53 2019 +0200 x2gokdrive.c: Make function that lack prototypes in the header file static for now. Probably more static function candidates in the code, needs deeper investigation. --- x2gokdrive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index 46e7d89..df13a63 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -664,6 +664,7 @@ bail4: return FALSE; } +static void setOutput(ScreenPtr pScreen, RROutputPtr output, RRCrtcPtr crtc, int width, int height, int x, int y, BOOL primary, BOOL connected) { RRModePtr mode = NULL; @@ -1444,7 +1445,7 @@ EphyrKeyboardInit(KdKeyboardInfo * ki) return Success; } - +static void EphyrKeyboardConfig(KeySymsPtr keySyms, CARD8 *modmap, XkbControlsPtr controls) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 15a96ca1a6b5e7ecdbe9f537885b580ebdbbdd9c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 16 23:56:22 2019 +0200 x2gokdrive.c: (in epyhrInitScreen) drop unneeded KdScreenPriv(pScreen) macro call. --- x2gokdrive.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index df13a63..0641cca 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -892,8 +892,6 @@ ephyrCreateColormap(ColormapPtr pmap) Bool ephyrInitScreen(ScreenPtr pScreen) { - KdScreenPriv(pScreen); - EPHYR_LOG("pScreen->myNum:%d\n", pScreen->myNum); pScreen->CreateColormap = ephyrCreateColormap; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 0371071fb22b3ab7c6dafe1421a96891d5c8bc66 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 00:02:36 2019 +0200 x2gokdrive.c: Fix "passing argument 2 of ‘addOutput’ discards ‘const’ qualifier from pointer target type" compiler warning. --- x2gokdrive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index 0641cca..dec4db3 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -800,6 +800,7 @@ ephyrRandRInit(ScreenPtr pScreen) KdScreenInfo *screen = pScreenPriv->screen; Rotation randr; EphyrScrPriv *scrpriv = screen->driver; + char output_name[]="X2GoKdrive-0"; scrpriv->virtualScreens=NULL; scrpriv->localRandrCall=FALSE; @@ -824,7 +825,7 @@ ephyrRandRInit(ScreenPtr pScreen) RRSetCurrentConfig(pScreen, randr, 0, pSize); - addOutput(pScreen,"X2GoKdrive-0", screen->width, screen->height, 0,0, TRUE, TRUE); + addOutput(pScreen, output_name, screen->width, screen->height, 0,0, TRUE, TRUE); return TRUE; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit df654fcddc4a75f6437686de68b260b25c4442ea Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 00:02:56 2019 +0200 x2gokdrive.c: Comment out EphyrKeyboardConfig() function. Obviously not needed. --- x2gokdrive.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index dec4db3..151b68d 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -1444,21 +1444,21 @@ EphyrKeyboardInit(KdKeyboardInfo * ki) return Success; } -static -void EphyrKeyboardConfig(KeySymsPtr keySyms, CARD8 *modmap, XkbControlsPtr controls) -{ - - ephyrKbd->minScanCode = keySyms->minKeyCode; - ephyrKbd->maxScanCode = keySyms->maxKeyCode; - XkbApplyMappingChange(ephyrKbd->dixdev, &keySyms, - keySyms->minKeyCode, - keySyms->maxKeyCode - keySyms->minKeyCode + 1, - modmap, serverClient); - XkbDDXChangeControls(ephyrKbd->dixdev, &controls, &controls); - free(keySyms->map); - - -} +//static +//void EphyrKeyboardConfig(KeySymsPtr keySyms, CARD8 *modmap, XkbControlsPtr controls) +//{ +// +// ephyrKbd->minScanCode = keySyms->minKeyCode; +// ephyrKbd->maxScanCode = keySyms->maxKeyCode; +// XkbApplyMappingChange(ephyrKbd->dixdev, &keySyms, +// keySyms->minKeyCode, +// keySyms->maxKeyCode - keySyms->minKeyCode + 1, +// modmap, serverClient); +// XkbDDXChangeControls(ephyrKbd->dixdev, &controls, &controls); +// free(keySyms->map); +// +// +//} static Status EphyrKeyboardEnable(KdKeyboardInfo * ki) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 74cd23b70c16775582040cf7f4b1f7d68e97c028 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 00:35:12 2019 +0200 Dissolve circular include dependency, fix RemoteHostVars declaration warnings. --- x2gokdriveremote.c | 5 +++-- x2gokdriveremote.h | 11 ++--------- x2gokdriveselection.c | 4 ++-- x2gokdriveselection.h | 5 +++-- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index da77595..963dfd9 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -35,9 +35,10 @@ #endif #include "x2gokdriveremote.h" +#include "x2gokdriveselection.h" -/*init it in os init*/ -static RemoteHostVars remoteVars; +/* init it in OsInit() */ +static struct _remoteHostVars remoteVars; static BOOL remoteInitialized=FALSE; diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index a97d486..221e4ac 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -88,9 +88,6 @@ #include <netdb.h> #include <arpa/inet.h> -#include "x2gokdriveselection.h" - - #define EPHYR_WANT_DEBUG 1 // #warning DEBUG ENABLED @@ -295,7 +292,7 @@ typedef struct }SelectionStructure; -struct RemoteHostVars +struct _remoteHostVars { unsigned char compression; OsTimerPtr checkConnectionTimer; @@ -371,11 +368,7 @@ struct RemoteHostVars BOOL client_initialized; SelectionStructure selstruct; -}; -typedef struct RemoteHostVars RemoteHostVars; - - - +} RemoteHostVars; int send_selection(int sel, char* data, uint32_t length, uint32_t mimeData); diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index a1dfaa8..33dba70 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -41,7 +41,7 @@ #include "propertyst.h" #include "xace.h" -RemoteHostVars *remoteVars; +static struct _remoteHostVars *remoteVars; static Atom atomPrimary, atomClipboard, atomTargets, atomString, atomUTFString, atomTimestamp; static Atom imageAtom=0; @@ -640,7 +640,7 @@ static int proc_change_property(ClientPtr client) return rc; } -void selection_init(struct RemoteHostVars *obj) +void selection_init(struct _remoteHostVars *obj) { EPHYR_DBG("INITIALIZING selections"); remoteVars=obj; diff --git a/x2gokdriveselection.h b/x2gokdriveselection.h index 829cad2..7ef53e2 100644 --- a/x2gokdriveselection.h +++ b/x2gokdriveselection.h @@ -27,10 +27,11 @@ #ifndef X2GOKDRIVESELECTION_H #define X2GOKDRIVESELECTION_H + #include "x2gokdriveremote.h" -void selection_init( struct RemoteHostVars* obj); -void install_selection_callbacks(void ); +void selection_init(struct _remoteHostVars *obj); +void install_selection_callbacks(void); int own_selection(int target); #endif /* X2GOKDRIVESELECTION_H */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit d197e257883ef7d5bc98aa9f8db73847181e385f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 00:43:12 2019 +0200 Spot more commented out code section and use double-slashes for commenting them out. --- x2gokdrive.c | 32 ++++++++++++++++---------------- x2gokdriveselection.c | 19 +++++++++---------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index 151b68d..306b828 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -100,21 +100,21 @@ ephyrScreenInitialize(KdScreenInfo *screen) EPHYR_DBG("Init screen"); -/* - if (EphyrWantGrayScale) - screen->fb.depth = 8; - if (screen->fb.depth && screen->fb.depth != 0) { - if (screen->fb.depth < 0 - && (screen->fb.depth == 24 || screen->fb.depth == 16 - || screen->fb.depth == 8)) { - scrpriv->server_depth = screen->fb.depth; - } - else - ErrorF - ("\nXephyr: requested screen depth not supported, setting to match hosts.\n"); - } -*/ +// if (EphyrWantGrayScale) +// screen->fb.depth = 8; +// +// if (screen->fb.depth && screen->fb.depth != 0) { +// if (screen->fb.depth < 0 +// && (screen->fb.depth == 24 || screen->fb.depth == 16 +// || screen->fb.depth == 8)) { +// scrpriv->server_depth = screen->fb.depth; +// } +// else +// ErrorF +// ("\nXephyr: requested screen depth not supported, setting to match hosts.\n"); +// } + screen->fb.depth = 24; screen->rate = 72; @@ -563,8 +563,8 @@ ephyrRandRSetConfig(ScreenPtr pScreen, pScrPriv = rrGetScrPriv(pScreen); EPHYR_DBG("RANDR SET CONFIG, LET'S CHECK OUR RANDR SETTINGS"); - /*EPHYR_DBG("OUTPUTS: %d, CRTCS: %d, SIZES: %d, MODES %d" , pScrPriv->numOutputs, - pScrPriv->numCrtcs, pScrPriv->nSizes, pScrPriv->outputs[0]->numModes);*/ +// EPHYR_DBG("OUTPUTS: %d, CRTCS: %d, SIZES: %d, MODES %d" , pScrPriv->numOutputs, +// pScrPriv->numCrtcs, pScrPriv->nSizes, pScrPriv->outputs[0]->numModes); if (pScrPriv->nSizes) { diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index 33dba70..fac738a 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -273,17 +273,16 @@ static BOOL find_image_atom(const Atom list[], size_t size) } -/* -static void listAtoms(const Atom list[], size_t size) -{ - size_t i; +//static void listAtoms(const Atom list[], size_t size) +//{ +// size_t i; +// +// for (i = 0;i < size;i++) +// { +// EPHYR_DBG("%d:%s", list[i], NameForAtom( list[i])); +// } +//} - for (i = 0;i < size;i++) - { - EPHYR_DBG("%d:%s", list[i], NameForAtom( list[i])); - } -} -*/ static Bool prop_has_atom(Atom atom, const Atom list[], size_t size) { size_t i; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit ba3e550648930b2d5ab31c14d3181d0aeedaa956 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 00:44:14 2019 +0200 x2gokdrive*.c: Declare and zero-define several more variables. --- x2gokdriveremote.c | 2 +- x2gokdriveselection.c | 49 +++++++++++++++++++++++-------------------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index 963dfd9..7b1da19 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -38,7 +38,7 @@ #include "x2gokdriveselection.h" /* init it in OsInit() */ -static struct _remoteHostVars remoteVars; +static struct _remoteHostVars remoteVars = {0}; static BOOL remoteInitialized=FALSE; diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index fac738a..6111ad9 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -41,12 +41,11 @@ #include "propertyst.h" #include "xace.h" -static struct _remoteHostVars *remoteVars; - -static Atom atomPrimary, atomClipboard, atomTargets, atomString, atomUTFString, atomTimestamp; -static Atom imageAtom=0; -static Atom atomJPEG, atomJPG; +static struct _remoteHostVars *remoteVars = NULL; +static Atom atomPrimary, atomClipboard, atomTargets, atomString, atomUTFString, atomTimestamp = {0}; +static Atom imageAtom = 0; +static Atom atomJPEG, atomJPG = {0}; static int (*proc_send_event_orig)(ClientPtr); static int (*proc_convert_selection_orig)(ClientPtr); @@ -131,7 +130,8 @@ int own_selection(int target) static int create_selection_window(void) { - int result; + int result = -1; + if(remoteVars->selstruct.clipWinPtr) return Success; @@ -158,9 +158,9 @@ static int create_selection_window(void) static void request_selection(Atom selection, Atom rtype) { - xEvent ev; - Selection *selPtr; - int rc; + xEvent ev = {0}; + Selection *selPtr = NULL; + int rc = -1; rc = create_selection_window(); if (rc != Success) @@ -224,7 +224,7 @@ static Atom find_atom_by_name(const char* name, const Atom list[], size_t size) static BOOL find_image_atom(const Atom list[], size_t size) { - Atom at; + Atom at = {0}; at=find_atom_by_name("image/jpg",list,size); if(at) { @@ -285,7 +285,7 @@ static BOOL find_image_atom(const Atom list[], size_t size) static Bool prop_has_atom(Atom atom, const Atom list[], size_t size) { - size_t i; + size_t i = 0; for (i = 0;i < size;i++) { if (list[i] == atom) @@ -300,7 +300,7 @@ static void process_selection(Atom selection, Atom target, TimeStamp time) { PropertyPtr prop; - int rc; + int rc = -1; rc = dixLookupProperty(&prop, remoteVars->selstruct.clipWinPtr, property, serverClient, DixReadAccess); @@ -439,21 +439,19 @@ static int convert_selection(ClientPtr client, Atom selection, Atom target, Atom property, Window requestor, CARD32 time) { - Selection *pSel; - WindowPtr pWin; - int rc; + Selection *pSel = NULL; + WindowPtr pWin = {0}; + int rc = -1; - Atom realProperty; + Atom realProperty = {0}; + xEvent event = {0}; - xEvent event; inputBuffer* buff=&remoteVars->selstruct.inSelection; if(selection==atomClipboard) buff=&remoteVars->selstruct.inClipboard; // EPHYR_DBG("Selection request for %s (type %s)", NameForAtom(selection), NameForAtom(target)); - - rc = dixLookupSelection(&pSel, selection, client, DixGetAttrAccess); if (rc != Success) return rc; @@ -525,9 +523,10 @@ static int convert_selection(ClientPtr client, Atom selection, static int proc_convert_selection(ClientPtr client) { Bool paramsOkay; - WindowPtr pWin; - Selection *pSel; - int rc; + WindowPtr pWin = {0}; + Selection *pSel = NULL; + int rc = -1; + REQUEST(xConvertSelectionReq); REQUEST_SIZE_MATCH(xConvertSelectionReq); rc = dixLookupWindow(&pWin, stuff->requestor, client, DixSetAttrAccess); @@ -569,11 +568,9 @@ static int proc_convert_selection(ClientPtr client) static int proc_change_property(ClientPtr client) { - int rc; + int rc = -1; BOOL incRead; - PropertyPtr prop; - - + PropertyPtr prop = {0}; REQUEST(xChangePropertyReq); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org