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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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 { __w_ => $_[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->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
531 593
532# 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
533# functions seems pointless. 595# functions seems pointless.
534our ($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
535 597
536sub draw { 598#sub draw {
537 my ($self) = @_; 599#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584 600
585sub _draw { 601sub _draw {
586 my ($self) = @_; 602 my ($self) = @_;
587 603
588 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
589} 605}
590 606
591sub DESTROY { 607sub DESTROY {
592 my ($self) = @_; 608 my ($self) = @_;
593 609
594 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
595 611
612 local $@;
596 eval { $self->destroy }; 613 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
615
616 delete $WIDGET{$self+0};
598} 617}
599 618
600############################################################################# 619#############################################################################
601 620
602package CFClient::UI::DrawBG; 621package CFPlus::UI::DrawBG;
603 622
604our @ISA = CFClient::UI::Base::; 623our @ISA = CFPlus::UI::Base::;
605 624
606use strict; 625use strict;
607use CFClient::OpenGL; 626use CFPlus::OpenGL;
608 627
609sub new { 628sub new {
610 my $class = shift; 629 my $class = shift;
611
612 # range [value, low, high, page]
613 630
614 $class->SUPER::new ( 631 $class->SUPER::new (
615 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
616 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
617 @_ 634 @_
… …
629 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
630 647
631 glEnable GL_BLEND; 648 glEnable GL_BLEND;
632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
633 glColor_premultiply @$color; 650 glColor_premultiply @$color;
634
635 glBegin GL_QUADS;
636 glVertex 0 , 0;
637 glVertex 0 , $h;
638 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
639 glVertex $w, 0;
640 glEnd;
641
642 glDisable GL_BLEND; 652 glDisable GL_BLEND;
643 } 653 }
644} 654}
645 655
646############################################################################# 656#############################################################################
647 657
648package CFClient::UI::Empty; 658package CFPlus::UI::Empty;
649 659
650our @ISA = CFClient::UI::Base::; 660our @ISA = CFPlus::UI::Base::;
651 661
652sub new { 662sub new {
653 my ($class, %arg) = @_; 663 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 664 $class->SUPER::new (can_events => 0, %arg);
655} 665}
… …
662 672
663sub draw { } 673sub draw { }
664 674
665############################################################################# 675#############################################################################
666 676
667package CFClient::UI::Container; 677package CFPlus::UI::Container;
668 678
669our @ISA = CFClient::UI::Base::; 679our @ISA = CFPlus::UI::Base::;
670 680
671sub new { 681sub new {
672 my ($class, %arg) = @_; 682 my ($class, %arg) = @_;
673 683
674 my $children = delete $arg{children}; 684 my $children = delete $arg{children};
… …
678 can_events => 0, 688 can_events => 0,
679 %arg, 689 %arg,
680 ); 690 );
681 691
682 $self->add (@$children) 692 $self->add (@$children)
683 if $children; 693 if $children && @$children;
684 694
685 $self 695 $self
696}
697
698sub realloc {
699 my ($self) = @_;
700
701 $self->{force_realloc} = 1;
702 $self->{force_size_alloc} = 1;
703 $self->SUPER::realloc;
686} 704}
687 705
688sub add { 706sub add {
689 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
690 708
691 $_->set_parent ($self) 709 $_->set_parent ($self)
692 for @widgets; 710 for @widgets;
693 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
694 use sort 'stable'; 713 use sort 'stable';
695 714
696 $self->{children} = [ 715 $self->{children} = [
697 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
698 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
699 ]; 718 ];
700 719
701 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
702} 725}
703 726
704sub children { 727sub children {
705 @{ $_[0]{children} } 728 @{ $_[0]{children} }
706} 729}
707 730
708sub remove { 731sub remove {
709 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
710 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
711 delete $child->{parent}; 737 delete $child->{parent};
712 $child->hide; 738 $child->hide;
713
714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
715 741
716 $self->realloc; 742 $self->realloc;
717} 743}
718 744
719sub clear { 745sub clear {
720 my ($self) = @_; 746 my ($self) = @_;
721 747
722 my $children = delete $self->{children}; 748 my $children = $self->{children};
723 $self->{children} = []; 749 $self->{children} = [];
724 750
725 for (@$children) { 751 for (@$children) {
726 delete $_->{parent}; 752 delete $_->{parent};
727 $_->hide; 753 $_->hide;
… …
747} 773}
748 774
749sub _draw { 775sub _draw {
750 my ($self) = @_; 776 my ($self) = @_;
751 777
752 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
753} 779}
754 780
755############################################################################# 781#############################################################################
756 782
757package CFClient::UI::Bin; 783package CFPlus::UI::Bin;
758 784
759our @ISA = CFClient::UI::Container::; 785our @ISA = CFPlus::UI::Container::;
760 786
761sub new { 787sub new {
762 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
763 789
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 790 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 791
766 $class->SUPER::new (children => [$child], %arg) 792 $class->SUPER::new (children => [$child], %arg)
767} 793}
768 794
769sub add { 795sub add {
770 my ($self, $child) = @_; 796 my ($self, $child) = @_;
771 797
772 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
773 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
774} 800}
775 801
776sub remove { 802sub remove {
777 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
778 804
779 $self->SUPER::remove ($widget); 805 $self->SUPER::remove ($widget);
780 806
781 $self->{children} = [new CFClient::UI::Empty] 807 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 808 unless @{$self->{children}};
783} 809}
784 810
785sub child { $_[0]->{children}[0] } 811sub child { $_[0]->{children}[0] }
786 812
… …
798 824
799############################################################################# 825#############################################################################
800 826
801# back-buffered drawing area 827# back-buffered drawing area
802 828
803package CFClient::UI::Window; 829package CFPlus::UI::Window;
804 830
805our @ISA = CFClient::UI::Bin::; 831our @ISA = CFPlus::UI::Bin::;
806 832
807use CFClient::OpenGL; 833use CFPlus::OpenGL;
808 834
809sub new { 835sub new {
810 my ($class, %arg) = @_; 836 my ($class, %arg) = @_;
811 837
812 my $self = $class->SUPER::new (%arg); 838 my $self = $class->SUPER::new (%arg);
… …
834} 860}
835 861
836sub render_child { 862sub render_child {
837 my ($self) = @_; 863 my ($self) = @_;
838 864
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 865 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 866 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 867 glClear GL_COLOR_BUFFER_BIT;
842 868
843 { 869 {
844 package CFClient::UI::Base; 870 package CFPlus::UI::Base;
845 871
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 872 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 873 (0, 0, $self->{w}, $self->{h});
874
875 $self->_render;
848 } 876 }
849
850 $self->_render;
851 }; 877 };
852} 878}
853 879
854sub _draw { 880sub _draw {
855 my ($self) = @_; 881 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 882
859 my $tex = $self->{texture} 883 my $tex = $self->{texture}
860 or return; 884 or return;
861 885
862 glEnable GL_TEXTURE_2D; 886 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 888 glColor 0, 0, 0, 1;
865 889
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 890 $tex->draw_quad_alpha_premultiplied (0, 0);
867 891
868 glDisable GL_TEXTURE_2D; 892 glDisable GL_TEXTURE_2D;
869} 893}
870 894
871############################################################################# 895#############################################################################
872 896
873package CFClient::UI::ViewPort; 897package CFPlus::UI::ViewPort;
874 898
899use List::Util qw(min max);
900
875our @ISA = CFClient::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
876 902
877sub new { 903sub new {
878 my $class = shift; 904 my $class = shift;
879 905
880 $class->SUPER::new ( 906 $class->SUPER::new (
… …
887sub size_request { 913sub size_request {
888 my ($self) = @_; 914 my ($self) = @_;
889 915
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 917
892 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
894 920
895 ($w, $h) 921 ($w, $h)
896} 922}
897 923
898sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
910} 936}
911 937
912sub set_offset { 938sub set_offset {
913 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
914 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
917 947
948 $self->emit (changed => $x, $y);
918 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
919} 969}
920 970
921# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 972sub coord2local {
923 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
939 989
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 992 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 994 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 996 }
947} 997}
948 998
949sub _render { 999sub _render {
950 my ($self) = @_; 1000 my ($self) = @_;
951 1001
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1002 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1003 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1004
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1005 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1006
957 $self->SUPER::_render; 1007 $self->SUPER::_render;
958} 1008}
959 1009
960############################################################################# 1010#############################################################################
961 1011
962package CFClient::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
963 1013
964our @ISA = CFClient::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
965 1015
966sub new { 1016sub new {
967 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
968 1018
969 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
970 1020
971 my $self; 1021 my $self;
972 1022
973 my $slider = new CFClient::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
974 vertical => 1, 1037 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1039 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1042 },
979 ; 1043 ;
980 1044
981 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1048 can_events => 1,
983 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
984 %arg, 1053 %arg,
985 ); 1054 );
986 1055
1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
988 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
989 1080
990 $self 1081 $self
991} 1082}
992 1083
… …
994 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
995 1086
996 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
997} 1088}
998 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
999sub update { 1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1000 my ($self) = @_; 1125 my ($self, $ev) = @_;
1001 1126
1002 $self->SUPER::update; 1127 $self->grab_focus;
1003 1128
1004 # todo: overwrite size_allocate of child 1129 my $ox = $self->{vp}{view_x};
1005 my $child = $self->{vp}->child; 1130 my $oy = $self->{vp}{view_y};
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1142sub invoke_mouse_wheel {
1143 my ($self, $ev) = @_;
1144
1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1158
1159 0
1160}
1161
1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1164
1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1007} 1181}
1008 1182
1009sub invoke_size_allocate { 1183sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1011 1185
1012 my $child = $self->{vp}->child; 1186 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1188}
1017 1189
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1190#############################################################################
1022 1191
1023package CFClient::UI::Frame; 1192package CFPlus::UI::Frame;
1024 1193
1025our @ISA = CFClient::UI::Bin::; 1194our @ISA = CFPlus::UI::Bin::;
1026 1195
1027use CFClient::OpenGL; 1196use CFPlus::OpenGL;
1028 1197
1029sub new { 1198sub new {
1030 my $class = shift; 1199 my $class = shift;
1031 1200
1032 $class->SUPER::new ( 1201 $class->SUPER::new (
… …
1042 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1043 1212
1044 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1047
1048 glBegin GL_QUADS;
1049 glVertex 0 , 0;
1050 glVertex 0 , $h;
1051 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1052 glVertex $w, 0;
1053 glEnd;
1054
1055 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1056 } 1218 }
1057 1219
1058 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1059} 1221}
1060 1222
1061############################################################################# 1223#############################################################################
1062 1224
1063package CFClient::UI::FancyFrame; 1225package CFPlus::UI::FancyFrame;
1064 1226
1065our @ISA = CFClient::UI::Bin::; 1227our @ISA = CFPlus::UI::Bin::;
1066 1228
1067use CFClient::OpenGL; 1229use CFPlus::OpenGL;
1230
1231sub new {
1232 my ($class, %arg) = @_;
1233
1234 if ((exists $arg{label}) && !ref $arg{label}) {
1235 $arg{label} = new CFPlus::UI::Label
1236 align => 1,
1237 valign => 0,
1238 text => $arg{label},
1239 fontsize => ($arg{border} || 0.8) * 0.75;
1240 }
1241
1242 my $self = $class->SUPER::new (
1243 # label => "",
1244 fg => [0.6, 0.3, 0.1],
1245 border => 0.8,
1246 style => 'single',
1247 %arg,
1248 );
1249
1250 $self
1251}
1252
1253sub add {
1254 my ($self, @widgets) = @_;
1255
1256 $self->SUPER::add (@widgets);
1257 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1258}
1259
1260sub border {
1261 int $_[0]{border} * $::FONTSIZE
1262}
1263
1264sub size_request {
1265 my ($self) = @_;
1266
1267 ($self->{label_w}, undef) = $self->{label}->size_request
1268 if $self->{label};
1269
1270 my ($w, $h) = $self->SUPER::size_request;
1271
1272 (
1273 $w + $self->border * 2,
1274 $h + $self->border * 2,
1275 )
1276}
1277
1278sub invoke_size_allocate {
1279 my ($self, $w, $h) = @_;
1280
1281 my $border = $self->border;
1282
1283 $w -= List::Util::max 0, $border * 2;
1284 $h -= List::Util::max 0, $border * 2;
1285
1286 if (my $label = $self->{label}) {
1287 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1288 $label->{h} = List::Util::min $h, $border;
1289 $label->invoke_size_allocate ($label->{w}, $label->{h});
1290 }
1291
1292 $self->child->configure ($border, $border, $w, $h);
1293
1294 1
1295}
1296
1297sub _draw {
1298 my ($self) = @_;
1299
1300 my $child = $self->{children}[0];
1301
1302 my $border = $self->border;
1303 my ($w, $h) = ($self->{w}, $self->{h});
1304
1305 $child->draw;
1306
1307 glColor @{$self->{fg}};
1308 glBegin GL_LINE_STRIP;
1309 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1310 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1311 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1312 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1313 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1314 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1315 glEnd;
1316
1317 if ($self->{label}) {
1318 glTranslate $border * 2, 0;
1319 $self->{label}->_draw;
1320 }
1321}
1322
1323#############################################################################
1324
1325package CFPlus::UI::Toplevel;
1326
1327our @ISA = CFPlus::UI::Bin::;
1328
1329use CFPlus::OpenGL;
1068 1330
1069my $bg = 1331my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1332 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1333 mipmap => 1, wrap => 1;
1072 1334
1073my @border = 1335my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1076 1342
1077sub new { 1343sub new {
1078 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1079 1345
1080 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1348 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1349 border => 0.6,
1084 can_events => 1, 1350 can_events => 1,
1085 min_w => 16, 1351 min_w => 64,
1086 min_h => 16, 1352 min_h => 32,
1087 %arg, 1353 %arg,
1088 ); 1354 );
1089 1355
1090 $self->{title_widget} = new CFClient::UI::Label 1356 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1357 align => 0,
1092 valign => 1, 1358 valign => 1,
1093 text => $self->{title}, 1359 text => $self->{title},
1094 fontsize => $self->{border}, 1360 fontsize => $self->{border},
1095 if exists $self->{title}; 1361 if exists $self->{title};
1096 1362
1097 if ($self->{has_close_button}) { 1363 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1364 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1365 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1366 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1367 on_activate => sub { $self->emit ("delete") };
1102 1368
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1369 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1370 }
1105 1371
1106 $self 1372 $self
1107} 1373}
1108 1374
1109sub add { 1375sub add {
1110 my ($self, @widgets) = @_; 1376 my ($self, @widgets) = @_;
1111 1377
1112 $self->SUPER::add (@widgets); 1378 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1379 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1380 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1381}
1116 1382
1117sub border { 1383sub border {
1118 int $_[0]{border} * $::FONTSIZE 1384 int $_[0]{border} * $::FONTSIZE
1119} 1385}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1418 $self->child->configure ($border, $border, $w, $h);
1153 1419
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1420 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1421 if $self->{close_button};
1156 1422
1423 1
1424}
1425
1426sub invoke_delete {
1427 my ($self) = @_;
1428
1429 $self->hide;
1430
1157 1 1431 1
1158} 1432}
1159 1433
1160sub invoke_button_down { 1434sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1493 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1494
1221 ! ! $self->{motion} 1495 ! ! $self->{motion}
1222} 1496}
1223 1497
1498sub invoke_visibility_change {
1499 my ($self, $visible) = @_;
1500
1501 delete $self->{motion} unless $visible;
1502
1503 0
1504}
1505
1224sub _draw { 1506sub _draw {
1225 my ($self) = @_; 1507 my ($self) = @_;
1226 1508
1227 my $child = $self->{children}[0]; 1509 my $child = $self->{children}[0];
1228 1510
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1516
1235 my $border = $self->border; 1517 my $border = $self->border;
1236 1518
1237 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1538
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1245 1541
1246 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1561 if $self->{close_button};
1266} 1562}
1267 1563
1268############################################################################# 1564#############################################################################
1269 1565
1270package CFClient::UI::Table; 1566package CFPlus::UI::Table;
1271 1567
1272our @ISA = CFClient::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1273 1569
1274use List::Util qw(max sum); 1570use List::Util qw(max sum);
1275 1571
1276use CFClient::OpenGL; 1572use CFPlus::OpenGL;
1277 1573
1278sub new { 1574sub new {
1279 my $class = shift; 1575 my $class = shift;
1280 1576
1281 $class->SUPER::new ( 1577 $class->SUPER::new (
1282 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1283 @_, 1580 @_,
1284 ) 1581 )
1285} 1582}
1286 1583
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1584sub add {
1292 my ($self, $x, $y, $child) = @_; 1585 my ($self, @widgets) = @_;
1293 1586
1294 $child->set_parent ($self); 1587 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1296 1591
1297 $self->realloc; 1592 $self->SUPER::add (@widgets);
1298} 1593}
1299 1594
1300sub remove { 1595sub add_at {
1596 my $self = shift;
1597
1598 my @widgets;
1599
1600 while (@_) {
1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1602
1603 $child->{c_row} = $row;
1604 $child->{c_col} = $col;
1605
1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1301 my ($self, $child) = @_; 1613 my ($self) = @_;
1302 1614
1303 # TODO: not yet implemented 1615 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1616
1310 my @children = $self->children; 1617 my @children = $self->children;
1311 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1312 1628 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1629
1318 $self->realloc; 1630 # second pass, rows
1319} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1334 1633
1335 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1638 }
1338 } 1639 }
1339 1640
1340 (\@w, \@h) 1641 (\@w, \@h)
1341} 1642}
… …
1357 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1358 1659
1359 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1361 1662
1362 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1366 1667
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1669
1371 CFClient::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1372 CFClient::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1373 1679
1374 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1682
1376 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1378 or next;
1379 1685
1380 my $x = 0; 1686 $widget->configure (
1381 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1689 );
1383 for my $c (0 .. $#$row) { 1690 }
1384 my $col_w = $ws->[$c];
1385 1691
1386 if (my $widget = $row->[$c]) { 1692 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1388 }
1389 1694
1390 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1391 } 1722 }
1723 }
1392 1724
1393 $y += $row_h; 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1727
1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1754
1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1394 } 1756 }
1395 1757
1396 1 1758 1
1397} 1759}
1398 1760
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1761#############################################################################
1424 1762
1425package CFClient::UI::Box; 1763package CFPlus::UI::Box;
1426 1764
1427our @ISA = CFClient::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1428 1766
1429sub size_request { 1767sub size_request {
1430 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1431 1771
1432 $self->{vertical} 1772 $self->{vertical}
1433 ? ( 1773 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1436 ) 1776 )
1437 : ( 1777 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1440 ) 1780 )
1441} 1781}
1442 1782
1443sub invoke_size_allocate { 1783sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1465 $req[$_] += $space * $children[$_]{expand} 1805 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1806 for 0 .. $#children;
1467 } 1807 }
1468 } 1808 }
1469 1809
1470 CFClient::UI::harmonize \@req; 1810 CFPlus::UI::harmonize \@req;
1471 1811
1472 my $pos = 0; 1812 my $pos = 0;
1473 for (0 .. $#children) { 1813 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1814 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1815 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1820 1
1481} 1821}
1482 1822
1483############################################################################# 1823#############################################################################
1484 1824
1485package CFClient::UI::HBox; 1825package CFPlus::UI::HBox;
1486 1826
1487our @ISA = CFClient::UI::Box::; 1827our @ISA = CFPlus::UI::Box::;
1488 1828
1489sub new { 1829sub new {
1490 my $class = shift; 1830 my $class = shift;
1491 1831
1492 $class->SUPER::new ( 1832 $class->SUPER::new (
… …
1495 ) 1835 )
1496} 1836}
1497 1837
1498############################################################################# 1838#############################################################################
1499 1839
1500package CFClient::UI::VBox; 1840package CFPlus::UI::VBox;
1501 1841
1502our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1503 1843
1504sub new { 1844sub new {
1505 my $class = shift; 1845 my $class = shift;
1506 1846
1507 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1510 ) 1850 )
1511} 1851}
1512 1852
1513############################################################################# 1853#############################################################################
1514 1854
1515package CFClient::UI::Label; 1855package CFPlus::UI::Label;
1516 1856
1517our @ISA = CFClient::UI::DrawBG::; 1857our @ISA = CFPlus::UI::DrawBG::;
1518 1858
1519use CFClient::OpenGL; 1859use CFPlus::OpenGL;
1520 1860
1521sub new { 1861sub new {
1522 my ($class, %arg) = @_; 1862 my ($class, %arg) = @_;
1523 1863
1524 my $self = $class->SUPER::new ( 1864 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1867 #active_bg => none
1528 #font => default_font 1868 #font => default_font
1529 #text => initial text 1869 #text => initial text
1530 #markup => initial narkup 1870 #markup => initial narkup
1531 #max_w => maximum pixel width 1871 #max_w => maximum pixel width
1872 #style => 0, # render flags
1532 ellipsise => 3, # end 1873 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1874 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1875 fontsize => 1,
1535 align => -1, 1876 align => -1,
1536 valign => -1, 1877 valign => -1,
1537 padding_x => 2, 1878 padding_x => 2,
1538 padding_y => 2, 1879 padding_y => 2,
1539 can_events => 0, 1880 can_events => 0,
1540 %arg 1881 %arg
1541 ); 1882 );
1542 1883
1543 if (exists $self->{template}) { 1884 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1885 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1886 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1887 $self->{template} = $layout;
1547 } 1888 }
1548 1889
1549 if (exists $self->{markup}) { 1890 if (exists $self->{markup}) {
… …
1553 } 1894 }
1554 1895
1555 $self 1896 $self
1556} 1897}
1557 1898
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1899sub update {
1569 my ($self) = @_; 1900 my ($self) = @_;
1570 1901
1571 delete $self->{texture}; 1902 delete $self->{texture};
1572 $self->SUPER::update; 1903 $self->SUPER::update;
… …
1577 1908
1578 delete $self->{ox}; 1909 delete $self->{ox};
1579 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1580} 1911}
1581 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1582sub set_text { 1919sub set_text {
1583 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1584 1921
1585 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
1587 1924
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1925 $self->{layout}->set_text ($text);
1590 1926
1591 delete $self->{size_req}; 1927 delete $self->{size_req};
1592 $self->realloc; 1928 $self->realloc;
1593 $self->update; 1929 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1935 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1936 $self->{text} = "M$markup";
1601 1937
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1938 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1939
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1940 $self->{layout}->set_markup ($markup);
1606 1941
1607 delete $self->{size_req}; 1942 delete $self->{size_req};
1608 $self->realloc; 1943 $self->realloc;
1609 $self->update; 1944 $self->update;
… …
1621 1956
1622 my ($w, $h) = $self->{layout}->size; 1957 my ($w, $h) = $self->{layout}->size;
1623 1958
1624 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1960 $self->{template}->set_font ($self->{font}) if $self->{font};
1961 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1962 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1963
1628 my ($w2, $h2) = $self->{template}->size; 1964 my ($w2, $h2) = $self->{template}->size;
1629 1965
1630 $w = List::Util::max $w, $w2; 1966 $w = List::Util::max $w, $w2;
… …
1654 1990
1655sub set_fontsize { 1991sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1992 my ($self, $fontsize) = @_;
1657 1993
1658 $self->{fontsize} = $fontsize; 1994 $self->{fontsize} = $fontsize;
1995 delete $self->{size_req};
1659 delete $self->{texture}; 1996 delete $self->{texture};
1660 1997
1661 $self->realloc; 1998 $self->realloc;
1662} 1999}
1663 2000
1664sub reconfigure { 2001sub reconfigure {
1665 my ($self) = @_; 2002 my ($self) = @_;
1666 2003
1667 delete $self->{size_req}; 2004 delete $self->{size_req};
2005 delete $self->{texture};
1668 2006
1669 $self->SUPER::reconfigure; 2007 $self->SUPER::reconfigure;
1670} 2008}
1671 2009
1672sub _draw { 2010sub _draw {
1673 my ($self) = @_; 2011 my ($self) = @_;
1674 2012
1675 $self->SUPER::_draw; # draw background, if applicable 2013 $self->SUPER::_draw; # draw background, if applicable
1676 2014
1677 my $tex = $self->{texture} ||= do { 2015 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2016 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2017 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2018 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2019 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2020 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2021 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2022
1685 new_from_layout CFClient::Texture $self->{layout} 2023 [$self->{layout}->size]
1686 }; 2024 };
1687 2025
1688 unless (exists $self->{ox}) { 2026 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2027 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2028 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1692 2030
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 }; 2036 };
1697 2037
1698 glEnable GL_TEXTURE_2D; 2038# unless ($self->{list}) {
1699 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2040# CFPlus::OpenGL::glNewList $self->{list};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 2042# CFPlus::OpenGL::glEndList;
1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 } 2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
1711 2046
1712 glDisable GL_TEXTURE_2D; 2047 $self->{layout}->draw;
1713} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1714 2057
1715############################################################################# 2058#############################################################################
1716 2059
1717package CFClient::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1718 2061
1719our @ISA = CFClient::UI::Label::; 2062our @ISA = CFPlus::UI::Label::;
1720 2063
1721use CFClient::OpenGL; 2064use CFPlus::OpenGL;
1722 2065
1723sub new { 2066sub new {
1724 my $class = shift; 2067 my $class = shift;
1725 2068
1726 $class->SUPER::new ( 2069 $class->SUPER::new (
1727 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1728 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1729 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1730 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1731 can_hover => 1, 2076 can_hover => 1,
1732 can_focus => 1, 2077 can_focus => 1,
1733 valign => 0, 2078 valign => 0,
1734 can_events => 1, 2079 can_events => 1,
2080 ellipsise => 0,
1735 #text => ... 2081 #text => ...
1736 #hidden => "*", 2082 #hidden => "*",
1737 @_ 2083 @_
1738 ) 2084 )
1739} 2085}
… …
1784 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1786 2132
1787 my $text = $self->get_text; 2133 my $text = $self->get_text;
1788 2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2136
1789 if ($uni == 8) { 2137 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2145 } elsif ($sym == CFPlus::SDLK_HOME) {
2146 # what a hack
2147 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1
2150 : 0;
2151 } elsif ($sym == CFPlus::SDLK_END) {
2152 # uh, again
2153 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2155 ? $self->{cursor} + length $1
2156 : length $self->{text};
2157 } elsif ($uni == 21) { # ctrl-u
2158 $text = "";
1798 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2161 $self->emit ('escape');
1803 } elsif ($uni) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2166 } else {
1806 return 0; 2167 return 0;
1807 } 2168 }
1808 2169
1809 $self->_set_text ($text); 2170 $self->_set_text ($text);
1810 2171
1811 $self->realloc; 2172 $self->realloc;
2173 $self->update;
1812 2174
1813 1 2175 1
1814} 2176}
1815 2177
1816sub invoke_focus_in { 2178sub invoke_focus_in {
… …
1828 2190
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2191 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2192
1831 # byte-index to char-index 2193 # byte-index to char-index
1832 my $text = $self->{text}; 2194 my $text = $self->{text};
1833 utf8::encode $text; 2195 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2196 $self->{cursor} = length $text;
1835 2197
1836 $self->_set_text ($self->{text}); 2198 $self->_set_text ($self->{text});
1837 $self->update; 2199 $self->update;
1838 2200
1839 1 2201 1
… …
1858 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
1859 } 2221 }
1860 2222
1861 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1863 glBegin GL_QUADS;
1864 glVertex 0 , 0;
1865 glVertex 0 , $self->{h};
1866 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
1867 glVertex $self->{w}, 0;
1868 glEnd;
1869 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
1870 2227
1871 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1872 2229
1873 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
1875 2232
1876 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
1877 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
1878 utf8::encode $text; 2235 utf8::encode $text;
1879 2236
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1881 } 2238 }
1882 2239
1883 glColor @{$self->{fg}}; 2240 glColor_premultiply @{$self->{active_fg}};
1884 glBegin GL_LINES; 2241 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2244 glEnd;
1888 }
1889}
1890 2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2259 glEnd;
2260 }
2261}
2262
2263#############################################################################
2264
1891package CFClient::UI::Entry; 2265package CFPlus::UI::Entry;
1892 2266
1893our @ISA = CFClient::UI::EntryBase::; 2267our @ISA = CFPlus::UI::EntryBase::;
1894 2268
1895use CFClient::OpenGL; 2269use CFPlus::OpenGL;
1896 2270
1897sub invoke_key_down { 2271sub invoke_key_down {
1898 my ($self, $ev) = @_; 2272 my ($self, $ev) = @_;
1899 2273
1900 my $sym = $ev->{sym}; 2274 my $sym = $ev->{sym};
1901 2275
1902 if ($sym == 13) { 2276 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2277 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2278 my $txt = $self->get_text;
1905 2279
1906 $self->{history_pointer} = -1; 2280 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2281 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2282 $self->emit (activate => $txt);
1909 $self->update; 2283 $self->update;
1910 2284
1911 } elsif ($sym == CFClient::SDLK_UP) { 2285 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2286 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2287 $self->{history_saveback} = $self->get_text;
1914 } 2288 }
1915 if (@{$self->{history} || []} > 0) { 2289 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2290 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2292 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2293 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2294 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2295 }
1922 2296
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2297 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2298 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2299 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2300
1927 if ($self->{history_pointer} >= 0) { 2301 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2311 1
1938} 2312}
1939 2313
1940############################################################################# 2314#############################################################################
1941 2315
2316package CFPlus::UI::TextEdit;
2317
2318our @ISA = CFPlus::UI::EntryBase::;
2319
2320use CFPlus::OpenGL;
2321
2322sub move_cursor_ver {
2323 my ($self, $dy) = @_;
2324
2325 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2326
2327 $y += $dy;
2328
2329 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2330 $self->{cursor} = $index;
2331 delete $self->{cur_h};
2332 $self->update;
2333 return;
2334 }
2335}
2336
2337sub invoke_key_down {
2338 my ($self, $ev) = @_;
2339
2340 my $sym = $ev->{sym};
2341
2342 if ($sym == CFPlus::SDLK_UP) {
2343 $self->move_cursor_ver (-1);
2344 } elsif ($sym == CFPlus::SDLK_DOWN) {
2345 $self->move_cursor_ver (+1);
2346 } else {
2347 return $self->SUPER::invoke_key_down ($ev)
2348 }
2349
2350 1
2351}
2352
2353#############################################################################
2354
1942package CFClient::UI::Button; 2355package CFPlus::UI::ButtonBin;
1943 2356
1944our @ISA = CFClient::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
1945 2358
1946use CFClient::OpenGL; 2359use CFPlus::OpenGL;
1947 2360
1948my @tex = 2361my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
1951 2364
1952sub new { 2365sub new {
1953 my $class = shift; 2366 my $class = shift;
1954 2367
1955 $class->SUPER::new ( 2368 $class->SUPER::new (
1956 padding_x => 4,
1957 padding_y => 4,
1958 fg => [1, 1, 1],
1959 active_fg => [0, 0, 1],
1960 can_hover => 1, 2369 can_hover => 1,
1961 align => 0, 2370 align => 0,
1962 valign => 0, 2371 valign => 0,
1963 can_events => 1, 2372 can_events => 1,
1964 @_ 2373 @_
… …
1976} 2385}
1977 2386
1978sub _draw { 2387sub _draw {
1979 my ($self) = @_; 2388 my ($self) = @_;
1980 2389
1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1982
1983 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1986 2393
2394 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2396
1989 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
1990 2398
1991 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
1992} 2400}
1993 2401
1994############################################################################# 2402#############################################################################
1995 2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2451
2452 glDisable GL_TEXTURE_2D;
2453
2454 $self->SUPER::_draw;
2455}
2456
2457#############################################################################
2458
2459package CFPlus::UI::CheckBox;
2460
2461our @ISA = CFPlus::UI::DrawBG::;
2462
2463my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466
2467use CFPlus::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 padding_x => 2,
2474 padding_y => 2,
2475 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2],
2478 active_bg => [1, 1, 1, 0.5],
2479 state => 0,
2480 can_hover => 1,
2481 @_
2482 )
2483}
2484
2485sub size_request {
2486 my ($self) = @_;
2487
2488 (6) x 2
2489}
2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
2499sub invoke_button_down {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2504 $self->toggle;
2505 } else {
2506 return 0
2507 }
2508
2509 1
2510}
2511
2512sub _draw {
2513 my ($self) = @_;
2514
2515 $self->SUPER::_draw;
2516
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2518
2519 my ($w, $h) = @$self{qw(w h)};
2520
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522
2523 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2524
2525 my $tex = $self->{state} ? $tex[1] : $tex[0];
2526
2527 glEnable GL_TEXTURE_2D;
2528 $tex->draw_quad_alpha (0, 0, $s, $s);
2529 glDisable GL_TEXTURE_2D;
2530}
2531
2532#############################################################################
2533
2534package CFPlus::UI::Image;
2535
2536our @ISA = CFPlus::UI::Base::;
2537
2538use CFPlus::OpenGL;
2539
2540our %texture_cache;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 scale => 1,
2548 @_,
2549 );
2550
2551 $self->{path} || $self->{tex}
2552 or Carp::croak "'path' or 'tex' attributes required";
2553
2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2556
2557 CFPlus::weaken $texture_cache{$self->{path}};
2558
2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2560
2561 $self
2562}
2563
2564sub STORABLE_freeze {
2565 my ($self, $cloning) = @_;
2566
2567 $self->{path}
2568 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2569
2570 $self->{path}
2571}
2572
2573sub STORABLE_attach {
2574 my ($self, $cloning, $path) = @_;
2575
2576 $self->new (path => $path)
2577}
2578
2579sub size_request {
2580 my ($self) = @_;
2581
2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2583}
2584
2585sub _draw {
2586 my ($self) = @_;
2587
2588 my $tex = $self->{tex};
2589
2590 my ($w, $h) = ($self->{w}, $self->{h});
2591
2592 if ($self->{rot90}) {
2593 glRotate 90, 0, 0, 1;
2594 glTranslate 0, -$self->{w}, 0;
2595
2596 ($w, $h) = ($h, $w);
2597 }
2598
2599 glEnable GL_TEXTURE_2D;
2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2601
2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2603
2604 glDisable GL_TEXTURE_2D;
2605}
2606
2607#############################################################################
2608
1996package CFClient::UI::ImageButton; 2609package CFPlus::UI::ImageButton;
1997 2610
1998our @ISA = CFClient::UI::Image::; 2611our @ISA = CFPlus::UI::Image::;
1999 2612
2000use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2001 2614
2002my %textures; 2615my %textures;
2003 2616
2004sub new { 2617sub new {
2005 my $class = shift; 2618 my $class = shift;
… …
2015 can_events => 1, 2628 can_events => 1,
2016 @_ 2629 @_
2017 ); 2630 );
2018} 2631}
2019 2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2637}
2638
2020sub invoke_button_up { 2639sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2022 2641
2023 $self->emit ("activate") 2642 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w} 2643 if $x >= 0 && $x < $self->{w}
… …
2027 1 2646 1
2028} 2647}
2029 2648
2030############################################################################# 2649#############################################################################
2031 2650
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2651package CFPlus::UI::VGauge;
2101 2652
2102our @ISA = CFClient::UI::Base::; 2653our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2654
2163use List::Util qw(min max); 2655use List::Util qw(min max);
2164 2656
2165use CFClient::OpenGL; 2657use CFPlus::OpenGL;
2166 2658
2167my %tex = ( 2659my %tex = (
2168 food => [ 2660 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2662 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2663 ],
2172 grace => [ 2664 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2666 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2667 ],
2176 hp => [ 2668 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2670 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2671 ],
2180 mana => [ 2672 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2673 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2674 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2675 ],
2184); 2676);
2185 2677
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2678# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2738 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2739 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2740
2249 my $h1 = $self->{h} * (1 - $ycut1); 2741 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2742 my $h2 = $self->{h} * (1 - $ycut2);
2743 my $h3 = $self->{h};
2744
2745 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2746
2252 glEnable GL_BLEND; 2747 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2748 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2749 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
… …
2274 2769
2275 if ($t3) { 2770 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2771 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2772 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2773 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2774 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2775 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2776 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2777 glEnd;
2283 } 2778 }
2284 2779
2285 glDisable GL_BLEND; 2780 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2287} 2782}
2288 2783
2289############################################################################# 2784#############################################################################
2290 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 %arg
2876 );
2877
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN;
2880
2881 $self
2882}
2883
2884sub DESTROY {
2885 my ($self) = @_;
2886
2887 delete $::CONN->{on_exp_update}{$self+0}
2888 if $::CONN;
2889
2890 $self->SUPER::DESTROY;
2891}
2892
2893sub set_value {
2894 my ($self, $lvl, $exp) = @_;
2895
2896 my $v = -1;
2897
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v);
2906}
2907
2908#############################################################################
2909
2291package CFClient::UI::Gauge; 2910package CFPlus::UI::Gauge;
2292 2911
2293our @ISA = CFClient::UI::VBox::; 2912our @ISA = CFPlus::UI::VBox::;
2294 2913
2295sub new { 2914sub new {
2296 my ($class, %arg) = @_; 2915 my ($class, %arg) = @_;
2297 2916
2298 my $self = $class->SUPER::new ( 2917 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2919 can_hover => 1,
2301 can_events => 1, 2920 can_events => 1,
2302 %arg, 2921 %arg,
2303 ); 2922 );
2304 2923
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2924 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2925 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2926 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2927
2309 $self 2928 $self
2310} 2929}
2311 2930
2312sub set_fontsize { 2931sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2952 $self->{value}->set_text ($val);
2334} 2953}
2335 2954
2336############################################################################# 2955#############################################################################
2337 2956
2338package CFClient::UI::Slider; 2957package CFPlus::UI::Slider;
2339 2958
2340use strict; 2959use strict;
2341 2960
2342use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2343 2962
2344our @ISA = CFClient::UI::DrawBG::; 2963our @ISA = CFPlus::UI::DrawBG::;
2345 2964
2346my @tex = 2965my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2966 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2967 qw(s1_slider.png s1_slider_bg.png);
2349 2968
2350sub new { 2969sub new {
2351 my $class = shift; 2970 my $class = shift;
2352 2971
… …
2420 3039
2421 $self->SUPER::invoke_button_down ($ev, $x, $y); 3040 $self->SUPER::invoke_button_down ($ev, $x, $y);
2422 3041
2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3042 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424 3043
2425 $self->invoke_mouse_motion ($ev, $x, $y) 3044 $self->invoke_mouse_motion ($ev, $x, $y);
3045
3046 1
2426} 3047}
2427 3048
2428sub invoke_mouse_motion { 3049sub invoke_mouse_motion {
2429 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2430 3051
… …
2437 3058
2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3059 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else { 3060 } else {
2440 return 0; 3061 return 0;
2441 } 3062 }
3063
3064 1
3065}
3066
3067sub invoke_mouse_wheel {
3068 my ($self, $ev) = @_;
3069
3070 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3071
3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3073
3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2442 3075
2443 1 3076 1
2444} 3077}
2445 3078
2446sub update { 3079sub update {
… …
2497 glDisable GL_TEXTURE_2D; 3130 glDisable GL_TEXTURE_2D;
2498} 3131}
2499 3132
2500############################################################################# 3133#############################################################################
2501 3134
2502package CFClient::UI::ValSlider; 3135package CFPlus::UI::ValSlider;
2503 3136
2504our @ISA = CFClient::UI::HBox::; 3137our @ISA = CFPlus::UI::HBox::;
2505 3138
2506sub new { 3139sub new {
2507 my ($class, %arg) = @_; 3140 my ($class, %arg) = @_;
2508 3141
2509 my $range = delete $arg{range}; 3142 my $range = delete $arg{range};
2510 3143
2511 my $self = $class->SUPER::new ( 3144 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3145 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3146 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 3147 to_value => sub { shift },
2515 from_value => sub { shift }, 3148 from_value => sub { shift },
2516 %arg, 3149 %arg,
2517 ); 3150 );
2518 3151
… …
2538sub set_range { shift->{slider}->set_range (@_) } 3171sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 3172sub set_value { shift->{slider}->set_value (@_) }
2540 3173
2541############################################################################# 3174#############################################################################
2542 3175
2543package CFClient::UI::TextScroller; 3176package CFPlus::UI::TextScroller;
2544 3177
2545our @ISA = CFClient::UI::HBox::; 3178our @ISA = CFPlus::UI::HBox::;
2546 3179
2547use CFClient::OpenGL; 3180use CFPlus::OpenGL;
2548 3181
2549sub new { 3182sub new {
2550 my $class = shift; 3183 my $class = shift;
2551 3184
2552 my $self = $class->SUPER::new ( 3185 my $self = $class->SUPER::new (
2553 fontsize => 1, 3186 fontsize => 1,
2554 can_events => 0, 3187 can_events => 1,
2555 indent => 0, 3188 indent => 0,
2556 #font => default_font 3189 #font => default_font
2557 @_, 3190 @_,
2558 3191
2559 layout => (new CFClient::Layout 1), 3192 layout => (new CFPlus::Layout),
2560 par => [], 3193 par => [],
3194 max_par => 0,
2561 height => 0, 3195 height => 0,
2562 children => [ 3196 children => [
2563 (new CFClient::UI::Empty expand => 1), 3197 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3198 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3199 ],
2566 ); 3200 );
2567 3201
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3202 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3203
… …
2575 3209
2576 $self->{fontsize} = $fontsize; 3210 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3211 $self->reflow;
2578} 3212}
2579 3213
2580sub visible_children { 3214sub size_request {
2581 my ($self) = @_; 3215 my ($self) = @_;
2582 3216
2583 @{$self->{children}}[0,1] 3217 my ($empty, $slider) = $self->visible_children;
3218
3219 local $self->{children} = [$empty, $slider];
3220 $self->SUPER::size_request
2584} 3221}
2585 3222
2586sub invoke_size_allocate { 3223sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3224 my ($self, $w, $h) = @_;
2588 3225
… …
2594 $self->{layout}->set_width ($empty->{w}); 3231 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3232 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3233
2597 $self->reflow; 3234 $self->reflow;
2598 3235
3236 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 3237 $self->SUPER::invoke_size_allocate ($w, $h)
3238}
3239
3240sub invoke_mouse_wheel {
3241 my ($self, $ev) = @_;
3242
3243 return 0 unless $ev->{dy}; # only vertical movements
3244
3245 $self->{children}[1]->emit (mouse_wheel => $ev);
3246
3247 1
2600} 3248}
2601 3249
2602sub get_layout { 3250sub get_layout {
2603 my ($self, $para) = @_; 3251 my ($self, $para) = @_;
2604 3252
… …
2632 3280
2633 # todo: base offset on lines or so, not on pixels 3281 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3282 $self->{children}[1]->set_value ($offset);
2635} 3283}
2636 3284
3285sub current_paragraph {
3286 my ($self) = @_;
3287
3288 $self->{top_paragraph} - 1
3289}
3290
3291sub scroll_to {
3292 my ($self, $para) = @_;
3293
3294 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3295
3296 $self->{scroll_to} = $para;
3297 $self->update;
3298}
3299
2637sub clear { 3300sub clear {
2638 my ($self) = @_; 3301 my ($self) = @_;
2639 3302
2640 my (undef, undef, @other) = @{ $self->{children} }; 3303 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3304 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3307 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3308 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3309}
2647 3310
2648sub add_paragraph { 3311sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3312 my $self = shift;
2650 3313
2651 my ($text, @w) = ref $para ? @$para : $para; 3314 for my $para (@_) {
2652
2653 $para = { 3315 $para = {
3316 fg => [1, 1, 1, 1],
3317 indent => 0,
3318 markup => "",
3319 widget => [],
3320 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3321 w => 1e10,
2655 wrapped => 1, 3322 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3323 };
2661 3324
2662 $self->add (@w) if @w; 3325 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3326 push @{$self->{par}}, $para;
3327 }
3328
3329 if (my $max = $self->{max_par}) {
3330 shift @{$self->{par}} while @{$self->{par}} > $max;
3331 }
2664 3332
2665 $self->{need_reflow}++; 3333 $self->{need_reflow}++;
2666 $self->update; 3334 $self->update;
2667} 3335}
2668 3336
2669sub scroll_to_bottom { 3337sub scroll_to_bottom {
2670 my ($self) = @_; 3338 my ($self) = @_;
2671 3339
2672 $self->{scroll_to_bottom} = 1; 3340 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3341 $self->update;
2674} 3342}
2675 3343
3344sub force_uptodate {
3345 my ($self) = @_;
3346
3347 if (delete $self->{need_reflow}) {
3348 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3349
3350 my $height = 0;
3351
3352 for my $para (@{$self->{par}}) {
3353 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3354 my $layout = $self->get_layout ($para);
3355 my ($w, $h) = $layout->size;
3356
3357 $para->{w} = $w + $para->{indent};
3358 $para->{h} = $h;
3359 $para->{wrapped} = $layout->has_wrapped;
3360 }
3361
3362 $para->{y} = $height;
3363 $height += $para->{h};
3364 }
3365
3366 $self->{height} = $height;
3367 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3368
3369 delete $self->{texture};
3370 }
3371
3372 if (my $paridx = delete $self->{scroll_to}) {
3373 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3374 }
3375}
3376
2676sub update { 3377sub update {
2677 my ($self) = @_; 3378 my ($self) = @_;
2678 3379
2679 $self->SUPER::update; 3380 $self->SUPER::update;
2680 3381
2681 return unless $self->{h} > 0; 3382 return unless $self->{h} > 0;
2682 3383
2683 delete $self->{texture}; 3384 delete $self->{texture};
2684 3385
2685 $ROOT->on_post_alloc ($self => sub { 3386 $ROOT->on_post_alloc ($self => sub {
3387 $self->force_uptodate;
3388
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3389 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3390
2688 if (delete $self->{need_reflow}) {
2689 my $height = 0;
2690
2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2703
2704 $self->{height} = $height;
2705
2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3391 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3392 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3393 glClear GL_COLOR_BUFFER_BIT;
2718 3394
3395 package CFPlus::UI::Base;
3396 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3397 (0, 0, $self->{w}, $self->{h});
3398
3399 my $top = int $self->{children}[1]{range}[0];
3400
3401 my $paridx = 0;
3402 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3403 my $top = int $self->{children}[1]{range}[0];
2720 3404
2721 my $y0 = $top; 3405 my $y0 = $top;
2722 my $y1 = $top + $H; 3406 my $y1 = $top + $H;
2723 3407
2724 my $y = 0;
2725
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 3408 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3409 my $h = $para->{h};
3410 my $y = $para->{y};
2732 3411
2733 if ($y0 < $y + $h && $y < $y1) { 3412 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3413 my $layout = $self->get_layout ($para);
2736 3414
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3415 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3416 $layout->draw;
2741 3417
2742 if (my @w = @{ $para->{widget} }) { 3418 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3419 my @s = $layout->get_shapes;
2744 3420
2745 for (@w) { 3421 for (@w) {
… …
2751 $_->draw; 3427 $_->draw;
2752 } 3428 }
2753 } 3429 }
2754 } 3430 }
2755 3431
2756 $y += $h; 3432 $paridx++;
3433 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3434 }
2758 3435
2759 glDisable GL_BLEND; 3436 $self->{top_paragraph} = $top_paragraph;
2760 }; 3437 };
2761 }); 3438 });
2762} 3439}
2763 3440
2764sub reconfigure { 3441sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3459 $self->{children}[1]->draw;
2783} 3460}
2784 3461
2785############################################################################# 3462#############################################################################
2786 3463
2787package CFClient::UI::Animator; 3464package CFPlus::UI::Animator;
2788 3465
2789use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2790 3467
2791our @ISA = CFClient::UI::Bin::; 3468our @ISA = CFPlus::UI::Bin::;
2792 3469
2793sub moveto { 3470sub moveto {
2794 my ($self, $x, $y) = @_; 3471 my ($self, $x, $y) = @_;
2795 3472
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3473 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3501 glPopMatrix;
2825} 3502}
2826 3503
2827############################################################################# 3504#############################################################################
2828 3505
2829package CFClient::UI::Flopper; 3506package CFPlus::UI::Flopper;
2830 3507
2831our @ISA = CFClient::UI::Button::; 3508our @ISA = CFPlus::UI::Button::;
2832 3509
2833sub new { 3510sub new {
2834 my $class = shift; 3511 my $class = shift;
2835 3512
2836 my $self = $class->SUPER::new ( 3513 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3525 $self->{other}->toggle_visibility;
2849} 3526}
2850 3527
2851############################################################################# 3528#############################################################################
2852 3529
2853package CFClient::UI::Tooltip; 3530package CFPlus::UI::Tooltip;
2854 3531
2855our @ISA = CFClient::UI::Bin::; 3532our @ISA = CFPlus::UI::Bin::;
2856 3533
2857use CFClient::OpenGL; 3534use CFPlus::OpenGL;
2858 3535
2859sub new { 3536sub new {
2860 my $class = shift; 3537 my $class = shift;
2861 3538
2862 $class->SUPER::new ( 3539 $class->SUPER::new (
… …
2865 ) 3542 )
2866} 3543}
2867 3544
2868sub set_tooltip_from { 3545sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3546 my ($self, $widget) = @_;
3547
3548 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3549 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3550
2871 my $tooltip = $widget->{tooltip}; 3551 my $tooltip = $widget->{tooltip};
2872 3552
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3553 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3554 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3558 }
2879 3559
2880 $tooltip =~ s/^\n+//; 3560 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3561 $tooltip =~ s/\n+$//;
2882 3562
2883 $self->add (new CFClient::UI::Label 3563 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3564 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3565 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3566 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3567 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3568 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3569 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3570 );
2891} 3571}
2892 3572
… …
2911 3591
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3592 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3593 my $widget = $self->{owner}
2914 or return; 3594 or return;
2915 3595
3596 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3597 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3598
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3599 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3600 if $x + $self->{w} > $self->{root}{w};
2920 3601
2921 $self->move_abs ($x, $y); 3602 $self->move_abs ($x, $y);
3603 } else {
3604 $self->hide;
3605 }
2922 }); 3606 });
2923} 3607}
2924 3608
2925sub _draw { 3609sub _draw {
2926 my ($self) = @_; 3610 my ($self) = @_;
… …
2928 glTranslate 0.375, 0.375; 3612 glTranslate 0.375, 0.375;
2929 3613
2930 my ($w, $h) = @$self{qw(w h)}; 3614 my ($w, $h) = @$self{qw(w h)};
2931 3615
2932 glColor 1, 0.8, 0.4; 3616 glColor 1, 0.8, 0.4;
2933 glBegin GL_QUADS; 3617 glRect 0, 0, $w, $h;
2934 glVertex 0 , 0;
2935 glVertex 0 , $h;
2936 glVertex $w, $h;
2937 glVertex $w, 0;
2938 glEnd;
2939 3618
2940 glColor 0, 0, 0; 3619 glColor 0, 0, 0;
2941 glBegin GL_LINE_LOOP; 3620 glRect_lineloop 0, 0, $w, $h;
2942 glVertex 0 , 0;
2943 glVertex 0 , $h;
2944 glVertex $w, $h;
2945 glVertex $w, 0;
2946 glEnd;
2947 3621
2948 glTranslate 2 - 0.375, 2 - 0.375; 3622 glTranslate 2 - 0.375, 2 - 0.375;
2949 3623
2950 $self->SUPER::_draw; 3624 $self->SUPER::_draw;
2951} 3625}
2952 3626
2953############################################################################# 3627#############################################################################
2954 3628
2955package CFClient::UI::Face; 3629package CFPlus::UI::Face;
2956 3630
2957our @ISA = CFClient::UI::Base::; 3631our @ISA = CFPlus::UI::DrawBG::;
2958 3632
2959use CFClient::OpenGL; 3633use CFPlus::OpenGL;
2960 3634
2961sub new { 3635sub new {
2962 my $class = shift; 3636 my $class = shift;
2963 3637
2964 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 size_w => 32,
3640 size_h => 8,
2965 aspect => 1, 3641 aspect => 1,
2966 can_events => 0, 3642 can_events => 0,
2967 @_, 3643 @_,
2968 ); 3644 );
2969 3645
2970 if ($self->{anim} && $self->{animspeed}) { 3646 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3647 CFPlus::weaken (my $widget = $self);
2972 3648
3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2973 $self->{timer} = Event->timer ( 3651 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3652 parked => 1,
2976 interval => $self->{animspeed},
2977 cb => sub { 3653 cb => sub {
3654 return unless $::CONN;
3655
3656 my $w = $widget
3657 or return;
3658
2978 ++$widget->{frame}; 3659 ++$w->{frame};
3660 $w->update_face;
3661
3662 # somehow, $widget can go away
2979 $widget->update; 3663 $w->update;
3664 $w->update_timer;
2980 }, 3665 },
2981 ); 3666 );
3667
3668 $self->update_face;
3669 $self->update_timer;
2982 } 3670 }
2983 3671
2984 $self 3672 $self
2985} 3673}
2986 3674
3675sub update_timer {
3676 my ($self) = @_;
3677
3678 return unless $self->{timer};
3679
3680 if ($self->{visible}) {
3681 $self->{timer}->at (
3682 $self->{anim_start}
3683 + $self->{animspeed}
3684 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3685 );
3686 $self->{timer}->start;
3687 } else {
3688 $self->{timer}->stop;
3689 }
3690}
3691
3692sub update_face {
3693 my ($self) = @_;
3694
3695 if ($::CONN) {
3696 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3697 if ($anim && @$anim) {
3698 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3699 delete $self->{face_change_cb};
3700
3701 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3702 unless ($tex->{name} || $tex->{loading}) {
3703 $tex->upload (sub { $self->reconfigure });
3704 }
3705 }
3706 }
3707 }
3708 }
3709}
3710
2987sub size_request { 3711sub size_request {
2988 (32, 8) 3712 my ($self) = @_;
3713
3714 if ($::CONN) {
3715 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3716 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3717 if ($tex->{name}) {
3718 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3719 } elsif (!$tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723
3724 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3725 }
3726 }
3727
3728 ($self->{size_w} || 8, $self->{size_h} || 8)
2989} 3729}
2990 3730
2991sub update { 3731sub update {
2992 my ($self) = @_; 3732 my ($self) = @_;
2993 3733
2994 return unless $self->{visible}; 3734 return unless $self->{visible};
2995 3735
2996 $self->SUPER::update; 3736 $self->SUPER::update;
2997} 3737}
2998 3738
3739sub invoke_visibility_change {
3740 my ($self) = @_;
3741
3742 $self->update_timer;
3743
3744 0
3745}
3746
2999sub _draw { 3747sub _draw {
3000 my ($self) = @_; 3748 my ($self) = @_;
3001 3749
3002 return unless $::CONN; 3750 $self->SUPER::_draw;
3003 3751
3004 my $face; 3752 if (my $tex = $self->{tex}) {
3005
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}];
3008
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3014
3015 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3753 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3755 glColor 0, 0, 0, 1;
3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3756 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3020 glDisable GL_TEXTURE_2D; 3757 glDisable GL_TEXTURE_2D;
… …
3022} 3759}
3023 3760
3024sub destroy { 3761sub destroy {
3025 my ($self) = @_; 3762 my ($self) = @_;
3026 3763
3027 $self->{timer}->cancel 3764 (delete $self->{timer})->cancel
3028 if $self->{timer}; 3765 if $self->{timer};
3029 3766
3030 $self->SUPER::destroy; 3767 $self->SUPER::destroy;
3031} 3768}
3032 3769
3033############################################################################# 3770#############################################################################
3034 3771
3035package CFClient::UI::Buttonbar; 3772package CFPlus::UI::Buttonbar;
3036 3773
3037our @ISA = CFClient::UI::HBox::; 3774our @ISA = CFPlus::UI::HBox::;
3038 3775
3039# TODO: should actualyl wrap buttons and other goodies. 3776# TODO: should actually wrap buttons and other goodies.
3040 3777
3041############################################################################# 3778#############################################################################
3042 3779
3043package CFClient::UI::Menu; 3780package CFPlus::UI::Menu;
3044 3781
3045our @ISA = CFClient::UI::FancyFrame::; 3782our @ISA = CFPlus::UI::Toplevel::;
3046 3783
3047use CFClient::OpenGL; 3784use CFPlus::OpenGL;
3048 3785
3049sub new { 3786sub new {
3050 my $class = shift; 3787 my $class = shift;
3051 3788
3052 my $self = $class->SUPER::new ( 3789 my $self = $class->SUPER::new (
3053 items => [], 3790 items => [],
3054 z => 100, 3791 z => 100,
3055 @_, 3792 @_,
3056 ); 3793 );
3057 3794
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3795 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3796
3060 for my $item (@{ $self->{items} }) { 3797 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3798 my ($widget, $cb, $tooltip) = @$item;
3062 3799
3063 # handle various types of items, only text for now 3800 # handle various types of items, only text for now
3064 if (!ref $widget) { 3801 if (!ref $widget) {
3802 if ($widget =~ /\t/) {
3803 my ($left, $right) = split /\t/, $widget, 2;
3804
3065 $widget = new CFClient::UI::Label 3805 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3806 can_hover => 1,
3067 can_events => 1, 3807 can_events => 1,
3808 tooltip => $tooltip,
3809 children => [
3810 (new CFPlus::UI::Label markup => $left, expand => 1),
3811 (new CFPlus::UI::Label markup => $right, align => +1),
3812 ],
3813 ;
3814
3815 } else {
3816 $widget = new CFPlus::UI::Label
3817 can_hover => 1,
3818 can_events => 1,
3068 markup => $widget, 3819 markup => $widget,
3069 tooltip => $tooltip 3820 tooltip => $tooltip;
3821 }
3070 } 3822 }
3071 3823
3072 $self->{item}{$widget} = $item; 3824 $self->{item}{$widget} = $item;
3073 3825
3074 $self->{vbox}->add ($widget); 3826 $self->{vbox}->add ($widget);
… …
3117 1 3869 1
3118} 3870}
3119 3871
3120############################################################################# 3872#############################################################################
3121 3873
3122package CFClient::UI::Multiplexer; 3874package CFPlus::UI::Multiplexer;
3123 3875
3124our @ISA = CFClient::UI::Container::; 3876our @ISA = CFPlus::UI::Container::;
3125 3877
3126sub new { 3878sub new {
3127 my $class = shift; 3879 my $class = shift;
3128 3880
3129 my $self = $class->SUPER::new ( 3881 my $self = $class->SUPER::new (
… …
3143 3895
3144 $self->{current} = $self->{children}[0] 3896 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3897 if @{ $self->{children} };
3146} 3898}
3147 3899
3900sub get_current_page {
3901 my ($self) = @_;
3902
3903 $self->{current}
3904}
3905
3148sub set_current_page { 3906sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3907 my ($self, $page_or_widget) = @_;
3150 3908
3151 my $widget = ref $page_or_widget 3909 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3910 ? $page_or_widget
… …
3184 $self->{current}->draw; 3942 $self->{current}->draw;
3185} 3943}
3186 3944
3187############################################################################# 3945#############################################################################
3188 3946
3189package CFClient::UI::Notebook; 3947package CFPlus::UI::Notebook;
3190 3948
3949use CFPlus::OpenGL;
3950
3191our @ISA = CFClient::UI::VBox::; 3951our @ISA = CFPlus::UI::VBox::;
3192 3952
3193sub new { 3953sub new {
3194 my $class = shift; 3954 my $class = shift;
3195 3955
3196 my $self = $class->SUPER::new ( 3956 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3957 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0],
3199 # filter => # will be put between multiplexer and $self 3960 # filter => # will be put between multiplexer and $self
3200 @_, 3961 @_,
3201 ); 3962 );
3202 3963
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3965 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205 3966
3967 {
3968 Scalar::Util::weaken (my $wself = $self);
3969
3970 $self->{multiplexer}->connect (c_add => sub {
3971 my ($mplex, $widgets) = @_;
3972
3973 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do {
3976 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3978 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980
3981 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child);
3983 });
3984
3985 $tab
3986 };
3987
3988 $self->{buttonbar}->add ($child->{c_tab_});
3989 }
3990 });
3991
3992 $self->{multiplexer}->connect (c_remove => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 $wself->{buttonbar}->remove ($child->{c_tab_});
3997 }
3998 });
3999 }
4000
3206 $self 4001 $self
3207} 4002}
3208 4003
3209sub add { 4004sub add {
4005 my ($self, @widgets) = @_;
4006
4007 $self->{multiplexer}->add (@widgets)
4008}
4009
4010sub remove {
4011 my ($self, @widgets) = @_;
4012
4013 $self->{multiplexer}->remove (@widgets)
4014}
4015
4016sub pages {
4017 my ($self) = @_;
4018 $self->{multiplexer}->children
4019}
4020
4021sub add_tab {
3210 my ($self, $title, $widget, $tooltip) = @_; 4022 my ($self, $title, $widget, $tooltip) = @_;
3211 4023
3212 Scalar::Util::weaken $self; 4024 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title;
3213 4026
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget); 4027 $self->add ($widget);
4028}
4029
4030sub get_current_page {
4031 my ($self) = @_;
4032
4033 $self->{multiplexer}->get_current_page
3221} 4034}
3222 4035
3223sub set_current_page { 4036sub set_current_page {
3224 my ($self, $page) = @_; 4037 my ($self, $page) = @_;
3225 4038
3226 $self->{multiplexer}->set_current_page ($page); 4039 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 4040 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 4041}
3229 4042
4043sub _draw {
4044 my ($self) = @_;
4045
4046 $self->SUPER::_draw ();
4047
4048 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y};
4051 glLineWidth 3;
4052 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4054 glLineWidth 1;
4055 }
4056 }
4057}
4058
3230############################################################################# 4059#############################################################################
3231 4060
3232package CFClient::UI::Combobox; 4061package CFPlus::UI::Selector;
3233 4062
3234use utf8; 4063use utf8;
3235 4064
3236our @ISA = CFClient::UI::Button::; 4065our @ISA = CFPlus::UI::Button::;
3237 4066
3238sub new { 4067sub new {
3239 my $class = shift; 4068 my $class = shift;
3240 4069
3241 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 4087 my ($value, $title, $tooltip) = @$_;
3259 4088
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4089 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 4090 }
3262 4091
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4092 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 4093}
3265 4094
3266sub _set_value { 4095sub _set_value {
3267 my ($self, $value) = @_; 4096 my ($self, $value) = @_;
3268 4097
… …
3283 $self->emit (changed => $value); 4112 $self->emit (changed => $value);
3284} 4113}
3285 4114
3286############################################################################# 4115#############################################################################
3287 4116
3288package CFClient::UI::Statusbox; 4117package CFPlus::UI::Statusbox;
3289 4118
3290our @ISA = CFClient::UI::VBox::; 4119our @ISA = CFPlus::UI::VBox::;
3291 4120
3292sub new { 4121sub new {
3293 my $class = shift; 4122 my $class = shift;
3294 4123
3295 my $self = $class->SUPER::new ( 4124 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 4125 fontsize => 0.8,
3297 @_, 4126 @_,
3298 ); 4127 );
3299 4128
3300 Scalar::Util::weaken (my $this = $self); 4129 CFPlus::weaken (my $this = $self);
3301 4130
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 4132
3304 $self 4133 $self
3305} 4134}
… …
3307sub reorder { 4136sub reorder {
3308 my ($self) = @_; 4137 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 4138 my $NOW = Time::HiRes::time;
3310 4139
3311 # freeze display when hovering over any label 4140 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 4141 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4142 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 4143 values %{ $self->{item} };
3315 4144
3316 while (my ($k, $v) = each %{ $self->{item} }) { 4145 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4146 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 4147 }
… …
3339 for ($short) { 4168 for ($short) {
3340 s/^\s+//; 4169 s/^\s+//;
3341 s/\s+/ /g; 4170 s/\s+/ /g;
3342 } 4171 }
3343 4172
3344 new CFClient::UI::Label 4173 new CFPlus::UI::Label
3345 markup => $short, 4174 markup => $short,
3346 tooltip => $item->{tooltip}, 4175 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 4176 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 4177 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 4178 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 4232 count => 1,
3404 %arg, 4233 %arg,
3405 }; 4234 };
3406 } 4235 }
3407 4236
4237 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 4238 $self->reorder;
4239 });
3409} 4240}
3410 4241
3411sub reconfigure { 4242sub reconfigure {
3412 my ($self) = @_; 4243 my ($self) = @_;
3413 4244
… …
3426 $self->SUPER::destroy; 4257 $self->SUPER::destroy;
3427} 4258}
3428 4259
3429############################################################################# 4260#############################################################################
3430 4261
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root; 4262package CFPlus::UI::Root;
3804 4263
3805our @ISA = CFClient::UI::Container::; 4264our @ISA = CFPlus::UI::Container::;
3806 4265
3807use List::Util qw(min max); 4266use List::Util qw(min max);
3808 4267
3809use CFClient::OpenGL; 4268use CFPlus::OpenGL;
3810 4269
3811sub new { 4270sub new {
3812 my $class = shift; 4271 my $class = shift;
3813 4272
3814 my $self = $class->SUPER::new ( 4273 my $self = $class->SUPER::new (
3815 visible => 1, 4274 visible => 1,
3816 @_, 4275 @_,
3817 ); 4276 );
3818 4277
3819 Scalar::Util::weaken ($self->{root} = $self); 4278 CFPlus::weaken ($self->{root} = $self);
3820 4279
3821 $self 4280 $self
3822} 4281}
3823 4282
3824sub size_request { 4283sub size_request {
… …
3872} 4331}
3873 4332
3874sub update { 4333sub update {
3875 my ($self) = @_; 4334 my ($self) = @_;
3876 4335
3877 $::WANT_REFRESH++; 4336 $::WANT_REFRESH->start;
3878} 4337}
3879 4338
3880sub add { 4339sub add {
3881 my ($self, @children) = @_; 4340 my ($self, @children) = @_;
3882 4341
… …
3919 while ($self->{refresh_hook}) { 4378 while ($self->{refresh_hook}) {
3920 $_->() 4379 $_->()
3921 for values %{delete $self->{refresh_hook}}; 4380 for values %{delete $self->{refresh_hook}};
3922 } 4381 }
3923 4382
3924 if ($self->{realloc}) { 4383 while ($self->{realloc}) {
3925 my %queue; 4384 my %queue;
3926 my @queue; 4385 my @queue;
3927 my $widget; 4386 my $widget;
3928 4387
3929 outer: 4388 outer:
… …
3976 } 4435 }
3977 } 4436 }
3978 4437
3979 delete $self->{realloc}{$widget+0}; 4438 delete $self->{realloc}{$widget+0};
3980 } 4439 }
3981 }
3982 4440
3983 while (my $size_alloc = delete $self->{size_alloc}) { 4441 while (my $size_alloc = delete $self->{size_alloc}) {
3984 my @queue = sort { $b->{visible} <=> $a->{visible} } 4442 my @queue = sort { $a->{visible} <=> $b->{visible} }
3985 values %$size_alloc; 4443 values %$size_alloc;
3986 4444
3987 while () { 4445 while () {
3988 my $widget = pop @queue || last; 4446 my $widget = pop @queue || last;
3989 4447
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4448 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4449
3992 $w = 0 if $w < 0; 4450 $w = max $widget->{min_w}, $w;
3993 $h = 0 if $h < 0; 4451 $h = max $widget->{min_h}, $h;
3994 4452
4453# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4454# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4455
4456 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4457 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4458
3995 $w = int $w + 0.5; 4459 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4460 $h = int $h + 0.5;
3997 4461
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4462 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4463 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h}; 4464 $widget->{old_h} = $widget->{h};
4001 4465
4002 $widget->{w} = $w; 4466 $widget->{w} = $w;
4003 $widget->{h} = $h; 4467 $widget->{h} = $h;
4004 4468
4005 $widget->emit (size_allocate => $w, $h); 4469 $widget->emit (size_allocate => $w, $h);
4470 }
4006 } 4471 }
4007 } 4472 }
4008 } 4473 }
4009 4474
4010 while ($self->{post_alloc_hook}) { 4475 while ($self->{post_alloc_hook}) {
4011 $_->() 4476 $_->()
4012 for values %{delete $self->{post_alloc_hook}}; 4477 for values %{delete $self->{post_alloc_hook}};
4013 } 4478 }
4014
4015 4479
4016 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4480 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4481 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018 glClear GL_COLOR_BUFFER_BIT; 4482 glClear GL_COLOR_BUFFER_BIT;
4019 4483
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4486 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4487 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4488 glLoadIdentity;
4025 4489
4026 { 4490 {
4027 package CFClient::UI::Base; 4491 package CFPlus::UI::Base;
4028 4492
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4493 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4494 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4495
4033 $self->_draw; 4496 $self->_draw;
4497 }
4034} 4498}
4035 4499
4036############################################################################# 4500#############################################################################
4037 4501
4038package CFClient::UI; 4502package CFPlus::UI;
4039 4503
4040$ROOT = new CFClient::UI::Root; 4504$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4505$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4506
40431 45071
4044 4508

Diff Legend

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