ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.75 by root, Tue Apr 11 20:44:49 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10our $FOCUS; # the widget with current focus
11#our @ACTIVE_WIDGETS;
12
13# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { }
18 80
19sub new { 81sub new {
20 my $class = shift; 82 my $class = shift;
21 83
22 bless { @_ }, $class 84 bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class
23} 92}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36 93
37sub move { 94sub move {
38 my ($self, $x, $y, $z) = @_; 95 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 96 $self->{x} = $x;
40 $self->{y} = $y; 97 $self->{y} = $y;
… …
44sub needs_redraw { 101sub needs_redraw {
45 0 102 0
46} 103}
47 104
48sub size_request { 105sub size_request {
106 require Carp;
49 die "size_request is abtract"; 107 Carp::confess "size_request is abtract";
108}
109
110sub _size_allocate {
111 my ($self, $x, $y, $w, $h) = @_;
112
113 $self->{x} = $x;
114 $self->{y} = $y;
115
116 return unless $self->{w} != $w || $self->{h} != $h;
117
118 $self->{w} = $w;
119 $self->{h} = $h;
120
121 1
122}
123
124sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_;
126
127 $self->_size_allocate ($x, $y, $w, $h);
128}
129
130# translate global koordinates to local coordinate system
131sub translate {
132 my ($self, $x, $y) = @_;
133
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 135}
51 136
52sub focus_in { 137sub focus_in {
53 my ($widget) = @_; 138 my ($self) = @_;
54 $FOCUS = $widget; 139
140 return if $FOCUS == $self;
141
142 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus;
144 $FOCUS->update;
55} 145}
56 146
57sub focus_out { 147sub focus_out {
58 my ($widget) = @_; 148 my ($self) = @_;
59}
60 149
150 return unless $FOCUS == $self;
151
152 my $focus = $FOCUS; undef $FOCUS;
153 $focus->update if $focus; #?
154}
155
156sub mouse_motion { }
157sub button_up { }
61sub key_down { 158sub key_down { }
62 my ($widget, $sdlev) = @_;
63}
64
65sub key_up { 159sub key_up { }
66 my ($widget, $sdlev) = @_;
67}
68 160
69sub button_down { 161sub button_down {
70 my ($widget, $sdlev) = @_; 162 my ($self, $ev, $x, $y) = @_;
71}
72 163
73sub button_up { 164 $self->focus_in;
74 my ($widget, $sdlev) = @_;
75} 165}
76 166
77sub w { $_[0]->{w} } 167sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
78sub h { $_[0]->{h} } 168sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 169sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 170sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 171sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 172
83sub draw { 173sub draw {
84 my ($self) = @_; 174 my ($self) = @_;
175
176 return unless $self->{h} && $self->{w};
85 177
86 glPushMatrix; 178 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 179 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 180 $self->_draw;
89 glPopMatrix; 181 glPopMatrix;
182
183 if ($self == $HOVER) {
184 my ($x, $y) = @$self{qw(x y)};
185
186 glColor 1, 1, 1, 0.1;
187 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS;
190 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y;
192 glVertex $x + $self->{w}, $y + $self->{h};
193 glVertex $x , $y + $self->{h};
194 glEnd;
195 glDisable GL_BLEND;
196 }
90} 197}
91 198
92sub _draw { 199sub _draw {
93 my ($widget) = @_; 200 my ($self) = @_;
201
202 warn "no draw defined for $self\n";
94} 203}
95 204
96sub bbox { 205sub bbox {
97 my ($self) = @_; 206 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 207 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 211 $self->{x} = $w,
103 $self->{y} = $h 212 $self->{y} = $h
104 ) 213 )
105} 214}
106 215
216sub find_widget {
217 my ($self, $x, $y) = @_;
218
219 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222
223 ()
224}
225
107sub del_parent { $_[0]->{parent} = undef } 226sub del_parent { $_[0]->{parent} = undef }
108 227
109sub set_parent { 228sub set_parent {
110 my ($self, $par) = @_; 229 my ($self, $par) = @_;
111 230
… …
122 241
123 $self->{parent}->update 242 $self->{parent}->update
124 if $self->{parent}; 243 if $self->{parent};
125} 244}
126 245
246sub connect {
247 my ($self, $signal, $cb) = @_;
248
249 push @{ $self->{cb}{$signal} }, $cb;
250}
251
252sub emit {
253 my ($self, $signal, @args) = @_;
254
255 $_->($self, @args)
256 for @{$self->{cb}{$signal} || []};
257}
258
127sub DESTROY { 259sub DESTROY {
128 my ($self) = @_; 260 my ($self) = @_;
129 261
130 #$self->deactivate; 262 #$self->deactivate;
131} 263}
132 264
133package Crossfire::Client::Widget::Bin; 265#############################################################################
134 266
135our @ISA = Crossfire::Client::Widget::; 267package CFClient::UI::DrawBG;
136 268
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 269our @ISA = CFClient::UI::Base::;
138 270
139sub get { $_[0]->{child} } 271use strict;
272use SDL::OpenGL;
273
274sub new {
275 my $class = shift;
276
277 # range [value, low, high, page]
278
279 $class->SUPER::new (
280 bg => [0, 0, 0, 0.4],
281 active_bg => [1, 1, 1],
282 @_
283 )
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 my ($w, $h) = @$self{qw(w h)};
290
291 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
292 glBegin GL_QUADS;
293 glVertex 0 , 0;
294 glVertex 0 , $h;
295 glVertex $w, $h;
296 glVertex $w, 0;
297 glEnd;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
319 my ($class, %arg) = @_;
320
321 my $children = delete $arg{children} || [];
322
323 my $self = $class->SUPER::new (children => [], %arg);
324 $self->add ($_) for @$children;
325
326 $self
327}
328
329sub add {
330 my ($self, $chld, $expand) = @_;
331
332 $chld->{expand} = $expand;
333 $chld->set_parent ($self);
334
335 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld
338 ];
339
340 $self->{w} = $self->{h} = -1;
341 $self->update;
342}
140 343
141sub remove { 344sub remove {
142 my ($self, $chld) = @_; 345 my ($self, $widget) = @_;
143 delete $self->{child} 346
144 if $self->{child} == $chld; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348
349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
145} 350}
351
352sub find_widget {
353 my ($self, $x, $y) = @_;
354
355 $x -= $self->{x};
356 $y -= $self->{y};
357
358 my $res;
359
360 for (reverse @{ $self->{children} }) {
361 $res = $_->find_widget ($x, $y)
362 and return $res;
363 }
364
365 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
366}
367
368sub _draw {
369 my ($self) = @_;
370
371 $_->draw for @{$self->{children}};
372}
373
374#############################################################################
375
376package CFClient::UI::Bin;
377
378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
404
405sub child { $_[0]->{children}[0] }
146 406
147sub size_request { 407sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 408 $_[0]{children}[0]->size_request
409}
410
411sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_;
413
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
417}
418
419#############################################################################
420
421package CFClient::UI::Window;
422
423our @ISA = CFClient::UI::Bin::;
424
425use SDL::OpenGL;
426
427sub new {
428 my ($class, %arg) = @_;
429
430 my $self = $class->SUPER::new (%arg);
431}
432
433sub update {
434 my ($self) = @_;
435
436 # we want to do this delayed...
437 $self->render_chld;
438 $self->SUPER::update;
439}
440
441sub render_chld {
442 my ($self) = @_;
443
444 $self->{texture} =
445 CFClient::Texture->new_from_opengl (
446 $self->{w}, $self->{h}, sub { $self->child->draw }
447 );
448}
449
450sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_;
452
453 $self->_size_allocate ($x, $y, $w, $h) or return;
454
455 $self->child->size_allocate (0, 0, $w, $h);
456
457 $self->render_chld;
149} 458}
150 459
151sub _draw { 460sub _draw {
152 my ($self) = @_; 461 my ($self) = @_;
153 462
154 $self->{child}->draw; 463 my ($w, $h) = ($self->w, $self->h);
155}
156
157package Crossfire::Client::Widget::Toplevel;
158
159our @ISA = Crossfire::Client::Widget::;
160
161use SDL::OpenGL;
162
163sub add {
164 my ($self, $chld) = @_;
165
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld;
215}
216
217sub render_chld {
218 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221
222 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw }
225 );
226 $self->{texture}->upload;
227}
228
229sub size_request {
230 my ($self) = @_;
231 my $chld = $self->get
232 or return (0, 0);
233 $chld->size_request
234}
235
236sub _draw {
237 my ($self) = @_;
238
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
240 464
241 my $tex = $self->{texture} 465 my $tex = $self->{texture}
242 or return; 466 or return;
243 467
244 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
245 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
247 glBindTexture GL_TEXTURE_2D, $tex->{name};
248 472
249 glBegin GL_QUADS; 473 $tex->draw_quad (0, 0, $w, $h);
250 glTexCoord 0, 0; glVertex 0, 0;
251 glTexCoord 0, 1; glVertex 0, $h;
252 glTexCoord 1, 1; glVertex $w, $h;
253 glTexCoord 1, 0; glVertex $w, 0;
254 glEnd;
255 474
256 glDisable GL_BLEND; 475 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
258} 477}
259 478
260package Crossfire::Client::Widget::Frame; 479#############################################################################
261 480
262our @ISA = Crossfire::Client::Widget::Bin::; 481package CFClient::UI::Frame;
482
483our @ISA = CFClient::UI::Bin::;
263 484
264use SDL::OpenGL; 485use SDL::OpenGL;
265 486
266sub size_request { 487sub size_request {
267 my ($self) = @_; 488 my ($self) = @_;
268 my $chld = $self->get 489 my $chld = $self->child
269 or return (0, 0); 490 or return (0, 0);
270 491
271 $chld->move (2, 2); 492 $chld->move (2, 2);
272 493
273 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
274} 495}
275 496
497sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_;
499
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
503}
504
276sub _draw { 505sub _draw {
277 my ($self) = @_; 506 my ($self) = @_;
278 507
279 my $chld = $self->get; 508 my $chld = $self->child;
280 509
281 my ($w, $h) = $chld->size_request; 510 my ($w, $h) = $chld->size_request;
282 511
283 glBegin GL_QUADS; 512 glBegin GL_QUADS;
284 glColor 0, 0, 0; 513 glColor 0, 0, 0;
285 glTexCoord 0, 0; glVertex 0 , 0; 514 glVertex 0 , 0;
286 glTexCoord 0, 1; glVertex 0 , $h + 4; 515 glVertex 0 , $h + 4;
287 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 516 glVertex $w + 4 , $h + 4;
288 glTexCoord 1, 0; glVertex $w + 4 , 0; 517 glVertex $w + 4 , 0;
289 glEnd; 518 glEnd;
290 519
291 $chld->draw; 520 $chld->draw;
292} 521}
293 522
523#############################################################################
524
294package Crossfire::Client::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
295 526
296our @ISA = Crossfire::Client::Widget::Frame::; 527our @ISA = CFClient::UI::Bin::;
297 528
298use SDL::OpenGL; 529use SDL::OpenGL;
299 530
300sub new { 531my @tex =
301 my ($self, $theme) = @_;
302 $self = $self->SUPER::new;
303
304 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
307 ];
308 $self
309
310}
311 534
312sub size_request { 535sub size_request {
313 my ($self) = @_; 536 my ($self) = @_;
537
314 my ($w, $h) = $self->get->size_request; 538 my ($w, $h) = $self->SUPER::size_request;
315 539
316 $h += $self->{txts}->[1]->{height}; 540 $h += $tex[1]->{h};
317 $h += $self->{txts}->[4]->{height}; 541 $h += $tex[4]->{h};
318 $w += $self->{txts}->[2]->{width}; 542 $w += $tex[2]->{w};
319 $w += $self->{txts}->[3]->{width}; 543 $w += $tex[3]->{w};
320
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322 544
323 ($w, $h) 545 ($w, $h)
324} 546}
325 547
548sub size_allocate {
549 my ($self, $x, $y, $w, $h) = @_;
550
551 $self->_size_allocate ($x, $y, $w, $h) or return;
552
553 $h -= $tex[1]->{h};
554 $h -= $tex[4]->{h};
555 $w -= $tex[2]->{w};
556 $w -= $tex[3]->{w};
557
558 $h = $h < 0 ? 0 : $h;
559 $w = $w < 0 ? 0 : $w;
560
561 my $child = $self->child;
562
563 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
564}
565
326sub _draw { 566sub _draw {
327 my ($self) = @_; 567 my ($self) = @_;
328 568
329 my ($w, $h) = $self->size_request; 569 my ($w, $h) = ($self->{w}, $self->{h});
330 my ($cw, $ch) = $self->get->size_request; 570 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
331 571
332 glEnable GL_BLEND; 572 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
333 glEnable GL_TEXTURE_2D; 574 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336 576
337
338 my $top = $self->{txts}->[1]; 577 my $top = $tex[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name}; 578 $top->draw_quad (0, 0, $w, $top->{h});
340 579
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd;
349
350 my $left = $self->{txts}->[3]; 580 my $left = $tex[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name}; 581 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
352 582
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd;
361
362 my $right = $self->{txts}->[2]; 583 my $right = $tex[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name}; 584 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
364 585
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd;
373
374 my $bottom = $self->{txts}->[4]; 586 my $bottom = $tex[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 587 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
376 588
377 glColor 1, 1, 1, 0.8; 589 my $bg = $tex[0];
378
379 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd;
385
386 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name}; 590 glBindTexture GL_TEXTURE_2D, $bg->{name};
591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 592 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 593 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390 594
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width}; 595 my $rep_x = $cw / $bg->{w};
394 my $rep_y = $ch / $bg->{height}; 596 my $rep_y = $ch / $bg->{h};
395 597
396 glBegin GL_QUADS; 598 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd;
402
403 $self->get->draw;
404 599
405 glDisable GL_BLEND; 600 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 601 glDisable GL_TEXTURE_2D;
407}
408 602
409package Crossfire::Client::Widget::Table; 603 $self->child->draw;
410 604
411our @ISA = Crossfire::Client::Widget::Bin::; 605}
606
607#############################################################################
608
609package CFClient::UI::Table;
610
611our @ISA = CFClient::UI::Base::;
612
613use List::Util qw(max sum);
412 614
413use SDL::OpenGL; 615use SDL::OpenGL;
414 616
415sub add { 617sub add {
416 my ($self, $x, $y, $chld) = @_; 618 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x];
418 619
419 $self->{childs}[$y][$x] = $chld; 620 $self->{children}[$y][$x] = $chld;
420 $chld->set_parent ($self); 621 $chld->set_parent ($self);
622
623 $self->{w} = $self->{h} = -1;
421 $self->update; 624 $self->update;
422} 625}
423 626
424sub max_row_height { 627sub get_wh {
425 my ($self, $row) = @_; 628 my ($self) = @_;
426 629
427 my $hs = 0; 630 my (@w, @h);
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 631
429 my $c = $self->{childs}->[$row]->[$xi]; 632 for my $y (0 .. $#{$self->{children}}) {
430 if ($c) { 633 my $row = $self->{children}[$y]
634 or next;
635
636 for my $x (0 .. $#$row) {
637 my $widget = $row->[$x]
638 or next;
431 my ($w, $h) = $c->size_request; 639 my ($w, $h) = $widget->size_request;
432 if ($hs < $h) { $hs = $h } 640
641 $w[$x] = max $w[$x], $w;
642 $h[$y] = max $h[$y], $h;
433 } 643 }
434 } 644 }
435 return $hs;
436}
437 645
438sub max_col_width { 646 (\@w, \@h)
647}
648
649sub size_request {
439 my ($self, $col) = @_; 650 my ($self) = @_;
440 651
652 my ($ws, $hs) = $self->get_wh;
653
654 (
655 (List::Util::sum @$ws),
656 (List::Util::sum @$hs),
657 )
658}
659
660sub size_allocate {
661 my ($self, $x, $y, $w, $h) = @_;
662
663 $self->_size_allocate ($x, $y, $w, $h) or return;
664
665 my ($ws, $hs) = $self->get_wh;
666
667 my $req_w = List::Util::sum @$ws;
668 my $req_h = List::Util::sum @$hs;
669
670 # linearly scale sizes
671 $_ *= $req_w / $w for @$ws;
672 $_ *= $req_h / $h for @$hs;
673
674 my $y;
675
676 for my $r (0 .. $#{$self->{children}}) {
677 my $row = $self->{children}[$r]
678 or next;
679
441 my $ws = 0; 680 my $x = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 681 my $row_h = $hs->[$r];
443 my $c = ($self->{childs}->[$yi] || [])->[$col]; 682
444 if ($c) { 683 for my $c (0 .. $#$row) {
445 my ($w, $h) = $c->size_request; 684 my $widget = $row->[$c]
446 if ($ws < $w) { $ws = $w } 685 or next;
686
687 my $col_w = $ws->[$c];
688
689 $widget->size_allocate ($x, $y, $col_w, $row_h);
690
691 $x += $col_w;
447 } 692 }
693
694 $y += $row_h;
448 } 695 }
449 return $ws; 696
450} 697}
698
699sub _draw {
700 my ($self) = @_;
701
702 for (grep $_, @{$self->{children}}) {
703 $_->draw for grep $_, @$_;
704 }
705}
706
707#############################################################################
708
709package CFClient::UI::VBox;
710
711our @ISA = CFClient::UI::Container::;
712
713use SDL::OpenGL;
451 714
452sub size_request { 715sub size_request {
453 my ($self) = @_; 716 my ($self) = @_;
454 717
455 my ($hs, $ws) = (0, 0); 718 my @alloc = map [$_->size_request], @{$self->{children}};
456 719
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
458 $hs += $self->max_row_height ($yi);
459 } 720 (
721 (List::Util::max map $_->[0], @alloc),
722 (List::Util::sum map $_->[1], @alloc),
723 )
724}
460 725
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 726sub size_allocate {
462 my $wm = 0; 727 my ($self, $x, $y, $w, $h) = @_;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 728
464 $wm += $self->max_col_width ($xi) 729 $self->_size_allocate ($x, $y, $w, $h) or return;
730
731 return unless $self->{h};
732
733 my $children = $self->{children};
734
735 my @h = map +($_->size_request)[1], @$children;
736
737 my $req_h = List::Util::sum @h;
738
739 if ($req_h > $h) {
740 # ah well, not enough space
741 $_ = $h[$_] * $h / $req_h for @h;
742 } else {
743 my @exp = grep $_->{expand}, @$children;
744 @exp = @$children unless @exp;
745
746 my %exp = map +($_ => 1), @exp;
747
748 for (0 .. $#$children) {
749 my $child = $children->[$_];
750
751 my $alloc_h = $h[$_];
752 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
753 $h[$_] = $alloc_h;
465 } 754 }
466 if ($ws < $wm) { $ws = $wm }
467 } 755 }
468
469 return ($ws, $hs);
470}
471
472sub _draw {
473 my ($self) = @_;
474 756
475 my $y = 0; 757 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 758 for (0 .. $#$children) {
759 my $child = $children->[$_];
477 my $x = 0; 760 my $h = $h[$_];
761 $child->size_allocate (0, $y, $w, $h);
478 762
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 763 $y += $h;
480
481 my $c = $self->{childs}->[$yi]->[$xi];
482 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c;
485 }
486
487 $x += $self->max_col_width ($xi);
488 }
489
490 $y += $self->max_row_height ($yi);
491 } 764 }
492} 765}
493 766
494package Crossfire::Client::Widget::VBox; 767#############################################################################
495 768
496our @ISA = Crossfire::Client::Widget::Bin::; 769package CFClient::UI::Label;
770
771our @ISA = CFClient::UI::Base::;
497 772
498use SDL::OpenGL; 773use SDL::OpenGL;
499 774
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request {
508 my ($self) = @_;
509
510 my ($hs, $ws) = (0, 0);
511 for (@{$self->{childs} || []}) {
512 my ($w, $h) = $_->size_request;
513 $hs += $h;
514 if ($ws < $w) { $ws = $w }
515 }
516
517 return ($ws, $hs);
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) {
525 $_->move (0, $y, 0); #TODO: move to size_request
526 $_->draw;
527 my ($w, $h) = $_->size_request;
528 $y += $h;
529 }
530}
531
532package Crossfire::Client::Widget::Label;
533
534our @ISA = Crossfire::Client::Widget::;
535
536use SDL::OpenGL;
537
538sub new { 775sub new {
539 my ($class, $x, $y, $z, $height, $text) = @_; 776 my ($class, %arg) = @_;
540 777
541 # TODO: color, and make height, xyz etc. optional 778 my $self = $class->SUPER::new (
542 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 779 fg => [1, 1, 1],
780 height => $::FONTSIZE,
781 text => "",
782 align => -1,
783 layout => new CFClient::Layout,
784 %arg
785 );
543 786
544 $self->set_text ($text); 787 $self->set_text ($self->{text});
545 788
546 $self 789 $self
790}
791
792sub escape_text {
793 local $_ = $_[1];
794
795 s/&/&amp;/g;
796 s/>/&gt;/g;
797 s/</&lt;/g;
798
799 $_[1]
547} 800}
548 801
549sub set_text { 802sub set_text {
550 my ($self, $text) = @_; 803 my ($self, $text) = @_;
551 804
552 $self->{text} = $text; 805 $self->{text} = $text;
553 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 806 $self->{layout}->set_markup ($text);
554 807
808 delete $self->{texture};
555 $self->update; 809 $self->update;
556} 810}
557 811
558sub get_text { 812sub get_text {
559 my ($self, $text) = @_; 813 my ($self, $text) = @_;
… …
562} 816}
563 817
564sub size_request { 818sub size_request {
565 my ($self) = @_; 819 my ($self) = @_;
566 820
567 ( 821 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height});
823 $self->{layout}->size
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
825# (
568 $self->{texture}{width}, 826# $self->{texture}{w},
569 $self->{texture}{height}, 827# $self->{texture}{h},
570 ) 828# )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834}
835
836sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_;
838
839 $self->_size_allocate ($x, $y, $w, $h) or return;
840
841 delete $self->{texture};
842}
843
844sub update {
845 my ($self) = @_;
846
847 delete $self->{texture};
848 $self->SUPER::update;
571} 849}
572 850
573sub _draw { 851sub _draw {
574 my ($self) = @_; 852 my ($self) = @_;
575 853
576 my $tex = $self->{texture}; 854 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w});
856 new_from_layout CFClient::Texture $self->{layout}
857 };
577 858
578 glEnable GL_BLEND; 859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name};
583 863
584 glColor 1, 1, 1, 0.6; # TODO color 864 glColor @{$self->{fg}};
585 865
586 glBegin GL_QUADS; 866 my $x =
587 glTexCoord 0, 0; glVertex 0 , 0; 867 $self->{align} < 0 ? 0
588 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 868 : $self->{align} > 0 ? $self->{w} - $tex->{w}
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 869 : ($self->{w} - $tex->{w}) * 0.5;
590 glTexCoord 1, 0; glVertex $tex->{width}, 0;
591 glEnd;
592 870
871 $tex->draw_quad ($x, 0);
872
873 glDisable GL_TEXTURE_2D;
593 glDisable GL_BLEND; 874 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D;
595} 875}
596 876
597package Crossfire::Client::Widget::TextEntry; 877#############################################################################
598 878
879package CFClient::UI::Entry;
880
599our @ISA = Crossfire::Client::Widget::Label::; 881our @ISA = CFClient::UI::Label::;
600 882
601use SDL; 883use SDL;
602use SDL::OpenGL; 884use SDL::OpenGL;
603 885
886sub new {
887 my $class = shift;
888
889 $class->SUPER::new (
890 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4],
892 active_bg => [1, 1, 1],
893 active_fg => [0, 0, 0],
894 @_
895 )
896}
897
898sub _set_text {
899 my ($self, $text) = @_;
900
901 $self->{last_activity} = $::NOW;
902
903 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w});
905
906 $text =~ s/./*/g if $self->{hidden};
907
908
909 $self->{layout}->set_markup ($self->escape_text ($text));
910
911 $text = substr $text, 0, $self->{cursor};
912 utf8::encode $text;
913
914 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
915}
916
917sub size_request {
918 my ($self) = @_;
919
920 my ($w, $h) = $self->SUPER::size_request;
921
922 ($w + 1, $h) # add 1 for cursor
923}
924
925sub size_allocate {
926 my ($self, $x, $y, $w, $h) = @_;
927
928 $self->SUPER::size_allocate ($x, $y, $w, $h);
929
930 $self->_set_text ($self->{text});
931}
932
933sub set_text {
934 my ($self, $text) = @_;
935
936 $self->{cursor} = length $text;
937 $self->_set_text ($text);
938 $self->update;
939}
940
604sub key_down { 941sub key_down {
605 my ($self, $ev) = @_; 942 my ($self, $ev) = @_;
606 943
607 my $mod = $ev->key_mod; 944 my $mod = $ev->key_mod;
608 my $sym = $ev->key_sym; 945 my $sym = $ev->key_sym;
609 946
610 $ev->set_unicode (1);
611 my $uni = $ev->key_unicode; 947 my $uni = $ev->key_unicode;
612 948
613 my $text = $self->get_text; 949 my $text = $self->get_text;
614 950
615 if ($sym == SDLK_BACKSPACE) { 951 if ($sym == SDLK_BACKSPACE) {
616 substr $text, -1, 1, ''; 952 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
617 953 } elsif ($sym == SDLK_DELETE) {
954 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text};
618 } elsif ($uni) { 959 } elsif ($uni) {
619 $text .= chr $uni; 960 substr $text, $self->{cursor}++, 0, chr $uni;
620 } 961 }
962
621 $self->set_text ($text); 963 $self->_set_text ($text);
964 $self->update;
622} 965}
623 966
967sub focus_in {
968 my ($self) = @_;
624 969
625# XXX: TextView isn't neccessary with pango multiline text rendering 970 $self->{last_activity} = $::NOW;
626package Crossfire::Client::Widget::TextView; 971
972 $self->SUPER::focus_in;
973}
974
975sub button_down {
976 my ($self, $ev, $x, $y) = @_;
977
978 $self->SUPER::button_down ($ev, $x, $y);
979
980 my $idx = $self->{layout}->xy_to_index ($x, $y);
981
982 # byte-index to char-index
983 my $text = $self->{layout};
984 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx;
986
987 $self->_set_text ($self->{text});
988 $self->update;
989}
990
991sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_;
993# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
994}
995
996sub _draw {
997 my ($self) = @_;
998
999 local $self->{fg} = $self->{fg};
1000
1001 if ($FOCUS == $self) {
1002 glColor @{$self->{active_bg}};
1003 $self->{fg} = $self->{active_fg};
1004 } else {
1005 glColor @{$self->{bg}};
1006 }
1007
1008 glBegin GL_QUADS;
1009 glVertex 0 , 0;
1010 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0;
1013 glEnd;
1014
1015 $self->SUPER::_draw;
1016
1017 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1019 glColor @{$self->{fg}};
1020 glBegin GL_LINES;
1021 glVertex $self->{cur_x}, $self->{cur_y};
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023 glEnd;
1024 }
1025}
1026
1027#############################################################################
1028
1029package CFClient::UI::Slider;
627 1030
628use strict; 1031use strict;
629 1032
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL; 1033use SDL::OpenGL;
633use SDL::OpenGL::Constants; 1034
1035our @ISA = CFClient::UI::DrawBG::;
1036
1037sub size_request {
1038 my ($self) = @_;
1039
1040 my $w = 50;
1041 my $h = 10;
1042
1043 $self->{vertical} ? ($h, $w) : ($w, $h)
1044}
634 1045
635sub new { 1046sub new {
636 my ($class, $text, $h) = @_; 1047 my $class = shift;
1048
1049 # range [value, low, high, page]
1050
637 my $self = $class->SUPER::new (); 1051 $class->SUPER::new (
638 1052 fg => [1, 1, 1],
639 $self->{txt_height} = $h; 1053 active_fg => [0, 0, 0],
640 @{$self->{lines}} = split /\r?\n/, $text; 1054 range => [0, 0, 100, 10],
641 1055 vertical => 1,
642 for (split /\r?\n/, $text) { 1056 @_
643 $self->add_line ($_);
644 } 1057 )
645 $self
646} 1058}
647 1059
648#sub render_lines { 1060sub button_down {
1061 my ($self, $ev, $x, $y) = @_;
1062
1063 $self->SUPER::button_down ($ev, $x, $y);
1064 $self->mouse_motion ($ev, $x, $y);
1065}
1066
1067sub mouse_motion {
1068 my ($self, $ev, $x, $y) = @_;
1069
1070 if ($GRAB == $self) {
1071 my ($value, $lo, $hi, $page) = @{$self->{range}};
1072
1073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074
1075 $x = $x * ($hi - $lo) / $w + $lo;
1076 $x = $lo if $x < $lo;
1077 $x = $hi - $page if $x > $hi - $page;
1078 $self->{range}[0] = $x;
1079
1080 $self->emit (changed => $x);
1081 $self->update;
1082 }
1083}
1084
1085sub _draw {
649# my ($self) = @_; 1086 my ($self) = @_;
650# 1087
651# $self->{txt_lines} = []; 1088 $self->SUPER::_draw ();
652# 1089
653# for (@{$self->{lines}}) { 1090 my ($w, $h) = @$self{qw(w h)};
654# push @{$self->{txt_lines}}, 1091
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_; 1092 if ($self->{vertical}) {
1093 # draw a vertical slider like a rotated horizontal slider
1094
1095 glRotate 90, 0, 0, 1;
1096 glTranslate 0, -$self->{w}, 0;
1097
1098 ($w, $h) = ($h, $w);
656# } 1099 }
657#}
658 1100
659sub add_line { 1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
660 my ($self, $line) = @_; 1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
661 push @{$self->{lines}}, $line;
662 1103
663 push @{$self->{txt_lines}}, 1104 my ($value, $lo, $hi, $page) = @{$self->{range}};
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666 1105
667sub size_request { 1106 $page = int $page * $w / ($hi - $lo);
668 my ($self) = @_; 1107 $value = int +($value - $lo) * $w / ($hi - $lo);
669 1108
670 my $w = 0; 1109 $w -= $page;
671 my $h = 0; 1110 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0;
672 1112
673 for (@{$self->{txt_lines}}) { 1113 glColor @$fg;
674 if ($w < $_->{width}) { $w = $_->{width} } 1114 glBegin GL_LINES;
675 $h += $_->{height}; 1115 glVertex 0, 0; glVertex 0, $h;
676 } 1116 glVertex $w - 1, 0; glVertex $w - 1, $h;
1117 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118 glEnd;
677 1119
678 return ($w, $h); 1120 my $knob_a = $value - $page * 0.5;
679} 1121 my $knob_b = $value + $page * 0.5;
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687 1122
688 glBegin GL_QUADS; 1123 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y; 1124 glColor @$fg;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; 1125 glVertex $knob_a, 0;
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; 1126 glVertex $knob_a, $h;
692 glTexCoord 1, 0; glVertex $tex->{width}, $y; 1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129
1130 if ($knob_a < $knob_b - 2) {
1131 glColor @$bg;
1132 glVertex $knob_a + 1, 1;
1133 glVertex $knob_a + 1, $h - 1;
1134 glVertex $knob_b - 1, $h - 1;
1135 glVertex $knob_b - 1, 1;
1136 }
693 glEnd; 1137 glEnd;
694} 1138}
695 1139
696sub _draw { 1140#############################################################################
697 my ($self) = @_;
698 1141
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711}
712
713package Crossfire::Client::Widget::MapWidget; 1142package CFClient::UI::MapWidget;
714 1143
715use strict; 1144use strict;
716 1145
717use List::Util qw(min max); 1146use List::Util qw(min max);
718 1147
719use SDL; 1148use SDL;
720use SDL::OpenGL; 1149use SDL::OpenGL;
721use SDL::OpenGL::Constants;
722 1150
723our @ISA = Crossfire::Client::Widget::; 1151our @ISA = CFClient::UI::Base::;
1152
1153sub new {
1154 my $class = shift;
1155
1156 $class->SUPER::new (
1157 z => -1,
1158 list => (glGenLists 1),
1159 @_
1160 )
1161}
724 1162
725sub key_down { 1163sub key_down {
726 print "MAPKEYDOWN\n"; 1164 print "MAPKEYDOWN\n";
727} 1165}
728 1166
729sub key_up { 1167sub key_up {
730} 1168}
731 1169
1170sub size_request {
1171 (
1172 1 + int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32,
1174 )
1175}
1176
1177sub update {
1178 my ($self) = @_;
1179
1180 $self->{need_update} = 1;
1181 $self->SUPER::update;
1182}
1183
732sub _draw { 1184sub _draw {
733 my ($self) = @_; 1185 my ($self) = @_;
734 1186
1187 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE;
1189
735 my $mx = $::CONN->{mapx}; 1190 my $mx = $::CONN->{mapx};
736 my $my = $::CONN->{mapy}; 1191 my $my = $::CONN->{mapy};
737 1192
738 my $map = $::CONN->{map}; 1193 my $map = $::CONN->{map};
739 1194
740 my ($xofs, $yofs); 1195 my ($xofs, $yofs);
741 1196
742 my $sw = 1 + int $::WIDTH / 32; 1197 my $sw = 1 + int $::WIDTH / 32;
743 my $sh = 1 + int $::HEIGHT / 32; 1198 my $sh = 1 + int $::HEIGHT / 32;
744 1199
745 if ($::CONN->{mapw} > $sw) { 1200 if ($::CONN->{mapw} > $sw) {
746 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
747 } else { 1202 } else {
748 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
749 } 1204 }
750 1205
751 if ($::CONN->{maph} > $sh) { 1206 if ($::CONN->{maph} > $sh) {
752 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1207 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
753 } else { 1208 } else {
754 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1209 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
755 } 1210 }
756 1211
757 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
758 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1214 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1215 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 1216
761 my $sw4 = ($sw + 3) & ~3; 1217 my $sw4 = ($sw + 3) & ~3;
762 my $lighting = "\x00" x ($sw4 * $sh); 1218 my $darkness = "\x00" x ($sw4 * $sh);
763 1219
764 for my $x (0 .. $sw - 1) { 1220 for my $x (0 .. $sw - 1) {
1221 my $row = $map->[$x + $xofs];
765 for my $y (0 .. $sh - 1) { 1222 for my $y (0 .. $sh - 1) {
766 1223
767 my $cell = $map->[$x + $xofs][$y + $yofs] 1224 my $cell = $row->[$y + $yofs]
768 or next; 1225 or next;
769 1226
770 my $darkness = $cell->[0] * (1 / 255); 1227 my $dark = $cell->[0];
771 if ($darkness < 0) { 1228 if ($dark < 0) {
772 $darkness = 0.15; 1229 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230 } else {
1231 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
773 } 1232 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
775 1233
776 for my $num (grep $_, @$cell[1,2,3]) { 1234 for my $num (grep $_, @$cell[1,2,3]) {
777 my $tex = $::CONN->{face}[$num]{texture} || next; 1235 my $tex = $::CONN->{face}[$num]{texture} || next;
1236
1237 my ($w, $h) = @$tex{qw(w h)};
778 1238
779 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1239 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
780
781 my $w = $tex->{width};
782 my $h = $tex->{height};
783
784 my $px = ($x + 1) * 32 - $w;
785 my $py = ($y + 1) * 32 - $h;
786
787 glBegin GL_QUADS;
788 glTexCoord 0, 0; glVertex $px , $py;
789 glTexCoord 0, 1; glVertex $px , $py + $h;
790 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
791 glTexCoord 1, 0; glVertex $px + $w, $py;
792 glEnd; 1240 }
793 } 1241 }
794 } 1242 }
795 }
796 1243
797# if (1) { # higher quality darkness 1244# if (1) { # higher quality darkness
798# $lighting =~ s/(.)/$1$1$1/gs; 1245# $lighting =~ s/(.)/$1$1$1/gs;
799# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1246# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
800# 1247#
… …
802# 1249#
803# $lighting = $pb->get_pixels; 1250# $lighting = $pb->get_pixels;
804# $lighting =~ s/(.)../$1/gs; 1251# $lighting =~ s/(.)../$1/gs;
805# } 1252# }
806 1253
807 $lighting = new Crossfire::Client::Texture
808 width => $sw4,
809 height => $sh,
810 data => $lighting,
811 internalformat => GL_ALPHA4,
812 format => GL_ALPHA;
813
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glColor 0, 0, 0, 0.75;
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
817 glBindTexture GL_TEXTURE_2D, $lighting->{name};
818 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
819 glBegin GL_QUADS;
820 glTexCoord 0, 0; glVertex 0 , 0;
821 glTexCoord 0, 1; glVertex 0 , $sh * 32;
822 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
823 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
824 glEnd;
825 1255
1256 $darkness = new CFClient::Texture
1257 w => $sw4,
1258 h => $sh,
1259 data => $darkness,
1260 internalformat => GL_ALPHA,
1261 format => GL_ALPHA;
1262
1263 glColor 0.45, 0.45, 0.45, 1;
1264 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
826 glDisable GL_TEXTURE_2D; 1266 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 1267 glDisable GL_BLEND;
1268
1269 glEndList;
1270 }
1271
1272 glCallList $self->{list};
828} 1273}
829 1274
830my %DIR = ( 1275my %DIR = (
831 SDLK_KP8, [1, "north"], 1276 SDLK_KP8, [1, "north"],
832 SDLK_KP9, [2, "northeast"], 1277 SDLK_KP9, [2, "northeast"],
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 1322 $::CONN->send ("command run_stop");
878 } 1323 }
879} 1324}
880 1325
881package Crossfire::Client::Widget::Animator; 1326#############################################################################
1327
1328package CFClient::UI::Animator;
882 1329
883use SDL::OpenGL; 1330use SDL::OpenGL;
884 1331
885our @ISA = Crossfire::Client::Widget::Bin::; 1332our @ISA = CFClient::UI::Bin::;
886 1333
887sub moveto { 1334sub moveto {
888 my ($self, $x, $y) = @_; 1335 my ($self, $x, $y) = @_;
889 1336
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1337 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 1338 $self->{speed} = 0.001;
892 $self->{time} = 1; 1339 $self->{time} = 1;
893 1340
894 ::animation_start $self; 1341 ::animation_start $self;
895} 1342}
896 1343
… …
911 1358
912sub _draw { 1359sub _draw {
913 my ($self) = @_; 1360 my ($self) = @_;
914 1361
915 glPushMatrix; 1362 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 1363 glRotate $self->{time} * 1000, 0, 1, 0;
917 $self->{child}->draw; 1364 $self->{children}[0]->draw;
918 glPopMatrix; 1365 glPopMatrix;
919} 1366}
920 1367
9211; 1368#############################################################################
922 1369
1370package CFClient::UI::Toplevel;
1371
1372our @ISA = CFClient::UI::Container::;
1373
1374sub size_request {
1375 ($::WIDTH, $::HEIGHT)
1376}
1377
1378sub size_allocate {
1379 my ($self, $x, $y, $w, $h) = @_;
1380
1381 $self->_size_allocate ($x, $y, $w, $h);
1382
1383 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384 for @{$self->{children}};
1385}
1386
1387sub translate {
1388 my ($self, $x, $y) = @_;
1389
1390 ($x, $y)
1391}
1392
1393sub update {
1394 my ($self) = @_;
1395
1396 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1397 ::refresh ();
1398}
1399
1400sub add {
1401 my ($self, $widget) = @_;
1402
1403 $self->SUPER::add ($widget);
1404
1405 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1406}
1407
1408sub draw {
1409 my ($self) = @_;
1410
1411 $self->_draw;
1412}
1413
1414#############################################################################
1415
1416package CFClient::UI;
1417
1418$TOPLEVEL = new CFClient::UI::Toplevel;
1419
14201
1421

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines