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

Diff Legend

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