[Scummvm-devel] Merging the vkeybdy and GUI branches

[Max Horn]

Hi Stephen,

I just realized nobody really replied to this one. oops.

[...]

>> Now, I'd really like to hear from Stephen & Joost, respectively  
>> from Vicent
>> & Johannes, what the status of the respective branches are. What  
>> are in your
>> eyes the major blockers for a merge? Please tell us. That way, the  
>> rest of
>> the team can help actively.
>
> To re-iterate what Joost said the main issue at the moment is the
> circular dependencies between 'backends' and 'common', and, 'backends'
> and 'graphics', requiring a hack in Makefile.common. As far as I
> remember, a way to resolve this would be to move the vkeybd stuff to a
> separate module. If this is the approach to take, I will need some
> guidance to set this up.

I could look into this. But actually, with latest SVN (I just  
performed a merge on your module, BTW), I can not reproduce this. That  
is, I removed your extra graphics & common dirs, and it linked just  
fine, both on Mac OS X and Linux...

Can you please confirm whether the issue still exists for you, and  
then tell me the exact error(s) ?

>
>
>> For the vkeybdy branch:
>> * which functionality is missing?
>
> The core functionality is all complete. I will implement the
> compilation flags to enable/disable the vkeybd and keymapper over the
> next day or so. As far as documentation goes, is it best to put this
> on the wiki? If so I guess I need a wiki account.

Yes, on the Wiki. Email me with your desired username & email, and  
I'll set you up.

>
>
>> * do we have a proper *free* graphics pack yet?
>
> There is a free graphics pack but it is not very good quality. I was
> going to start creating one myself after I have got the more important
> work done. In terms of style, would it be a good idea to match the
> green & black style of ScummVM's default GUI theme?

Actually, the default is not the green & black but rather the "modern"  
theme. :) Which is yellow & red. But ideally, we'd have keyboard maps  
for both -- possibly bundled with the theme files.

Anyway, as long as we have at least *some* graphics pack, this is no  
blocker. After all, no regressions are introduced (compare this with  
the GUI branch, which modifies existing functionality, so we have to  
watch out for regressions).


>
>
>> * did anybody perform testing on a device which might actually  
>> benefit from
>> it?
>
> This is probably the main issue with the branch at the moment. I do
> own a iPod touch and am in the process of setting up the toolchain to
> compile and test my branch on this. I realize that the iPhone port
> provides its own vkeybd, but at least this will test the performance
> on such a device.

Great. Maybe vinterstum can provide some help, too.

>
>
> As far as other devices it would be great for the ScummVM porters to
> get involved and try out my branch.

The same holds for the GUI branch, actually.

For the GUI branch, that means we have to test it on some small  
devices. Like WinCE, or anything else people have. NDS would be  
cool... Really, we need testers!!! Anybody here got any hardware and  
cross compiler setup ready that would allow some simple testing of the  
new GUI code? Like, whether it starts, and whether it feels sluggish  
or snappy... Trivial to test. Even the iPhone port would be a good  
start for testing, even if it's not that low-end...



>> * as with the GUI branch: did you recently perform a merge? If not,  
>> can you
>> do one, please?
>
> I performed a merge earlier and resolved the conflicts. But, when
> trying to compile I received the following error:
[...]
> I have no idea what is going on here!

Hmm, I just performed a merge against trunk, and compiled afterwards,  
no problems. Has the Kyra issue been fixed since your original mail?


> So to summarise, I guess the branch is not in the best state to be
> merged at the moment, but I will try the get these issues sorted ASAP.
> If you would prefer to go ahead and merge the GUI branch first then I
> would not object to that - your call!

Actually, yeah, we might merge GUI first, if it gets into a good shape  
soon.


Bye,
Max