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

Diff Legend

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