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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
19 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
20sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
21 if (!$GRAB) { 47 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
26 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
27 54
28 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
29 56
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 58
32 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 60 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
153sub rescale_widgets { 171sub rescale_widgets {
154 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
155 173
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167 } 190 }
168 191
169 reconfigure_widgets; 192 reconfigure_widgets;
170} 193}
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 263
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
225 }, 265
226 ); 266 $_->set_visible for $self->children;
227} 267}
228 268
229sub set_invisible { 269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
231 271
232 # broken show/hide model 272 return unless $self->{visible};
233 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
234 delete $self->{visible}; 277 delete $self->{visible};
235 278
236 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
238 281
239 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
241 284
242 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
243} 305}
244 306
245sub hide { 307sub hide {
246 my ($self) = @_; 308 my ($self) = @_;
247 309
249 311
250 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
251 if $self->{parent}; 313 if $self->{parent};
252} 314}
253 315
254sub move { 316sub move_abs {
255 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
256 318
257 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
258 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
259 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
260 322
261 $self->update; 323 $self->update;
262} 324}
263 325
264sub set_size { 326sub set_size {
265 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
266 328
267 $self->{user_w} = $w; 329 $self->{force_w} = $w;
268 $self->{user_h} = $h; 330 $self->{force_h} = $h;
269 331
270 $self->check_size; 332 $self->realloc;
271} 333}
272 334
273sub size_request { 335sub size_request {
274 require Carp; 336 require Carp;
275 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
277 339
278sub configure { 340sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
280 342
281 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
284 348
285 # use alignment to adjust x, y 349 # use alignment to adjust x, y
286 350
287 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 353 }
292 354
293 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 356 $self->{x} = $x;
295 $self->{y} = $y; 357 $self->{y} = $y;
296 $self->update; 358 $self->update;
297 } 359 }
298 360
299 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
301 } 368 }
302} 369}
303 370
304sub size_allocate { 371sub size_allocate {
305 # nothing to be done 372 # nothing to be done
306} 373}
307 374
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
316} 381}
317 382
318sub set_max_size { 383sub set_max_size {
319 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
320 385
379 444
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS; 446 unless $FOCUS;
382} 447}
383 448
384sub mouse_motion { } 449sub mouse_motion { 0 }
385sub button_up { } 450sub button_up { 0 }
386sub key_down { } 451sub key_down { 0 }
387sub key_up { } 452sub key_up { 0 }
388 453
389sub button_down { 454sub button_down {
390 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
391 456
392 $self->focus_in; 457 $self->focus_in;
393}
394 458
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
399sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
400 535
401sub draw { 536sub draw {
402 my ($self) = @_; 537 my ($self) = @_;
403 538
404 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
405 550
406 glPushMatrix; 551 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw; 553 $self->_draw;
409 glPopMatrix; 554 glPopMatrix;
421 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
422 glEnd; 567 glEnd;
423 glDisable GL_BLEND; 568 glDisable GL_BLEND;
424 } 569 }
425 570
426 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 572 glPushMatrix;
428 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 576 glVertex 0 , 0;
442 my ($self) = @_; 587 my ($self) = @_;
443 588
444 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
445} 590}
446 591
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 592sub DESTROY {
508 my ($self) = @_; 593 my ($self) = @_;
509 594
510 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
511 #$self->deactivate; 596 #$self->deactivate;
567 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
569} 654}
570 655
571sub size_request { 656sub size_request {
572 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
573} 660}
574 661
575sub draw { } 662sub draw { }
576 663
577############################################################################# 664#############################################################################
581our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
582 669
583sub new { 670sub new {
584 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
585 672
586 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
587 674
588 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
589 children => [], 676 children => [],
590 can_events => 0, 677 can_events => 0,
591 %arg, 678 %arg,
592 ); 679 );
680
593 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
594 683
595 $self 684 $self
596} 685}
597 686
598sub add { 687sub add {
606 $self->{children} = [ 695 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
609 ]; 698 ];
610 699
611 $self->check_size (1); 700 $self->realloc;
612 $self->update;
613} 701}
614 702
615sub children { 703sub children {
616 @{ $_[0]{children} } 704 @{ $_[0]{children} }
617} 705}
622 delete $child->{parent}; 710 delete $child->{parent};
623 $child->hide; 711 $child->hide;
624 712
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 714
627 $self->check_size (1); 715 $self->realloc;
628 $self->update;
629} 716}
630 717
631sub clear { 718sub clear {
632 my ($self) = @_; 719 my ($self) = @_;
633 720
637 for (@$children) { 724 for (@$children) {
638 delete $_->{parent}; 725 delete $_->{parent};
639 $_->hide; 726 $_->hide;
640 } 727 }
641 728
642 $self->check_size; 729 $self->realloc;
643 $self->update;
644} 730}
645 731
646sub find_widget { 732sub find_widget {
647 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
648 734
649 $x -= $self->{x}; 735 $x -= $self->{x};
650 $y -= $self->{y}; 736 $y -= $self->{y};
651 737
652 my $res; 738 my $res;
653 739
654 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
656 and return $res; 742 and return $res;
657 } 743 }
658 744
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
708 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
709} 795}
710 796
711############################################################################# 797#############################################################################
712 798
799# back-buffered drawing area
800
713package CFClient::UI::Window; 801package CFClient::UI::Window;
714 802
715our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
716 804
717use CFClient::OpenGL; 805use CFClient::OpenGL;
735 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 824 $self->update;
737} 825}
738 826
739sub _render { 827sub _render {
828 my ($self) = @_;
829
740 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
741} 831}
742 832
743sub render_child { 833sub render_child {
744 my ($self) = @_; 834 my ($self) = @_;
745 835
746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
747 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
749 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
750 $self->_render; 847 $self->_render;
751 }; 848 };
752} 849}
753 850
754sub _draw { 851sub _draw {
755 my ($self) = @_; 852 my ($self) = @_;
756 853
757 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
758 855
759 my $tex = $self->{texture} 856 my $tex = $self->{texture}
760 or return; 857 or return;
761 858
762 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
785} 882}
786 883
787sub size_request { 884sub size_request {
788 my ($self) = @_; 885 my ($self) = @_;
789 886
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 888
792 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
793} 893}
794 894
795sub size_allocate { 895sub size_allocate {
796 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
797 897
898 my $child = $self->child;
899
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 902
801 $self->child->configure (0, 0, $w, $h); 903 $self->child->configure (0, 0, $w, $h);
802 $self->update; 904 $self->update;
803} 905}
804 906
840} 942}
841 943
842sub _render { 944sub _render {
843 my ($self) = @_; 945 my ($self) = @_;
844 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 951
847 $self->SUPER::_render; 952 $self->SUPER::_render;
848} 953}
849 954
852package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
853 958
854our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
855 960
856sub new { 961sub new {
857 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
858 965
859 my $self; 966 my $self;
860 967
861 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
862 vertical => 1, 969 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 971 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
866 }, 973 },
867 ; 974 ;
868 975
869 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 978 slider => $slider,
872 @_, 979 %arg,
873 ); 980 );
874 981
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
878 984
879 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
880} 992}
881 993
882sub update { 994sub update {
883 my ($self) = @_; 995 my ($self) = @_;
884 996
947 1059
948our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
949 1061
950use CFClient::OpenGL; 1062use CFClient::OpenGL;
951 1063
952my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1071
956sub new { 1072sub new {
957 my $class = shift; 1073 my ($class, %arg) = @_;
958 1074
959 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
960 1076
961 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1080 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1081 can_events => 1,
967 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
968 ); 1085 );
969 1086
970 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
971 align => 0, 1088 align => 0,
972 valign => 1, 1089 valign => 1,
973 text => $self->{title}, 1090 text => $title,
974 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
975 1093
976 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
977} 1102}
978 1103
979sub border { 1104sub border {
980 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
981} 1106}
982 1107
983sub size_request { 1108sub size_request {
984 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
985 1113
986 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
987 1115
988 ( 1116 (
989 $w + $self->border * 2, 1117 $w + $self->border * 2,
992} 1120}
993 1121
994sub size_allocate { 1122sub size_allocate {
995 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
996 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
997 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
999 1135
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1004} 1137}
1005 1138
1006sub button_down { 1139sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1008 1141
1024 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
1025 1158
1026 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1028 1161
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size;
1033 }; 1167 };
1034 1168
1035 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
1039 $self->{motion} = sub { 1173 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1041 1175
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1177
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update;
1046 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1047 } 1184 1
1048} 1185}
1049 1186
1050sub button_up { 1187sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1052 1189
1053 delete $self->{motion}; 1190 !!delete $self->{motion}
1054} 1191}
1055 1192
1056sub mouse_motion { 1193sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1058 1195
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1060} 1199}
1061 1200
1062sub _draw { 1201sub _draw {
1063 my ($self) = @_; 1202 my ($self) = @_;
1064 1203
1204 my $child = $self->{children}[0];
1205
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1208
1068 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1211
1071 my $border = $self->border; 1212 my $border = $self->border;
1072 1213
1073 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1219
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
1081 1222
1082 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1228 }
1093 1229
1094 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1095 1231
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1099} 1238}
1100 1239
1101############################################################################# 1240#############################################################################
1102 1241
1103package CFClient::UI::Table; 1242package CFClient::UI::Table;
1125 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1126 1265
1127 $child->set_parent ($self); 1266 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1129 1268
1130 $self->check_size (1); 1269 $self->realloc;
1131} 1270}
1132 1271
1133# TODO: move to container class maybe? send children a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1273sub clear {
1135 my ($self) = @_; 1274 my ($self) = @_;
1140 for (@children) { 1279 for (@children) {
1141 delete $_->{parent}; 1280 delete $_->{parent};
1142 $_->hide; 1281 $_->hide;
1143 } 1282 }
1144 1283
1145 $self->check_size (1); 1284 $self->realloc;
1146 $self->update;
1147} 1285}
1148 1286
1149sub get_wh { 1287sub get_wh {
1150 my ($self) = @_; 1288 my ($self) = @_;
1151 1289
1247 } 1385 }
1248} 1386}
1249 1387
1250############################################################################# 1388#############################################################################
1251 1389
1252package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1391
1256our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1257 1393
1258sub size_request { 1394sub size_request {
1259 my ($self) = @_; 1395 my ($self) = @_;
1260 1396
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1262 1398 ? (
1263 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1401 )
1266 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1267} 1406}
1268 1407
1269sub size_allocate { 1408sub size_allocate {
1270 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1271 1410
1272 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1412 my $children = $self->{children};
1275 1413
1276 my @h = map $_->{req_w}, @$children; 1414 my @req;
1277 1415
1278 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1279 1417 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1432 }
1294 } 1433 }
1295 1434
1296 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1297 1436
1298 my $y = 0; 1437 my $pos = 0;
1299 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1441
1304 $y += $h; 1442 $pos += $alloc;
1305 } 1443 }
1306 1444
1307 1 1445 1
1308} 1446}
1309 1447
1310############################################################################# 1448#############################################################################
1311 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1312package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1313 1466
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1317 1468
1318sub size_request { 1469sub new {
1319 my ($self) = @_; 1470 my $class = shift;
1320 1471
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1322 1473 vertical => 1,
1323 ( 1474 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1475 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1476}
1367 1477
1368############################################################################# 1478#############################################################################
1369 1479
1370package CFClient::UI::Label; 1480package CFClient::UI::Label;
1387 ellipsise => 3, # end 1497 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1389 fontsize => 1, 1499 fontsize => 1,
1390 align => -1, 1500 align => -1,
1391 valign => -1, 1501 valign => -1,
1392 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1393 can_events => 0, 1504 can_events => 0,
1394 %arg 1505 %arg
1395 ); 1506 );
1396 1507
1397 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1433 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1434 1545
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1437 1548
1549 $self->realloc;
1438 $self->update; 1550 $self->update;
1439 $self->check_size;
1440} 1551}
1441 1552
1442sub set_markup { 1553sub set_markup {
1443 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1444 1555
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1560
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1452 1563
1564 $self->realloc;
1453 $self->update; 1565 $self->update;
1454 $self->check_size;
1455} 1566}
1456 1567
1457sub size_request { 1568sub size_request {
1458 my ($self) = @_; 1569 my ($self) = @_;
1459 1570
1473 1584
1474 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1476 } 1587 }
1477 1588
1478 ( 1589 ($w, $h)
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1590}
1483 1591
1484sub size_allocate { 1592sub size_allocate {
1485 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1486 1594
1595 delete $self->{ox};
1596
1487 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1599}
1489 1600
1490sub set_fontsize { 1601sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1492 1603
1493 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1605 delete $self->{texture};
1495 1606
1496 $self->update; 1607 $self->realloc;
1497 $self->check_size;
1498} 1608}
1499 1609
1500sub _draw { 1610sub _draw {
1501 my ($self) = @_; 1611 my ($self) = @_;
1502 1612
1508 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1622
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1514 1625
1626 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1518 1630
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1634 };
1525 1635
1526 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528 1638
1582sub set_text { 1692sub set_text {
1583 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1584 1694
1585 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1696 $self->_set_text ($text);
1587 $self->update; 1697
1588 $self->check_size; 1698 $self->realloc;
1589} 1699}
1590 1700
1591sub get_text { 1701sub get_text {
1592 $_[0]{text} 1702 $_[0]{text}
1593} 1703}
1623 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1626 } elsif ($uni) { 1736 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1628 } 1740 }
1629 1741
1630 $self->_set_text ($text); 1742 $self->_set_text ($text);
1631 $self->update; 1743
1632 $self->check_size; 1744 $self->realloc;
1745
1746 1
1633} 1747}
1634 1748
1635sub focus_in { 1749sub focus_in {
1636 my ($self) = @_; 1750 my ($self) = @_;
1637 1751
1652 utf8::encode $text; 1766 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1654 1768
1655 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1656 $self->update; 1770 $self->update;
1771
1772 1
1657} 1773}
1658 1774
1659sub mouse_motion { 1775sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1661# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1662} 1780}
1663 1781
1664sub _draw { 1782sub _draw {
1665 my ($self) = @_; 1783 my ($self) = @_;
1666 1784
1743 } else { 1861 } else {
1744 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1745 } 1863 }
1746 1864
1747 } else { 1865 } else {
1748 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1749 } 1869 1
1750
1751} 1870}
1752 1871
1753############################################################################# 1872#############################################################################
1754 1873
1755package CFClient::UI::Button; 1874package CFClient::UI::Button;
1764 1883
1765sub new { 1884sub new {
1766 my $class = shift; 1885 my $class = shift;
1767 1886
1768 $class->SUPER::new ( 1887 $class->SUPER::new (
1769 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1770 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1772 can_hover => 1, 1892 can_hover => 1,
1773 align => 0, 1893 align => 0,
1774 valign => 0, 1894 valign => 0,
1783 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1784 1904
1785 $self->emit ("activate") 1905 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1788} 1910}
1789 1911
1790sub _draw { 1912sub _draw {
1791 my ($self) = @_; 1913 my ($self) = @_;
1792 1914
1821 1943
1822sub new { 1944sub new {
1823 my $class = shift; 1945 my $class = shift;
1824 1946
1825 $class->SUPER::new ( 1947 $class->SUPER::new (
1826 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1827 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1952 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1953 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1954 state => 0,
1835} 1958}
1836 1959
1837sub size_request { 1960sub size_request {
1838 my ($self) = @_; 1961 my ($self) = @_;
1839 1962
1840 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1841} 1964}
1842 1965
1843sub button_down { 1966sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1845 1968
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1850 } 1977 1
1851} 1978}
1852 1979
1853sub _draw { 1980sub _draw {
1854 my ($self) = @_; 1981 my ($self) = @_;
1855 1982
1856 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1857 1984
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 1986
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 1990
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 1992
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 1994
2130 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2261 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2262 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2263 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2137 vertical => 0, 2266 vertical => 0,
2138 can_hover => 1, 2267 can_hover => 1,
2139 inner_pad => 0.02, 2268 inner_pad => 0.02,
2140 @_ 2269 @_
2141 ); 2270 );
2144 $self->update; 2273 $self->update;
2145 2274
2146 $self 2275 $self
2147} 2276}
2148 2277
2278sub changed { }
2279
2149sub set_range { 2280sub set_range {
2150 my ($self, $range) = @_; 2281 my ($self, $range) = @_;
2151 2282
2152 ($range, $self->{range}) = ($self->{range}, $range); 2283 ($range, $self->{range}) = ($self->{range}, $range);
2153 2284
2179} 2310}
2180 2311
2181sub size_request { 2312sub size_request {
2182 my ($self) = @_; 2313 my ($self) = @_;
2183 2314
2184 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2316}
2189 2317
2190sub button_down { 2318sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2192 2320
2193 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2194 2322
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2324
2197 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2198} 2326}
2199 2327
2200sub mouse_motion { 2328sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2202 2330
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2335
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2337
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2211 } 2343 1
2212} 2344}
2213 2345
2214sub update { 2346sub update {
2215 my ($self) = @_; 2347 my ($self) = @_;
2216 2348
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2218 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2219 2358
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2360 my $range = ($hi - $page - $lo) || 1e-100;
2222 2361
2228 $value = ($value - $lo) / $range; 2367 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2368 $value = $value * $self->{scale} + $self->{offset};
2230 2369
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2371 $self->{knob_w} = $knob_w;
2233 }); 2372 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2373
2241 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2242 2375
2243 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2244 2377
2543 2676
2544sub new { 2677sub new {
2545 my $class = shift; 2678 my $class = shift;
2546 2679
2547 my $self = $class->SUPER::new ( 2680 my $self = $class->SUPER::new (
2548 state => 0, 2681 state => 0,
2549 connect_activate => \&toggle_flopper, 2682 on_activate => \&toggle_flopper,
2550 @_ 2683 @_
2551 ); 2684 );
2552 2685
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2686 $self
2559} 2687}
2560 2688
2561sub toggle_flopper { 2689sub toggle_flopper {
2562 my ($self) = @_; 2690 my ($self) = @_;
2563 2691
2564 # TODO: use animation 2692 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2693}
2576 2694
2577############################################################################# 2695#############################################################################
2578 2696
2579package CFClient::UI::Tooltip; 2697package CFClient::UI::Tooltip;
2592} 2710}
2593 2711
2594sub set_tooltip_from { 2712sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2713 my ($self, $widget) = @_;
2596 2714
2715 my $tooltip = $widget->{tooltip};
2716
2717 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}";
2722 }
2723
2597 $self->add (new CFClient::UI::Label 2724 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2725 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2727 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2728 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2729 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2730 font => ($widget->{tooltip_font} || $::FONT_PROP),
2614 2741
2615sub size_allocate { 2742sub size_allocate {
2616 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2617 2744
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2746}
2747
2748sub visibility_change {
2749 my ($self, $visible) = @_;
2750
2751 return unless $visible;
2752
2753 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner}
2755 or return;
2756
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH;
2761
2762 $self->move_abs ($x, $y);
2763 });
2619} 2764}
2620 2765
2621sub _draw { 2766sub _draw {
2622 my ($self) = @_; 2767 my ($self) = @_;
2623 2768
2640 glVertex $w, $h; 2785 glVertex $w, $h;
2641 glVertex $w, 0; 2786 glVertex $w, 0;
2642 glEnd; 2787 glEnd;
2643 2788
2644 glTranslate 2 - 0.375, 2 - 0.375; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2790
2645 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2646} 2792}
2647 2793
2648############################################################################# 2794#############################################################################
2649 2795
2725 $self->SUPER::DESTROY; 2871 $self->SUPER::DESTROY;
2726} 2872}
2727 2873
2728############################################################################# 2874#############################################################################
2729 2875
2730package CFClient::UI::Inventory; 2876package CFClient::UI::Buttonbar;
2731 2877
2732our @ISA = CFClient::UI::ScrolledWindow::; 2878our @ISA = CFClient::UI::HBox::;
2733 2879
2734sub new { 2880# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 2881
2775############################################################################# 2882#############################################################################
2776 2883
2777package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2778 2885
2819 # maybe save $GRAB? must be careful about events... 2926 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2927 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2928 $self->{button} = $ev->{button};
2822 2929
2823 $self->show; 2930 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 2932}
2826 2933
2827sub mouse_motion { 2934sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2829 2936
2830 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2833} 2942}
2834 2943
2835sub button_up { 2944sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2837 2946
2839 undef $GRAB; 2948 undef $GRAB;
2840 $self->hide; 2949 $self->hide;
2841 2950
2842 $self->_emit ("popdown"); 2951 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
2844 } 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
2845} 3066}
2846 3067
2847############################################################################# 3068#############################################################################
2848 3069
2849package CFClient::UI::Statusbox; 3070package CFClient::UI::Statusbox;
2954 $self->SUPER::reconfigure; 3175 $self->SUPER::reconfigure;
2955} 3176}
2956 3177
2957############################################################################# 3178#############################################################################
2958 3179
2959package CFClient::UI::Root; 3180package CFClient::UI::Inventory;
2960 3181
2961our @ISA = CFClient::UI::Container::; 3182our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3183
2965sub new { 3184sub new {
2966 my $class = shift; 3185 my $class = shift;
2967 3186
2968 $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
2969 @_, 3429 @_,
2970 ) 3430 )
2971} 3431}
2972 3432
2973sub configure { 3433# XXX: Do sorting? Argl...
2974 my ($self, $x, $y, $w, $h) = @_; 3434sub add_spell {
2975
2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2979
2980sub check_size {
2981 my ($self) = @_; 3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
2982 3437
2983 $self->size_allocate ($self->{w}, $self->{h}) 3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2984 if $self->{w}; 3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::Root;
3476
3477our @ISA = CFClient::UI::Container::;
3478
3479use CFClient::OpenGL;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 visible => 1,
3486 @_,
3487 );
3488
3489 Scalar::Util::weaken ($self->{root} = $self);
3490
3491 $self
2985} 3492}
2986 3493
2987sub size_request { 3494sub size_request {
2988 my ($self) = @_; 3495 my ($self) = @_;
2989 3496
2990 ($self->{w}, $self->{h}) 3497 ($self->{w}, $self->{h})
3498}
3499
3500sub _to_pixel {
3501 my ($coord, $size, $max) = @_;
3502
3503 $coord =
3504 $coord eq "center" ? ($max - $size) * 0.5
3505 : $coord eq "max" ? $max
3506 : $coord;
3507
3508 $coord = 0 if $coord < 0;
3509 $coord = $max - $size if $coord > $max - $size;
3510
3511 int $coord + 0.5
2991} 3512}
2992 3513
2993sub size_allocate { 3514sub size_allocate {
2994 my ($self, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
2995 3516
2996 for my $child ($self->children) { 3517 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3519
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3520 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3521 $Y = $child->{force_y} if exists $child->{force_y};
3001 3522
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3523 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3524 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3525
3008 $child->configure ($X, $Y, $W, $H); 3526 $child->configure ($X, $Y, $W, $H);
3009 } 3527 }
3010} 3528}
3011 3529
3022} 3540}
3023 3541
3024sub update { 3542sub update {
3025 my ($self) = @_; 3543 my ($self) = @_;
3026 3544
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3545 $::WANT_REFRESH++;
3029} 3546}
3030 3547
3031sub add { 3548sub add {
3032 my ($self, @children) = @_; 3549 my ($self, @children) = @_;
3033 3550
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3551 $_->{is_toplevel} = 1
3042 3552 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3553
3048 $self->SUPER::add (@children); 3554 $self->SUPER::add (@children);
3049} 3555}
3050 3556
3051sub remove { 3557sub remove {
3052 my ($self, @children) = @_; 3558 my ($self, @children) = @_;
3053 3559
3054 $self->SUPER::remove (@children); 3560 $self->SUPER::remove (@children);
3561
3562 delete $self->{is_toplevel}
3563 for @children;
3055 3564
3056 while (@children) { 3565 while (@children) {
3057 my $w = pop @children; 3566 my $w = pop @children;
3058 push @children, $w->children; 3567 push @children, $w->children;
3059 $w->set_invisible; 3568 $w->set_invisible;
3078 while ($self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
3079 $_->() 3588 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3589 for values %{delete $self->{refresh_hook}};
3081 } 3590 }
3082 3591
3083 if ($self->{check_size}) { 3592 if ($self->{realloc}) {
3084 my @queue = ([], []); 3593 my %queue;
3594 my @queue;
3595 my $widget;
3085 3596
3086 for (;;) { 3597 outer:
3087 if ($self->{check_size}) { 3598 while () {
3088 # heuristic: check containers last 3599 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3600 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3601 $widget->{visible} or next; # do not resize invisible widgets
3602
3603 $queue{$widget+0}++ and next; # duplicates are common
3604
3605 push @{ $queue[$widget->{visible}] }, $widget;
3606 }
3091 } 3607 }
3092 3608
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3609 while () {
3610 @queue or last outer;
3094 3611
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3612 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3613 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3614
3615 pop @queue;
3616 }
3617
3618 delete $queue{$widget+0};
3619
3620 my ($w, $h) = $widget->size_request;
3621
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3624
3625 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h};
3627
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3629 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3630 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3631 $widget->{req_h} = $h;
3105 3632
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3633 $self->{size_alloc}{$widget+0} = $widget;
3107 3634
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3635 if (my $parent = $widget->{parent}) {
3636 $self->{realloc}{$parent+0} = $parent
3637 unless $queue{$parent+0};
3638
3639 $parent->{force_size_alloc} = 1;
3640 $self->{size_alloc}{$parent+0} = $parent;
3641 }
3110 } 3642 }
3643
3644 delete $self->{realloc}{$widget+0};
3111 } 3645 }
3112 } 3646 }
3113 3647
3114 while ($self->{size_alloc}) { 3648 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3649 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3650 values %$size_alloc;
3651
3652 while () {
3653 my $widget = pop @queue || last;
3654
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3656
3118 $w = 0 if $w < 0; 3657 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3658 $h = 0 if $h < 0;
3120 3659
3660 $w = int $w + 0.5;
3661 $h = int $h + 0.5;
3662
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3664 $widget->{old_w} = $widget->{w};
3665 $widget->{old_h} = $widget->{h};
3666
3121 $widget->{w} = $w; 3667 $widget->{w} = $w;
3122 $widget->{h} = $h; 3668 $widget->{h} = $h;
3669
3123 $widget->emit (size_allocate => $w, $h); 3670 $widget->emit (size_allocate => $w, $h);
3671 }
3124 } 3672 }
3125 } 3673 }
3126 3674
3127 while ($self->{post_alloc_hook}) { 3675 while ($self->{post_alloc_hook}) {
3128 $_->() 3676 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3677 for values %{delete $self->{post_alloc_hook}};
3130 } 3678 }
3679
3131 3680
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
3135 3684
3137 glLoadIdentity; 3686 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3689 glLoadIdentity;
3141 3690
3691 {
3692 package CFClient::UI::Base;
3693
3694 ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h});
3696 }
3697
3142 $self->_draw; 3698 $self->_draw;
3143} 3699}
3144 3700
3145############################################################################# 3701#############################################################################
3146 3702

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines