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

Diff Legend

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