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.64 by root, Tue Apr 11 13:38:22 2006 UTC vs.
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC

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

Diff Legend

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