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

Diff Legend

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