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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.409 by root, Sun Jul 22 16:12:49 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->focus_out; 320 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
289} 322}
290 323
291sub set_visibility { 324sub set_visibility {
292 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
293 326
294 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
295 328
296 $visible ? $self->hide 329 $visible ? $self->show
297 : $self->show; 330 : $self->hide;
298} 331}
299 332
300sub toggle_visibility { 333sub toggle_visibility {
301 my ($self) = @_; 334 my ($self) = @_;
302 335
… …
336sub size_request { 369sub size_request {
337 require Carp; 370 require Carp;
338 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
339} 372}
340 373
374sub baseline_shift {
375 0
376}
377
341sub configure { 378sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
343 380
344 if ($self->{aspect}) { 381 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
346 383
347 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 386
350 # use alignment to adjust x, y 387 # use alignment to adjust x, y
351 388
352 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
367 404
368 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
369 } 406 }
370} 407}
371 408
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 409sub children {
377 # nop 410 # nop
378} 411}
379 412
380sub visible_children { 413sub visible_children {
… …
398 431
399 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
400 433
401 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
402 435
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 439 }
407} 440}
408 441
409# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
410sub coord2local { 443sub coord2local {
411 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
412 445
446 Carp::confess unless $self->{parent};#d#
447
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 449}
415 450
416# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
417sub coord2global { 452sub coord2global {
418 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
419 454
455 Carp::confess unless $self->{parent};#d#
456
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 458}
422 459
423sub focus_in { 460sub invoke_focus_in {
424 my ($self) = @_; 461 my ($self) = @_;
425 462
426 return if $FOCUS == $self; 463 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
428 465
429 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
430 467
431 $self->_emit (focus_in => $focus); 468 $self->update;
432 469
433 $focus->update if $focus; 470 0
434 $FOCUS->update;
435} 471}
436 472
437sub focus_out { 473sub invoke_focus_out {
438 my ($self) = @_; 474 my ($self) = @_;
439 475
440 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
441 477
442 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
443 479
444 $self->_emit (focus_out => $focus); 480 $self->update;
445 481
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 483 unless $FOCUS;
450}
451 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
452sub mouse_motion { 0 } 495sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 496sub invoke_button_up { 0 }
454sub key_down { 0 } 497sub invoke_key_down { 0 }
455sub key_up { 0 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
456 500
457sub button_down { 501sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
459 503
460 $self->focus_in; 504 $self->grab_focus;
461 505
462 0 506 0
463} 507}
464 508
509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
465sub find_widget { 556#sub find_widget {
466 my ($self, $x, $y) = @_; 557# in .xs
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476 558
477sub set_parent { 559sub set_parent {
478 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
479 561
480 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 564}
506 565
507sub realloc { 566sub realloc {
508 my ($self) = @_; 567 my ($self) = @_;
509 568
… …
534 593
535# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless. 595# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538 597
539sub draw { 598#sub draw {
540 my ($self) = @_; 599#CFPlus.xs
541
542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553
554 glPushMatrix;
555 glTranslate $self->{x}, $self->{y}, 0;
556
557 if ($self == $HOVER && $self->{can_hover}) {
558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
559 glEnable GL_BLEND;
560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
561 glBegin GL_QUADS;
562 glVertex 0 , 0;
563 glVertex $self->{w}, 0;
564 glVertex $self->{w}, $self->{h};
565 glVertex 0 , $self->{h};
566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
580 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 }
583
584 $self->_draw;
585 glPopMatrix;
586}
587 600
588sub _draw { 601sub _draw {
589 my ($self) = @_; 602 my ($self) = @_;
590 603
591 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
592} 605}
593 606
594sub DESTROY { 607sub DESTROY {
595 my ($self) = @_; 608 my ($self) = @_;
596 609
597 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
598 611
599 eval { $self->destroy }; 612 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
601} 616}
602 617
603############################################################################# 618#############################################################################
604 619
605package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
606 621
607our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
608 623
609use strict; 624use strict;
610use CFClient::OpenGL; 625use CFPlus::OpenGL;
611 626
612sub new { 627sub new {
613 my $class = shift; 628 my $class = shift;
614 629
615 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
646 } 661 }
647} 662}
648 663
649############################################################################# 664#############################################################################
650 665
651package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
652 667
653our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
654 669
655sub new { 670sub new {
656 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
658} 673}
… …
665 680
666sub draw { } 681sub draw { }
667 682
668############################################################################# 683#############################################################################
669 684
670package CFClient::UI::Container; 685package CFPlus::UI::Container;
671 686
672our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
673 688
674sub new { 689sub new {
675 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
676 691
677 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
681 can_events => 0, 696 can_events => 0,
682 %arg, 697 %arg,
683 ); 698 );
684 699
685 $self->add (@$children) 700 $self->add (@$children)
686 if $children; 701 if $children && @$children;
687 702
688 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
689} 712}
690 713
691sub add { 714sub add {
692 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
693 716
694 $_->set_parent ($self) 717 $_->set_parent ($self)
695 for @widgets; 718 for @widgets;
696 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
697 use sort 'stable'; 721 use sort 'stable';
698 722
699 $self->{children} = [ 723 $self->{children} = [
700 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
701 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
702 ]; 726 ];
703 727
704 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
705} 731}
706 732
707sub children { 733sub children {
708 @{ $_[0]{children} } 734 @{ $_[0]{children} }
709} 735}
… …
720} 746}
721 747
722sub clear { 748sub clear {
723 my ($self) = @_; 749 my ($self) = @_;
724 750
725 my $children = delete $self->{children}; 751 my $children = $self->{children};
726 $self->{children} = []; 752 $self->{children} = [];
727 753
728 for (@$children) { 754 for (@$children) {
729 delete $_->{parent}; 755 delete $_->{parent};
730 $_->hide; 756 $_->hide;
… …
755 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
756} 782}
757 783
758############################################################################# 784#############################################################################
759 785
760package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
761 787
762our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
763 789
764sub new { 790sub new {
765 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
766 792
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 794
769 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
770} 796}
771 797
772sub add { 798sub add {
… …
779sub remove { 805sub remove {
780 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
781 807
782 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
783 809
784 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 811 unless @{$self->{children}};
786} 812}
787 813
788sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
789 815
790sub size_request { 816sub size_request {
791 $_[0]{children}[0]->size_request 817 $_[0]{children}[0]->size_request
792} 818}
793 819
794sub size_allocate { 820sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
796 822
797 $self->{children}[0]->configure (0, 0, $w, $h); 823 $self->{children}[0]->configure (0, 0, $w, $h);
824
825 1
798} 826}
799 827
800############################################################################# 828#############################################################################
801 829
802# back-buffered drawing area 830# back-buffered drawing area
803 831
804package CFClient::UI::Window; 832package CFPlus::UI::Window;
805 833
806our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
807 835
808use CFClient::OpenGL; 836use CFPlus::OpenGL;
809 837
810sub new { 838sub new {
811 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
812 840
813 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
818 846
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 847 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 848 $self->SUPER::update;
821} 849}
822 850
823sub size_allocate { 851sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 852 my ($self, $w, $h) = @_;
825 853
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 854 $self->update;
855
856 $self->SUPER::invoke_size_allocate ($w, $h)
828} 857}
829 858
830sub _render { 859sub _render {
831 my ($self) = @_; 860 my ($self) = @_;
832 861
… …
834} 863}
835 864
836sub render_child { 865sub render_child {
837 my ($self) = @_; 866 my ($self) = @_;
838 867
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
842 871
843 { 872 {
844 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
845 874
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
848 } 879 }
849
850 $self->_render;
851 }; 880 };
852} 881}
853 882
854sub _draw { 883sub _draw {
855 my ($self) = @_; 884 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 885
859 my $tex = $self->{texture} 886 my $tex = $self->{texture}
860 or return; 887 or return;
861 888
862 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
865 892
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
867 894
868 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
869} 896}
870 897
871############################################################################# 898#############################################################################
872 899
873package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
874 901
902use List::Util qw(min max);
903
875our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
876 905
877sub new { 906sub new {
878 my $class = shift; 907 my $class = shift;
879 908
880 $class->SUPER::new ( 909 $class->SUPER::new (
… …
887sub size_request { 916sub size_request {
888 my ($self) = @_; 917 my ($self) = @_;
889 918
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 920
892 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
894 923
895 ($w, $h) 924 ($w, $h)
896} 925}
897 926
898sub size_allocate { 927sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 928 my ($self, $w, $h) = @_;
900 929
901 my $child = $self->child; 930 my $child = $self->child;
902 931
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 932 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 933 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 934
906 $self->child->configure (0, 0, $w, $h); 935 $self->child->configure (0, 0, $w, $h);
907 $self->update; 936 $self->update;
937
938 1
908} 939}
909 940
910sub set_offset { 941sub set_offset {
911 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
912 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
915 950
951 $self->emit (changed => $x, $y);
916 $self->update; 952 $self->update;
953 }
917} 954}
918 955
919# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 957sub coord2local {
921 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
937 974
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 977 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 979 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 981 }
945} 982}
946 983
947sub _render { 984sub _render {
948 my ($self) = @_; 985 my ($self) = @_;
949 986
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 989
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 991
955 $self->SUPER::_render; 992 $self->SUPER::_render;
956} 993}
957 994
958############################################################################# 995#############################################################################
959 996
960package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
961 998
962our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
963 1000
964sub new { 1001sub new {
965 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
966 1003
967 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
968 1005
969 my $self; 1006 my $self;
970 1007
971 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
972 vertical => 1, 1022 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1024 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1027 },
977 ; 1028 ;
978 1029
979 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
981 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
982 %arg, 1038 %arg,
983 ); 1039 );
984 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
986 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
987 1065
988 $self 1066 $self
989} 1067}
990 1068
… …
992 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
993 1071
994 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
995} 1073}
996 1074
997sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
998 my ($self) = @_; 1106 my ($self, $ev) = @_;
999 1107
1000 $self->SUPER::update; 1108 $self->grab_focus;
1001 1109
1002 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1005} 1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1006 1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1162}
1163
1007sub size_allocate { 1164sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1009 1166
1167 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1169}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1170
1019############################################################################# 1171#############################################################################
1020 1172
1021package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1022 1174
1023our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1024 1176
1025use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1026 1178
1027sub new { 1179sub new {
1028 my $class = shift; 1180 my $class = shift;
1029 1181
1030 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1057} 1209}
1058 1210
1059############################################################################# 1211#############################################################################
1060 1212
1061package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1062 1214
1063our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1064 1216
1065use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1066 1318
1067my $bg = 1319my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1070 1322
1071my @border = 1323my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1074 1330
1075sub new { 1331sub new {
1076 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1077 1333
1078 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1337 border => 0.6,
1082 can_events => 1, 1338 can_events => 1,
1083 min_w => 16, 1339 min_w => 64,
1084 min_h => 16, 1340 min_h => 32,
1085 %arg, 1341 %arg,
1086 ); 1342 );
1087 1343
1088 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1345 align => 0,
1090 valign => 1, 1346 valign => 1,
1091 text => $self->{title}, 1347 text => $self->{title},
1092 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1093 if exists $self->{title}; 1349 if exists $self->{title};
1094 1350
1351 if ($self->{has_close_button}) {
1352 $self->{close_button} =
1353 new CFPlus::UI::ImageButton
1354 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") };
1356
1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1358 }
1359
1095 $self 1360 $self
1096} 1361}
1097 1362
1098sub add { 1363sub add {
1099 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1100 1365
1101 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1369}
1104 1370
1105sub border { 1371sub border {
1106 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1107} 1373}
… …
1109sub size_request { 1375sub size_request {
1110 my ($self) = @_; 1376 my ($self) = @_;
1111 1377
1112 $self->{title_widget}->size_request 1378 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1379 if $self->{title_widget};
1380
1381 $self->{close_button}->size_request
1382 if $self->{close_button};
1114 1383
1115 my ($w, $h) = $self->SUPER::size_request; 1384 my ($w, $h) = $self->SUPER::size_request;
1116 1385
1117 ( 1386 (
1118 $w + $self->border * 2, 1387 $w + $self->border * 2,
1119 $h + $self->border * 2, 1388 $h + $self->border * 2,
1120 ) 1389 )
1121} 1390}
1122 1391
1123sub size_allocate { 1392sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1125 1394
1126 if ($self->{title_widget}) { 1395 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1396 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1397 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1398 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1399 }
1131 1400
1132 my $border = $self->border; 1401 my $border = $self->border;
1133 1402
1134 $h -= List::Util::max 0, $border * 2; 1403 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1404 $w -= List::Util::max 0, $border * 2;
1405
1406 $self->child->configure ($border, $border, $w, $h);
1407
1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1409 if $self->{close_button};
1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1136 1418
1137 $self->child->configure ($border, $border, $w, $h); 1419 1
1138} 1420}
1139 1421
1140sub button_down { 1422sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
1142 1424
1143 my ($w, $h) = @$self{qw(w h)}; 1425 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1426 my $border = $self->border;
1145 1427
… …
1176 1458
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1459 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1460
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1461 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1462 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1463 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1464 };
1183 } else { 1465 } else {
1184 return 0; 1466 return 0;
1185 } 1467 }
1186 1468
1187 1 1469 1
1188} 1470}
1189 1471
1190sub button_up { 1472sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
1192 1474
1193 !!delete $self->{motion} 1475 ! ! delete $self->{motion}
1194} 1476}
1195 1477
1196sub mouse_motion { 1478sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1479 my ($self, $ev, $x, $y) = @_;
1198 1480
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1482
1201 !!$self->{motion} 1483 ! ! $self->{motion}
1484}
1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1202} 1492}
1203 1493
1204sub _draw { 1494sub _draw {
1205 my ($self) = @_; 1495 my ($self) = @_;
1206 1496
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1504
1215 my $border = $self->border; 1505 my $border = $self->border;
1216 1506
1217 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222 1526
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1225 1529
1226 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1235 $child->draw; 1539 $child->draw;
1236 1540
1237 if ($self->{title_widget}) { 1541 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1542 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1240 } 1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
1241} 1550}
1242 1551
1243############################################################################# 1552#############################################################################
1244 1553
1245package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1246 1555
1247our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1248 1557
1249use List::Util qw(max sum); 1558use List::Util qw(max sum);
1250 1559
1251use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1252 1561
1253sub new { 1562sub new {
1254 my $class = shift; 1563 my $class = shift;
1255 1564
1256 $class->SUPER::new ( 1565 $class->SUPER::new (
1257 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1258 @_, 1568 @_,
1259 ) 1569 )
1260} 1570}
1261 1571
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264}
1265
1266sub add { 1572sub add {
1267 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1268 1574
1269 $child->set_parent ($self); 1575 for my $child (@widgets) {
1270 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1271 1579
1272 $self->realloc; 1580 $self->SUPER::add (@widgets);
1273} 1581}
1274 1582
1275sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1276 my ($self, $child) = @_; 1601 my ($self) = @_;
1277 1602
1278 # TODO: not yet implemented 1603 my (@w, @h);
1279}
1280
1281# TODO: move to container class maybe? send children a signal on removal?
1282sub clear {
1283 my ($self) = @_;
1284 1604
1285 my @children = $self->children; 1605 my @children = $self->children;
1286 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1287 1616 }
1288 for (@children) {
1289 delete $_->{parent};
1290 $_->hide;
1291 }
1292 1617
1293 $self->realloc; 1618 # second pass, rows
1294} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1295
1296sub get_wh {
1297 my ($self) = @_;
1298
1299 my (@w, @h);
1300
1301 for my $y (0 .. $#{$self->{children}}) {
1302 my $row = $self->{children}[$y]
1303 or next;
1304
1305 for my $x (0 .. $#$row) {
1306 my $widget = $row->[$x]
1307 or next;
1308 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1309 1621
1310 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1311 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312 } 1626 }
1313 } 1627 }
1314 1628
1315 (\@w, \@h) 1629 (\@w, \@h)
1316} 1630}
… …
1324 (sum @$ws), 1638 (sum @$ws),
1325 (sum @$hs), 1639 (sum @$hs),
1326 ) 1640 )
1327} 1641}
1328 1642
1329sub size_allocate { 1643sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1644 my ($self, $w, $h) = @_;
1331 1645
1332 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1333 1647
1334 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1336 1650
1337 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1338 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1341 1655
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1657
1346 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1347 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1348 1667
1349 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350 1670
1351 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1352 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1353 or next;
1354 1673
1355 my $x = 0; 1674 $widget->configure (
1356 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357 1677 );
1358 for my $c (0 .. $#$row) { 1678 }
1359 my $col_w = $ws->[$c];
1360 1679
1361 if (my $widget = $row->[$c]) { 1680 1
1362 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1363 }
1364 1682
1365 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1366 } 1721 }
1367
1368 $y += $row_h;
1369 } 1722 }
1370 1723
1371} 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1372 1726
1373sub find_widget { 1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1374 my ($self, $x, $y) = @_; 1749 my ($self, $W, $H) = @_;
1375 1750
1376 $x -= $self->{x}; 1751 for my $child ($self->visible_children) {
1377 $y -= $self->{y}; 1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1378 1753
1379 my $res; 1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1380 1758
1381 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1759 $child->configure ($x, $y, $w, $h);
1382 $res = $_->find_widget ($x, $y) 1760 }
1383 and return $res; 1761
1384 } 1762 1
1385
1386 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1387}
1388
1389sub _draw {
1390 my ($self) = @_;
1391
1392 for (grep $_, @{$self->{children}}) {
1393 $_->draw for grep $_, @$_;
1394 }
1395} 1763}
1396 1764
1397############################################################################# 1765#############################################################################
1398 1766
1399package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1400 1768
1401our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1402 1770
1403sub size_request { 1771sub size_request {
1404 my ($self) = @_; 1772 my ($self) = @_;
1405 1773
1406 $self->{vertical} 1774 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1781 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1782 )
1415} 1783}
1416 1784
1417sub size_allocate { 1785sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1786 my ($self, $w, $h) = @_;
1419 1787
1420 my $space = $self->{vertical} ? $h : $w; 1788 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1789 my @children = $self->visible_children;
1422 1790
1423 my @req; 1791 my @req;
1424 1792
1425 if ($self->{homogeneous}) { 1793 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1794 @req = ($space / (@children || 1)) x @children;
1427 } else { 1795 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1796 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1797 my $req = List::Util::sum @req;
1430 1798
1431 if ($req > $space) { 1799 if ($req > $space) {
1432 # ah well, not enough space 1800 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1801 $_ *= $space / $req for @req;
1434 } else { 1802 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1803 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1804
1437 $space = ($space - $req) / $expand; # remaining space to give away 1805 $space = ($space - $req) / $expand; # remaining space to give away
1438 1806
1439 $req[$_] += $space * $children->[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1808 for 0 .. $#children;
1441 } 1809 }
1442 } 1810 }
1443 1811
1444 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1445 1813
1446 my $pos = 0; 1814 my $pos = 0;
1447 for (0 .. $#$children) { 1815 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1818
1451 $pos += $alloc; 1819 $pos += $alloc;
1452 } 1820 }
1453 1821
1454 1 1822 1
1455} 1823}
1456 1824
1457############################################################################# 1825#############################################################################
1458 1826
1459package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1460 1828
1461our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1462 1830
1463sub new { 1831sub new {
1464 my $class = shift; 1832 my $class = shift;
1465 1833
1466 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1469 ) 1837 )
1470} 1838}
1471 1839
1472############################################################################# 1840#############################################################################
1473 1841
1474package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1475 1843
1476our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1477 1845
1478sub new { 1846sub new {
1479 my $class = shift; 1847 my $class = shift;
1480 1848
1481 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1484 ) 1852 )
1485} 1853}
1486 1854
1487############################################################################# 1855#############################################################################
1488 1856
1489package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1490 1858
1491our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1492 1860
1493use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1494 1862
1495sub new { 1863sub new {
1496 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1497 1865
1498 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1869 #active_bg => none
1502 #font => default_font 1870 #font => default_font
1503 #text => initial text 1871 #text => initial text
1504 #markup => initial narkup 1872 #markup => initial narkup
1505 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1506 ellipsise => 3, # end 1875 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1877 fontsize => 1,
1509 align => -1, 1878 align => -1,
1510 valign => -1, 1879 valign => -1,
1511 padding_x => 2, 1880 padding_x => 2,
1512 padding_y => 2, 1881 padding_y => 2,
1513 can_events => 0, 1882 can_events => 0,
1514 %arg 1883 %arg
1515 ); 1884 );
1516 1885
1517 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1889 $self->{template} = $layout;
1521 } 1890 }
1522 1891
1523 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1527 } 1896 }
1528 1897
1529 $self 1898 $self
1530} 1899}
1531 1900
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1901sub update {
1543 my ($self) = @_; 1902 my ($self) = @_;
1544 1903
1545 delete $self->{texture}; 1904 delete $self->{texture};
1546 $self->SUPER::update; 1905 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1558 1917
1559 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1561 1920
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1564 1922
1565 delete $self->{size_req}; 1923 delete $self->{size_req};
1566 $self->realloc; 1924 $self->realloc;
1567 $self->update; 1925 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1575 1933
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1935
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1580 1937
1581 delete $self->{size_req}; 1938 delete $self->{size_req};
1582 $self->realloc; 1939 $self->realloc;
1583 $self->update; 1940 $self->update;
… …
1595 1952
1596 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1597 1954
1598 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1959
1602 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1603 1961
1604 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
… …
1609 }; 1967 };
1610 1968
1611 @{ $self->{size_req} } 1969 @{ $self->{size_req} }
1612} 1970}
1613 1971
1972sub baseline_shift {
1973 $_[0]{layout}->descent
1974}
1975
1614sub size_allocate { 1976sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1977 my ($self, $w, $h) = @_;
1616 1978
1617 delete $self->{ox}; 1979 delete $self->{ox};
1618 1980
1619 delete $self->{texture} 1981 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1982 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1983
1984 1
1621} 1985}
1622 1986
1623sub set_fontsize { 1987sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1625 1989
1626 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1627 delete $self->{texture}; 1992 delete $self->{texture};
1628 1993
1629 $self->realloc; 1994 $self->realloc;
1630} 1995}
1631 1996
1632sub reconfigure { 1997sub reconfigure {
1633 my ($self) = @_; 1998 my ($self) = @_;
1634 1999
1635 delete $self->{size_req}; 2000 delete $self->{size_req};
2001 delete $self->{texture};
1636 2002
1637 $self->SUPER::reconfigure; 2003 $self->SUPER::reconfigure;
1638} 2004}
1639 2005
1640sub _draw { 2006sub _draw {
1641 my ($self) = @_; 2007 my ($self) = @_;
1642 2008
1643 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1644 2010
1645 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 2018
1653 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1654 }; 2020 };
1655 2021
1656 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1660 2026
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 2030 };
1665 2031
1666 glEnable GL_TEXTURE_2D; 2032# unless ($self->{list}) {
1667 2033# $self->{list} = CFPlus::OpenGL::glGenList;
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2034# CFPlus::OpenGL::glNewList $self->{list};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1670 2036# CFPlus::OpenGL::glEndList;
1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 } 2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1679 2040
1680 glDisable GL_TEXTURE_2D; 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1681} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1682 2051
1683############################################################################# 2052#############################################################################
1684 2053
1685package CFClient::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1686 2055
1687our @ISA = CFClient::UI::Label::; 2056our @ISA = CFPlus::UI::Label::;
1688 2057
1689use CFClient::OpenGL; 2058use CFPlus::OpenGL;
1690 2059
1691sub new { 2060sub new {
1692 my $class = shift; 2061 my $class = shift;
1693 2062
1694 $class->SUPER::new ( 2063 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1699 can_hover => 1, 2068 can_hover => 1,
1700 can_focus => 1, 2069 can_focus => 1,
1701 valign => 0, 2070 valign => 0,
1702 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1703 #text => ... 2073 #text => ...
1704 #hidden => "*", 2074 #hidden => "*",
1705 @_ 2075 @_
1706 ) 2076 )
1707} 2077}
… …
1718 2088
1719 $text =~ s/./*/g if $self->{hidden}; 2089 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 2090 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 2091 delete $self->{size_req};
1722 2092
1723 $self->_emit (changed => $self->{text}); 2093 $self->emit (changed => $self->{text});
1724 2094
1725 $self->realloc; 2095 $self->realloc;
1726 $self->update; 2096 $self->update;
1727} 2097}
1728 2098
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2113 my ($w, $h) = $self->SUPER::size_request;
1744 2114
1745 ($w + 1, $h) # add 1 for cursor 2115 ($w + 1, $h) # add 1 for cursor
1746} 2116}
1747 2117
1748sub key_down { 2118sub invoke_key_down {
1749 my ($self, $ev) = @_; 2119 my ($self, $ev) = @_;
1750 2120
1751 my $mod = $ev->{mod}; 2121 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1754 2124
1755 my $text = $self->get_text; 2125 my $text = $self->get_text;
2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2128
1757 if ($uni == 8) { 2129 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
2149 } elsif ($uni == 21) { # ctrl-u
2150 $text = "";
1766 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2153 $self->emit ('escape');
1771 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2158 } else {
1774 return 0; 2159 return 0;
1775 } 2160 }
1776 2161
1777 $self->_set_text ($text); 2162 $self->_set_text ($text);
1778 2163
1779 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1780 2166
1781 1 2167 1
1782} 2168}
1783 2169
1784sub focus_in { 2170sub invoke_focus_in {
1785 my ($self) = @_; 2171 my ($self) = @_;
1786 2172
1787 $self->{last_activity} = $::NOW; 2173 $self->{last_activity} = $::NOW;
1788 2174
1789 $self->SUPER::focus_in; 2175 $self->SUPER::invoke_focus_in
1790} 2176}
1791 2177
1792sub button_down { 2178sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
1794 2180
1795 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2182
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2183 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2184
1799 # byte-index to char-index 2185 # byte-index to char-index
1800 my $text = $self->{text}; 2186 my $text = $self->{text};
1801 utf8::encode $text; 2187 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2188 $self->{cursor} = length $text;
1803 2189
1804 $self->_set_text ($self->{text}); 2190 $self->_set_text ($self->{text});
1805 $self->update; 2191 $self->update;
1806 2192
1807 1 2193 1
1808} 2194}
1809 2195
1810sub mouse_motion { 2196sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2198# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2199
1814 0 2200 1
1815} 2201}
1816 2202
1817sub _draw { 2203sub _draw {
1818 my ($self) = @_; 2204 my ($self) = @_;
1819 2205
… …
1846 utf8::encode $text; 2232 utf8::encode $text;
1847 2233
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2235 }
1850 2236
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2237 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2240 glEnd;
1856 } 2241 }
1857} 2242}
1858 2243
2244#############################################################################
2245
1859package CFClient::UI::Entry; 2246package CFPlus::UI::Entry;
1860 2247
1861our @ISA = CFClient::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
1862 2249
1863use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1864 2251
1865sub key_down { 2252sub invoke_key_down {
1866 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
1867 2254
1868 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
1869 2256
1870 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
2260
1873 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2263 $self->emit (activate => $txt);
1876 $self->update; 2264 $self->update;
1877 2265
1878 } elsif ($sym == CFClient::SDLK_UP) { 2266 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2267 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2268 $self->{history_saveback} = $self->get_text;
1881 } 2269 }
1882 if (@{$self->{history} || []} > 0) { 2270 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2271 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2273 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2274 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2275 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2276 }
1889 2277
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2278 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2279 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2281
1894 if ($self->{history_pointer} >= 0) { 2282 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2283 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2284 } else {
1897 $self->set_text ($self->{history_saveback}); 2285 $self->set_text ($self->{history_saveback});
1898 } 2286 }
1899 2287
1900 } else { 2288 } else {
1901 return $self->SUPER::key_down ($ev) 2289 return $self->SUPER::invoke_key_down ($ev)
1902 } 2290 }
1903 2291
1904 1 2292 1
1905} 2293}
1906 2294
1907############################################################################# 2295#############################################################################
1908 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
1909package CFClient::UI::Button; 2336package CFPlus::UI::Button;
1910 2337
1911our @ISA = CFClient::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
1912 2339
1913use CFClient::OpenGL; 2340use CFPlus::OpenGL;
1914 2341
1915my @tex = 2342my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
1918 2345
1919sub new { 2346sub new {
1920 my $class = shift; 2347 my $class = shift;
1921 2348
1922 $class->SUPER::new ( 2349 $class->SUPER::new (
1923 padding_x => 4, 2350 padding_x => 4,
1924 padding_y => 4, 2351 padding_y => 4,
1925 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
1926 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
1927 can_hover => 1, 2354 can_hover => 1,
1928 align => 0, 2355 align => 0,
1929 valign => 0, 2356 valign => 0,
1930 can_events => 1, 2357 can_events => 1,
1931 @_ 2358 @_
1932 ) 2359 )
1933} 2360}
1934 2361
1935sub activate { }
1936
1937sub button_up { 2362sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
1939 2364
1940 $self->emit ("activate") 2365 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2366 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2367 && $y >= 0 && $y < $self->{h};
… …
1951 2376
1952 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
1955 2380
2381 my $tex = $tex[$GRAB == $self];
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 2383
1958 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
1959 2385
1960 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
1961} 2387}
1962 2388
1963############################################################################# 2389#############################################################################
1964 2390
1965package CFClient::UI::CheckBox; 2391package CFPlus::UI::CheckBox;
1966 2392
1967our @ISA = CFClient::UI::DrawBG::; 2393our @ISA = CFPlus::UI::DrawBG::;
1968 2394
1969my @tex = 2395my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2397 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2398
1973use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1974 2400
1975sub new { 2401sub new {
1976 my $class = shift; 2402 my $class = shift;
1977 2403
1978 $class->SUPER::new ( 2404 $class->SUPER::new (
… …
1992 my ($self) = @_; 2418 my ($self) = @_;
1993 2419
1994 (6) x 2 2420 (6) x 2
1995} 2421}
1996 2422
2423sub toggle {
2424 my ($self) = @_;
2425
2426 $self->{state} = !$self->{state};
2427 $self->emit (changed => $self->{state});
2428 $self->update;
2429}
2430
1997sub button_down { 2431sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2432 my ($self, $ev, $x, $y) = @_;
1999 2433
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2434 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2435 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2436 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2437 } else {
2005 return 0 2438 return 0
2006 } 2439 }
2007 2440
2008 1 2441 1
… …
2028 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2029} 2462}
2030 2463
2031############################################################################# 2464#############################################################################
2032 2465
2033package CFClient::UI::Image; 2466package CFPlus::UI::Image;
2034 2467
2035our @ISA = CFClient::UI::Base::; 2468our @ISA = CFPlus::UI::Base::;
2036 2469
2037use CFClient::OpenGL; 2470use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2471
2040our %loaded_images; 2472our %texture_cache;
2041 2473
2042sub new { 2474sub new {
2043 my $class = shift; 2475 my $class = shift;
2044 2476
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2477 my $self = $class->SUPER::new (
2478 can_events => 0,
2479 @_,
2480 );
2046 2481
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2482 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required";
2048 2484
2049 $loaded_images{$self->{image}} ||= 2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2487
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2488 CFPlus::weaken $texture_cache{$self->{path}};
2053 2489
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2491
2058 $self 2492 $self
2059} 2493}
2060 2494
2495sub STORABLE_freeze {
2496 my ($self, $cloning) = @_;
2497
2498 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2500
2501 $self->{path}
2502}
2503
2504sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_;
2506
2507 $self->new (path => $path)
2508}
2509
2061sub size_request { 2510sub size_request {
2062 my ($self) = @_; 2511 my ($self) = @_;
2063 2512
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2513 ($self->{tex}{w}, $self->{tex}{h})
2065} 2514}
2066 2515
2067sub _draw { 2516sub _draw {
2068 my ($self) = @_; 2517 my ($self) = @_;
2069 2518
… …
2079 } 2528 }
2080 2529
2081 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2532
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2533 $tex->draw_quad (0, 0, $w, $h);
2085 2534
2086 glDisable GL_TEXTURE_2D; 2535 glDisable GL_TEXTURE_2D;
2087} 2536}
2088 2537
2089############################################################################# 2538#############################################################################
2090 2539
2540package CFPlus::UI::ImageButton;
2541
2542our @ISA = CFPlus::UI::Image::;
2543
2544use CFPlus::OpenGL;
2545
2546my %textures;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 padding_x => 4,
2553 padding_y => 4,
2554 fg => [1, 1, 1],
2555 active_fg => [0, 0, 1],
2556 can_hover => 1,
2557 align => 0,
2558 valign => 0,
2559 can_events => 1,
2560 @_
2561 );
2562}
2563
2564sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_;
2566
2567 $self->emit ("activate")
2568 if $x >= 0 && $x < $self->{w}
2569 && $y >= 0 && $y < $self->{h};
2570
2571 1
2572}
2573
2574#############################################################################
2575
2091package CFClient::UI::VGauge; 2576package CFPlus::UI::VGauge;
2092 2577
2093our @ISA = CFClient::UI::Base::; 2578our @ISA = CFPlus::UI::Base::;
2094 2579
2095use List::Util qw(min max); 2580use List::Util qw(min max);
2096 2581
2097use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2098 2583
2099my %tex = ( 2584my %tex = (
2100 food => [ 2585 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2588 ],
2104 grace => [ 2589 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2590 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2592 ],
2108 hp => [ 2593 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2596 ],
2112 mana => [ 2597 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2598 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2600 ],
2116); 2601);
2117 2602
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2603# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2663 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2664 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2665
2181 my $h1 = $self->{h} * (1 - $ycut1); 2666 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2667 my $h2 = $self->{h} * (1 - $ycut2);
2668 my $h3 = $self->{h};
2669
2670 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2671
2184 glEnable GL_BLEND; 2672 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2673 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2674 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2675 glEnable GL_TEXTURE_2D;
… …
2206 2694
2207 if ($t3) { 2695 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2696 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2697 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2698 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2699 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2700 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2701 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2702 glEnd;
2215 } 2703 }
2216 2704
2217 glDisable GL_BLEND; 2705 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2706 glDisable GL_TEXTURE_2D;
2219} 2707}
2220 2708
2221############################################################################# 2709#############################################################################
2222 2710
2223package CFClient::UI::Gauge; 2711package CFPlus::UI::Gauge;
2224 2712
2225our @ISA = CFClient::UI::VBox::; 2713our @ISA = CFPlus::UI::VBox::;
2226 2714
2227sub new { 2715sub new {
2228 my ($class, %arg) = @_; 2716 my ($class, %arg) = @_;
2229 2717
2230 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2720 can_hover => 1,
2233 can_events => 1, 2721 can_events => 1,
2234 %arg, 2722 %arg,
2235 ); 2723 );
2236 2724
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2725 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2726 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2728
2241 $self 2729 $self
2242} 2730}
2243 2731
2244sub set_fontsize { 2732sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2753 $self->{value}->set_text ($val);
2266} 2754}
2267 2755
2268############################################################################# 2756#############################################################################
2269 2757
2270package CFClient::UI::Slider; 2758package CFPlus::UI::Slider;
2271 2759
2272use strict; 2760use strict;
2273 2761
2274use CFClient::OpenGL; 2762use CFPlus::OpenGL;
2275 2763
2276our @ISA = CFClient::UI::DrawBG::; 2764our @ISA = CFPlus::UI::DrawBG::;
2277 2765
2278my @tex = 2766my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2768 qw(s1_slider.png s1_slider_bg.png);
2281 2769
2282sub new { 2770sub new {
2283 my $class = shift; 2771 my $class = shift;
2284 2772
… …
2305 $self->update; 2793 $self->update;
2306 2794
2307 $self 2795 $self
2308} 2796}
2309 2797
2310sub changed { }
2311
2312sub set_range { 2798sub set_range {
2313 my ($self, $range) = @_; 2799 my ($self, $range) = @_;
2314 2800
2315 ($range, $self->{range}) = ($self->{range}, $range); 2801 ($range, $self->{range}) = ($self->{range}, $range);
2316 2802
… …
2336 if $unit; 2822 if $unit;
2337 2823
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2824 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2825
2340 if ($value != $old_value) { 2826 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2827 $self->emit (changed => $value);
2342 $self->update; 2828 $self->update;
2343 } 2829 }
2344} 2830}
2345 2831
2346sub size_request { 2832sub size_request {
2347 my ($self) = @_; 2833 my ($self) = @_;
2348 2834
2349 ($self->{req_w}, $self->{req_h}) 2835 ($self->{req_w}, $self->{req_h})
2350} 2836}
2351 2837
2352sub button_down { 2838sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2839 my ($self, $ev, $x, $y) = @_;
2354 2840
2355 $self->SUPER::button_down ($ev, $x, $y); 2841 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2842
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2844
2359 $self->mouse_motion ($ev, $x, $y) 2845 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2846}
2361 2847
2362sub mouse_motion { 2848sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2849 my ($self, $ev, $x, $y) = @_;
2364 2850
2365 if ($GRAB == $self) { 2851 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2852 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2853
… …
2373 } else { 2859 } else {
2374 return 0; 2860 return 0;
2375 } 2861 }
2376 2862
2377 1 2863 1
2864}
2865
2866sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_;
2868
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874
2875 ! ! $delta
2378} 2876}
2379 2877
2380sub update { 2878sub update {
2381 my ($self) = @_; 2879 my ($self) = @_;
2382 2880
… …
2431 glDisable GL_TEXTURE_2D; 2929 glDisable GL_TEXTURE_2D;
2432} 2930}
2433 2931
2434############################################################################# 2932#############################################################################
2435 2933
2436package CFClient::UI::ValSlider; 2934package CFPlus::UI::ValSlider;
2437 2935
2438our @ISA = CFClient::UI::HBox::; 2936our @ISA = CFPlus::UI::HBox::;
2439 2937
2440sub new { 2938sub new {
2441 my ($class, %arg) = @_; 2939 my ($class, %arg) = @_;
2442 2940
2443 my $range = delete $arg{range}; 2941 my $range = delete $arg{range};
2444 2942
2445 my $self = $class->SUPER::new ( 2943 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2946 to_value => sub { shift },
2449 from_value => sub { shift }, 2947 from_value => sub { shift },
2450 %arg, 2948 %arg,
2451 ); 2949 );
2452 2950
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2970sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2971sub set_value { shift->{slider}->set_value (@_) }
2474 2972
2475############################################################################# 2973#############################################################################
2476 2974
2477package CFClient::UI::TextScroller; 2975package CFPlus::UI::TextScroller;
2478 2976
2479our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2480 2978
2481use CFClient::OpenGL; 2979use CFPlus::OpenGL;
2482 2980
2483sub new { 2981sub new {
2484 my $class = shift; 2982 my $class = shift;
2485 2983
2486 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2487 fontsize => 1, 2985 fontsize => 1,
2488 can_events => 0, 2986 can_events => 1,
2489 indent => 0, 2987 indent => 0,
2490 #font => default_font 2988 #font => default_font
2491 @_, 2989 @_,
2492 2990
2493 layout => (new CFClient::Layout 1), 2991 layout => (new CFPlus::Layout),
2494 par => [], 2992 par => [],
2993 max_par => 0,
2495 height => 0, 2994 height => 0,
2496 children => [ 2995 children => [
2497 (new CFClient::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2998 ],
2500 ); 2999 );
2501 3000
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 3001 $self->{children}[1]->connect (changed => sub { $self->update });
2503 3002
… …
2509 3008
2510 $self->{fontsize} = $fontsize; 3009 $self->{fontsize} = $fontsize;
2511 $self->reflow; 3010 $self->reflow;
2512} 3011}
2513 3012
3013sub size_request {
3014 my ($self) = @_;
3015
3016 my ($empty, $slider) = @{ $self->{children} };
3017
3018 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request
3020}
3021
2514sub size_allocate { 3022sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 3023 my ($self, $w, $h) = @_;
2516 3024
2517 $self->SUPER::size_allocate ($w, $h); 3025 my ($empty, $slider, @other) = @{ $self->{children} };
3026 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 3027
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3028 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3029 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 3030 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3031 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 3032
2524 $self->reflow; 3033 $self->reflow;
2525}
2526 3034
2527sub text_size { 3035 local $self->{children} = [$empty, $slider];
3036 $self->SUPER::invoke_size_allocate ($w, $h)
3037}
3038
3039sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 3040 my ($self, $ev) = @_;
3041
3042 return 0 unless $ev->{dy}; # only vertical movements
3043
3044 $self->{children}[1]->emit (mouse_wheel => $ev);
3045
3046 1
3047}
3048
3049sub get_layout {
3050 my ($self, $para) = @_;
2529 3051
2530 my $layout = $self->{layout}; 3052 my $layout = $self->{layout};
2531 3053
3054 $layout->set_font ($self->{font}) if $self->{font};
3055 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3056 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 3057 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3058 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 3059 $layout->set_markup ($para->{markup});
3060
3061 $layout->set_shapes (
3062 map
3063 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064 @{$para->{widget}}
2536 3065 );
3066
2537 $layout->size 3067 $layout
2538} 3068}
2539 3069
2540sub reflow { 3070sub reflow {
2541 my ($self) = @_; 3071 my ($self) = @_;
2542 3072
… …
2549 3079
2550 # todo: base offset on lines or so, not on pixels 3080 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 3081 $self->{children}[1]->set_value ($offset);
2552} 3082}
2553 3083
3084sub current_paragraph {
3085 my ($self) = @_;
3086
3087 $self->{top_paragraph} - 1
3088}
3089
3090sub scroll_to {
3091 my ($self, $para) = @_;
3092
3093 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3094
3095 $self->{scroll_to} = $para;
3096 $self->update;
3097}
3098
2554sub clear { 3099sub clear {
2555 my ($self) = @_; 3100 my ($self) = @_;
3101
3102 my (undef, undef, @other) = @{ $self->{children} };
3103 $self->remove ($_) for @other;
2556 3104
2557 $self->{par} = []; 3105 $self->{par} = [];
2558 $self->{height} = 0; 3106 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3107 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 3108}
2561 3109
2562sub add_paragraph { 3110sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 3111 my $self = shift;
2564 3112
2565 for my $line (split /\n/, $text) { 3113 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 3114 $para = {
3115 fg => [1, 1, 1, 1],
3116 indent => 0,
3117 markup => "",
3118 widget => [],
3119 ref $para ? %$para : (markup => $para),
3120 w => 1e10,
3121 wrapped => 1,
3122 };
3123
3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3125 push @{$self->{par}}, $para;
3126 }
3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
3130 }
3131
3132 $self->{need_reflow}++;
3133 $self->update;
3134}
3135
3136sub scroll_to_bottom {
3137 my ($self) = @_;
3138
3139 $self->{scroll_to} = $#{$self->{par}};
3140 $self->update;
3141}
3142
3143sub force_uptodate {
3144 my ($self) = @_;
3145
3146 if (delete $self->{need_reflow}) {
3147 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3148
3149 my $height = 0;
3150
3151 for my $para (@{$self->{par}}) {
3152 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3153 my $layout = $self->get_layout ($para);
3154 my ($w, $h) = $layout->size;
3155
3156 $para->{w} = $w + $para->{indent};
3157 $para->{h} = $h;
3158 $para->{wrapped} = $layout->has_wrapped;
3159 }
3160
3161 $para->{y} = $height;
3162 $height += $para->{h};
3163 }
3164
2567 $self->{height} += $h; 3165 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3166 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3167
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3168 delete $self->{texture};
3169 }
3170
3171 if (my $paridx = delete $self->{scroll_to}) {
3172 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3173 }
2572} 3174}
2573 3175
2574sub update { 3176sub update {
2575 my ($self) = @_; 3177 my ($self) = @_;
2576 3178
… …
2579 return unless $self->{h} > 0; 3181 return unless $self->{h} > 0;
2580 3182
2581 delete $self->{texture}; 3183 delete $self->{texture};
2582 3184
2583 $ROOT->on_post_alloc ($self => sub { 3185 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate;
3187
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3189
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3191 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3192 glClear GL_COLOR_BUFFER_BIT;
2616 3193
3194 package CFPlus::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h});
3197
3198 my $top = int $self->{children}[1]{range}[0];
3199
3200 my $paridx = 0;
3201 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3202 my $top = int $self->{children}[1]{range}[0];
2618 3203
2619 my $y0 = $top; 3204 my $y0 = $top;
2620 my $y1 = $top + $H; 3205 my $y1 = $top + $H;
2621 3206
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3207 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3208 my $h = $para->{h};
3209 my $y = $para->{y};
2634 3210
2635 if ($y0 < $y + $h && $y < $y1) { 3211 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3212 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3213
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3214 $layout->render ($para->{indent}, $y - $y0);
2642 3215
2643 glRasterPos $par->[3], $y - $y0; 3216 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3217 my @s = $layout->get_shapes;
3218
3219 for (@w) {
3220 my ($dx, $dy) = splice @s, 0, 2, ();
3221
3222 $_->{x} = $dx + $para->{indent};
3223 $_->{y} = $dy + $y - $y0;
3224
3225 $_->draw;
3226 }
3227 }
2645 } 3228 }
2646 3229
2647 $y += $h; 3230 $paridx++;
3231 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3232 }
2649 3233
2650 glDisable GL_BLEND; 3234 $self->{top_paragraph} = $top_paragraph;
2651 }; 3235 };
2652 }); 3236 });
3237}
3238
3239sub reconfigure {
3240 my ($self) = @_;
3241
3242 $self->SUPER::reconfigure;
3243
3244 $_->{w} = 1e10 for @{ $self->{par} };
3245 $self->reflow;
2653} 3246}
2654 3247
2655sub _draw { 3248sub _draw {
2656 my ($self) = @_; 3249 my ($self) = @_;
2657 3250
… …
2660 glColor 0, 0, 0, 1; 3253 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3254 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3255 glDisable GL_TEXTURE_2D;
2663 3256
2664 $self->{children}[1]->draw; 3257 $self->{children}[1]->draw;
2665
2666} 3258}
2667 3259
2668############################################################################# 3260#############################################################################
2669 3261
2670package CFClient::UI::Animator; 3262package CFPlus::UI::Animator;
2671 3263
2672use CFClient::OpenGL; 3264use CFPlus::OpenGL;
2673 3265
2674our @ISA = CFClient::UI::Bin::; 3266our @ISA = CFPlus::UI::Bin::;
2675 3267
2676sub moveto { 3268sub moveto {
2677 my ($self, $x, $y) = @_; 3269 my ($self, $x, $y) = @_;
2678 3270
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3299 glPopMatrix;
2708} 3300}
2709 3301
2710############################################################################# 3302#############################################################################
2711 3303
2712package CFClient::UI::Flopper; 3304package CFPlus::UI::Flopper;
2713 3305
2714our @ISA = CFClient::UI::Button::; 3306our @ISA = CFPlus::UI::Button::;
2715 3307
2716sub new { 3308sub new {
2717 my $class = shift; 3309 my $class = shift;
2718 3310
2719 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3323 $self->{other}->toggle_visibility;
2732} 3324}
2733 3325
2734############################################################################# 3326#############################################################################
2735 3327
2736package CFClient::UI::Tooltip; 3328package CFPlus::UI::Tooltip;
2737 3329
2738our @ISA = CFClient::UI::Bin::; 3330our @ISA = CFPlus::UI::Bin::;
2739 3331
2740use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2741 3333
2742sub new { 3334sub new {
2743 my $class = shift; 3335 my $class = shift;
2744 3336
2745 $class->SUPER::new ( 3337 $class->SUPER::new (
… …
2748 ) 3340 )
2749} 3341}
2750 3342
2751sub set_tooltip_from { 3343sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3344 my ($self, $widget) = @_;
3345
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3348
2754 my $tooltip = $widget->{tooltip}; 3349 my $tooltip = $widget->{tooltip};
2755 3350
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3351 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3356 }
2762 3357
2763 $tooltip =~ s/^\n+//; 3358 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3359 $tooltip =~ s/\n+$//;
2765 3360
2766 $self->add (new CFClient::UI::Label 3361 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3362 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3364 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3365 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3366 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3367 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3368 );
2774} 3369}
2775 3370
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3374 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3375
2781 ($w + 4, $h + 4) 3376 ($w + 4, $h + 4)
2782} 3377}
2783 3378
2784sub size_allocate { 3379sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3380 my ($self, $w, $h) = @_;
2786 3381
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3382 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3383}
2789 3384
2790sub visibility_change { 3385sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3386 my ($self, $visible) = @_;
2792 3387
2793 return unless $visible; 3388 return unless $visible;
2794 3389
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3390 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3391 my $widget = $self->{owner}
2797 or return; 3392 or return;
2798 3393
3394 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3395 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3396
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3397 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3398 if $x + $self->{w} > $self->{root}{w};
2803 3399
2804 $self->move_abs ($x, $y); 3400 $self->move_abs ($x, $y);
3401 } else {
3402 $self->hide;
3403 }
2805 }); 3404 });
2806} 3405}
2807 3406
2808sub _draw { 3407sub _draw {
2809 my ($self) = @_; 3408 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3432 $self->SUPER::_draw;
2834} 3433}
2835 3434
2836############################################################################# 3435#############################################################################
2837 3436
2838package CFClient::UI::Face; 3437package CFPlus::UI::Face;
2839 3438
2840our @ISA = CFClient::UI::Base::; 3439our @ISA = CFPlus::UI::DrawBG::;
2841 3440
2842use CFClient::OpenGL; 3441use CFPlus::OpenGL;
2843 3442
2844sub new { 3443sub new {
2845 my $class = shift; 3444 my $class = shift;
2846 3445
2847 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
2848 aspect => 1, 3449 aspect => 1,
2849 can_events => 0, 3450 can_events => 0,
2850 @_, 3451 @_,
2851 ); 3452 );
2852 3453
2853 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
2855 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2856 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3460 parked => 1,
2859 interval => $self->{animspeed},
2860 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
2861 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
2862 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
2863 }, 3469 },
2864 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
2865 } 3474 }
2866 3475
2867 $self 3476 $self
2868} 3477}
2869 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
2870sub size_request { 3510sub size_request {
2871 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
2872} 3527}
2873 3528
2874sub update { 3529sub update {
2875 my ($self) = @_; 3530 my ($self) = @_;
2876 3531
2877 return unless $self->{visible}; 3532 return unless $self->{visible};
2878 3533
2879 $self->SUPER::update; 3534 $self->SUPER::update;
2880} 3535}
2881 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
2882sub _draw { 3545sub _draw {
2883 my ($self) = @_; 3546 my ($self) = @_;
2884 3547
2885 return unless $::CONN; 3548 $self->SUPER::_draw;
2886 3549
2887 my $face; 3550 if (my $tex = $self->{tex}) {
2888
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}];
2891
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2897
2898 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3551 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
2905} 3557}
2906 3558
2907sub destroy { 3559sub destroy {
2908 my ($self) = @_; 3560 my ($self) = @_;
2909 3561
2910 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
2911 if $self->{timer}; 3563 if $self->{timer};
2912 3564
2913 $self->SUPER::destroy; 3565 $self->SUPER::destroy;
2914} 3566}
2915 3567
2916############################################################################# 3568#############################################################################
2917 3569
2918package CFClient::UI::Buttonbar; 3570package CFPlus::UI::Buttonbar;
2919 3571
2920our @ISA = CFClient::UI::HBox::; 3572our @ISA = CFPlus::UI::HBox::;
2921 3573
2922# TODO: should actualyl wrap buttons and other goodies. 3574# TODO: should actually wrap buttons and other goodies.
2923 3575
2924############################################################################# 3576#############################################################################
2925 3577
2926package CFClient::UI::Menu; 3578package CFPlus::UI::Menu;
2927 3579
2928our @ISA = CFClient::UI::FancyFrame::; 3580our @ISA = CFPlus::UI::Toplevel::;
2929 3581
2930use CFClient::OpenGL; 3582use CFPlus::OpenGL;
2931 3583
2932sub new { 3584sub new {
2933 my $class = shift; 3585 my $class = shift;
2934 3586
2935 my $self = $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
2936 items => [], 3588 items => [],
2937 z => 100, 3589 z => 100,
2938 @_, 3590 @_,
2939 ); 3591 );
2940 3592
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3594
2943 for my $item (@{ $self->{items} }) { 3595 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3596 my ($widget, $cb, $tooltip) = @$item;
2945 3597
2946 # handle various types of items, only text for now 3598 # handle various types of items, only text for now
2947 if (!ref $widget) { 3599 if (!ref $widget) {
3600 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2;
3602
2948 $widget = new CFClient::UI::Label 3603 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3604 can_hover => 1,
2950 can_events => 1, 3605 can_events => 1,
3606 tooltip => $tooltip,
3607 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1),
3610 ],
3611 ;
3612
3613 } else {
3614 $widget = new CFPlus::UI::Label
3615 can_hover => 1,
3616 can_events => 1,
2951 markup => $widget, 3617 markup => $widget,
2952 tooltip => $tooltip 3618 tooltip => $tooltip;
3619 }
2953 } 3620 }
2954 3621
2955 $self->{item}{$widget} = $item; 3622 $self->{item}{$widget} = $item;
2956 3623
2957 $self->{vbox}->add ($widget); 3624 $self->{vbox}->add ($widget);
… …
2962 3629
2963# popup given the event (must be a mouse button down event currently) 3630# popup given the event (must be a mouse button down event currently)
2964sub popup { 3631sub popup {
2965 my ($self, $ev) = @_; 3632 my ($self, $ev) = @_;
2966 3633
2967 $self->_emit ("popdown"); 3634 $self->emit ("popdown");
2968 3635
2969 # maybe save $GRAB? must be careful about events... 3636 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3637 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3638 $self->{button} = $ev->{button};
2972 3639
2973 $self->show; 3640 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3641 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3642}
2976 3643
2977sub mouse_motion { 3644sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3645 my ($self, $ev, $x, $y) = @_;
2979 3646
2980 # TODO: should use vbox->find_widget or so 3647 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3648 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3649 $self->{hover} = $self->{item}{$HOVER};
2983 3650
2984 0 3651 0
2985} 3652}
2986 3653
2987sub button_up { 3654sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3655 my ($self, $ev, $x, $y) = @_;
2989 3656
2990 if ($ev->{button} == $self->{button}) { 3657 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3658 undef $GRAB;
2992 $self->hide; 3659 $self->hide;
2993 3660
2994 $self->_emit ("popdown"); 3661 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3662 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3663 } else {
2997 return 0 3664 return 0
2998 } 3665 }
2999 3666
3000 1 3667 1
3001} 3668}
3002 3669
3003############################################################################# 3670#############################################################################
3004 3671
3005package CFClient::UI::Multiplexer; 3672package CFPlus::UI::Multiplexer;
3006 3673
3007our @ISA = CFClient::UI::Container::; 3674our @ISA = CFPlus::UI::Container::;
3008 3675
3009sub new { 3676sub new {
3010 my $class = shift; 3677 my $class = shift;
3011 3678
3012 my $self = $class->SUPER::new ( 3679 my $self = $class->SUPER::new (
… …
3026 3693
3027 $self->{current} = $self->{children}[0] 3694 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3695 if @{ $self->{children} };
3029} 3696}
3030 3697
3698sub get_current_page {
3699 my ($self) = @_;
3700
3701 $self->{current}
3702}
3703
3031sub set_current_page { 3704sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3705 my ($self, $page_or_widget) = @_;
3033 3706
3034 my $widget = ref $page_or_widget 3707 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3708 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3709 : $self->{children}[$page_or_widget];
3037 3710
3038 $self->{current} = $widget; 3711 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3712 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3713
3041 $self->_emit (page_changed => $self->{current}); 3714 $self->emit (page_changed => $self->{current});
3042 3715
3043 $self->realloc; 3716 $self->realloc;
3044} 3717}
3045 3718
3046sub visible_children { 3719sub visible_children {
… …
3051 my ($self) = @_; 3724 my ($self) = @_;
3052 3725
3053 $self->{current}->size_request 3726 $self->{current}->size_request
3054} 3727}
3055 3728
3056sub size_allocate { 3729sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3730 my ($self, $w, $h) = @_;
3058 3731
3059 $self->{current}->configure (0, 0, $w, $h); 3732 $self->{current}->configure (0, 0, $w, $h);
3733
3734 1
3060} 3735}
3061 3736
3062sub _draw { 3737sub _draw {
3063 my ($self) = @_; 3738 my ($self) = @_;
3064 3739
3065 $self->{current}->draw; 3740 $self->{current}->draw;
3066} 3741}
3067 3742
3068############################################################################# 3743#############################################################################
3069 3744
3070package CFClient::UI::Notebook; 3745package CFPlus::UI::Notebook;
3071 3746
3072our @ISA = CFClient::UI::VBox::; 3747our @ISA = CFPlus::UI::VBox::;
3073 3748
3074sub new { 3749sub new {
3075 my $class = shift; 3750 my $class = shift;
3076 3751
3077 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3753 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3755 # filter => # will be put between multiplexer and $self
3081 @_, 3756 @_,
3082 ); 3757 );
3083 3758
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3763}
3089 3764
3090sub add { 3765sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3092 3767
3093 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3094 3769
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3096 markup => $title, 3772 markup => $title,
3097 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 ;
3775 }
3776
3098 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3099 ); 3778 $self->{buttonbar}->add ($title);
3100 3779
3101 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3781}
3782
3783sub get_current_page {
3784 my ($self) = @_;
3785
3786 $self->{multiplexer}->get_current_page
3102} 3787}
3103 3788
3104sub set_current_page { 3789sub set_current_page {
3105 my ($self, $page) = @_; 3790 my ($self, $page) = @_;
3106 3791
3107 $self->{multiplexer}->set_current_page ($page); 3792 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3793 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3794}
3110 3795
3111############################################################################# 3796#############################################################################
3112 3797
3113package CFClient::UI::Combobox; 3798package CFPlus::UI::Selector;
3114 3799
3115use utf8; 3800use utf8;
3116 3801
3117our @ISA = CFClient::UI::Button::; 3802our @ISA = CFPlus::UI::Button::;
3118 3803
3119sub new { 3804sub new {
3120 my $class = shift; 3805 my $class = shift;
3121 3806
3122 my $self = $class->SUPER::new ( 3807 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3813 $self->_set_value ($self->{value});
3129 3814
3130 $self 3815 $self
3131} 3816}
3132 3817
3133sub button_down { 3818sub invoke_button_down {
3134 my ($self, $ev) = @_; 3819 my ($self, $ev) = @_;
3135 3820
3136 my @menu_items; 3821 my @menu_items;
3137 3822
3138 for (@{ $self->{options} }) { 3823 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3824 my ($value, $title, $tooltip) = @$_;
3140 3825
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3827 }
3143 3828
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3830}
3146 3831
3147sub _set_value { 3832sub _set_value {
3148 my ($self, $value) = @_; 3833 my ($self, $value) = @_;
3149 3834
… …
3159 my ($self, $value) = @_; 3844 my ($self, $value) = @_;
3160 3845
3161 return unless $self->{value} ne $value; 3846 return unless $self->{value} ne $value;
3162 3847
3163 $self->_set_value ($value); 3848 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3849 $self->emit (changed => $value);
3165} 3850}
3166 3851
3167############################################################################# 3852#############################################################################
3168 3853
3169package CFClient::UI::Statusbox; 3854package CFPlus::UI::Statusbox;
3170 3855
3171our @ISA = CFClient::UI::VBox::; 3856our @ISA = CFPlus::UI::VBox::;
3172 3857
3173sub new { 3858sub new {
3174 my $class = shift; 3859 my $class = shift;
3175 3860
3176 my $self = $class->SUPER::new ( 3861 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3862 fontsize => 0.8,
3178 @_, 3863 @_,
3179 ); 3864 );
3180 3865
3181 Scalar::Util::weaken (my $this = $self); 3866 CFPlus::weaken (my $this = $self);
3182 3867
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3869
3185 $self 3870 $self
3186} 3871}
… …
3188sub reorder { 3873sub reorder {
3189 my ($self) = @_; 3874 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3875 my $NOW = Time::HiRes::time;
3191 3876
3192 # freeze display when hovering over any label 3877 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3878 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3880 values %{ $self->{item} };
3196 3881
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3882 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3883 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3884 }
… …
3220 for ($short) { 3905 for ($short) {
3221 s/^\s+//; 3906 s/^\s+//;
3222 s/\s+/ /g; 3907 s/\s+/ /g;
3223 } 3908 }
3224 3909
3225 new CFClient::UI::Label 3910 new CFPlus::UI::Label
3226 markup => $short, 3911 markup => $short,
3227 tooltip => $item->{tooltip}, 3912 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3913 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3914 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3915 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3969 count => 1,
3285 %arg, 3970 %arg,
3286 }; 3971 };
3287 } 3972 }
3288 3973
3974 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3975 $self->reorder;
3976 });
3290} 3977}
3291 3978
3292sub reconfigure { 3979sub reconfigure {
3293 my ($self) = @_; 3980 my ($self) = @_;
3294 3981
… …
3307 $self->SUPER::destroy; 3994 $self->SUPER::destroy;
3308} 3995}
3309 3996
3310############################################################################# 3997#############################################################################
3311 3998
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 3999package CFPlus::UI::Root;
3674 4000
3675our @ISA = CFClient::UI::Container::; 4001our @ISA = CFPlus::UI::Container::;
3676 4002
3677use List::Util qw(min max); 4003use List::Util qw(min max);
3678 4004
3679use CFClient::OpenGL; 4005use CFPlus::OpenGL;
3680 4006
3681sub new { 4007sub new {
3682 my $class = shift; 4008 my $class = shift;
3683 4009
3684 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3685 visible => 1, 4011 visible => 1,
3686 @_, 4012 @_,
3687 ); 4013 );
3688 4014
3689 Scalar::Util::weaken ($self->{root} = $self); 4015 CFPlus::weaken ($self->{root} = $self);
3690 4016
3691 $self 4017 $self
3692} 4018}
3693 4019
3694sub size_request { 4020sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 4035 $coord = $max - $size if $coord > $max - $size;
3710 4036
3711 int $coord + 0.5 4037 int $coord + 0.5
3712} 4038}
3713 4039
3714sub size_allocate { 4040sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 4041 my ($self, $w, $h) = @_;
3716 4042
3717 for my $child ($self->children) { 4043 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4044 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 4045
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 4049 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 4050 $Y = _to_pixel $Y, $H, $self->{h};
3725 4051
3726 $child->configure ($X, $Y, $W, $H); 4052 $child->configure ($X, $Y, $W, $H);
3727 } 4053 }
4054
4055 1
3728} 4056}
3729 4057
3730sub coord2local { 4058sub coord2local {
3731 my ($self, $x, $y) = @_; 4059 my ($self, $x, $y) = @_;
3732 4060
… …
3787 while ($self->{refresh_hook}) { 4115 while ($self->{refresh_hook}) {
3788 $_->() 4116 $_->()
3789 for values %{delete $self->{refresh_hook}}; 4117 for values %{delete $self->{refresh_hook}};
3790 } 4118 }
3791 4119
3792 if ($self->{realloc}) { 4120 while ($self->{realloc}) {
3793 my %queue; 4121 my %queue;
3794 my @queue; 4122 my @queue;
3795 my $widget; 4123 my $widget;
3796 4124
3797 outer: 4125 outer:
… …
3844 } 4172 }
3845 } 4173 }
3846 4174
3847 delete $self->{realloc}{$widget+0}; 4175 delete $self->{realloc}{$widget+0};
3848 } 4176 }
3849 }
3850 4177
3851 while (my $size_alloc = delete $self->{size_alloc}) { 4178 while (my $size_alloc = delete $self->{size_alloc}) {
3852 my @queue = sort { $b->{visible} <=> $a->{visible} } 4179 my @queue = sort { $a->{visible} <=> $b->{visible} }
3853 values %$size_alloc; 4180 values %$size_alloc;
3854 4181
3855 while () { 4182 while () {
3856 my $widget = pop @queue || last; 4183 my $widget = pop @queue || last;
3857 4184
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4186
3860 $w = 0 if $w < 0; 4187 $w = max $widget->{min_w}, $w;
3861 $h = 0 if $h < 0; 4188 $h = max $widget->{min_h}, $h;
3862 4189
4190# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4191# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4192
4193 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4194 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4195
3863 $w = int $w + 0.5; 4196 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4197 $h = int $h + 0.5;
3865 4198
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4199 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4200 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h}; 4201 $widget->{old_h} = $widget->{h};
3869 4202
3870 $widget->{w} = $w; 4203 $widget->{w} = $w;
3871 $widget->{h} = $h; 4204 $widget->{h} = $h;
3872 4205
3873 $widget->emit (size_allocate => $w, $h); 4206 $widget->emit (size_allocate => $w, $h);
4207 }
3874 } 4208 }
3875 } 4209 }
3876 } 4210 }
3877 4211
3878 while ($self->{post_alloc_hook}) { 4212 while ($self->{post_alloc_hook}) {
3879 $_->() 4213 $_->()
3880 for values %{delete $self->{post_alloc_hook}}; 4214 for values %{delete $self->{post_alloc_hook}};
3881 } 4215 }
3882
3883 4216
3884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4217 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4218 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886 glClear GL_COLOR_BUFFER_BIT; 4219 glClear GL_COLOR_BUFFER_BIT;
3887 4220
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4224 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4225 glLoadIdentity;
3893 4226
3894 { 4227 {
3895 package CFClient::UI::Base; 4228 package CFPlus::UI::Base;
3896 4229
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4231 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4232
3901 $self->_draw; 4233 $self->_draw;
4234 }
3902} 4235}
3903 4236
3904############################################################################# 4237#############################################################################
3905 4238
3906package CFClient::UI; 4239package CFPlus::UI;
3907 4240
3908$ROOT = new CFClient::UI::Root; 4241$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4243
39111 42441
3912 4245

Diff Legend

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