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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
984 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
985 1095
986 $self 1096 $self
987} 1097}
1098
1099#TODO# update range on size_allocate depending on child
988 1100
989sub add { 1101sub add {
990 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
991 1103
992 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
993} 1105}
994 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
995sub update { 1131sub update {
996 my ($self) = @_; 1132 my ($self) = @_;
997 1133
998 $self->SUPER::update; 1134 $self->SUPER::update;
999 1135 $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} 1136}
1004 1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
1005sub size_allocate { 1191sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1007 1193
1194 $self->update_slider;
1008 $self->SUPER::size_allocate ($w, $h); 1195 $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} 1196}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1197
1017############################################################################# 1198#############################################################################
1018 1199
1019package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1020 1201
1021our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1022 1203
1023use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1024 1205
1025sub new { 1206sub new {
1026 my $class = shift; 1207 my $class = shift;
1027 1208
1028 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1055} 1236}
1056 1237
1057############################################################################# 1238#############################################################################
1058 1239
1059package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1060 1241
1061our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1062 1243
1063use CFClient::OpenGL; 1244use 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 1245
1073sub new { 1246sub new {
1074 my ($class, %arg) = @_; 1247 my ($class, %arg) = @_;
1075 1248
1076 my $title = delete $arg{title}; 1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1346my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1;
1349
1350my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354sub new {
1355 my ($class, %arg) = @_;
1077 1356
1078 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1360 border => 0.6,
1082 can_events => 1, 1361 can_events => 1,
1083 min_w => 16, 1362 min_w => 64,
1084 min_h => 16, 1363 min_h => 32,
1085 %arg, 1364 %arg,
1086 ); 1365 );
1087 1366
1088 $self->{title} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1368 align => 0,
1090 valign => 1, 1369 valign => 1,
1091 text => $title, 1370 text => $self->{title},
1092 fontsize => $self->{border} 1371 fontsize => $self->{border},
1093 if defined $title; 1372 if exists $self->{title};
1373
1374 if ($self->{has_close_button}) {
1375 $self->{close_button} =
1376 new CFPlus::UI::ImageButton
1377 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") };
1379
1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1381 }
1094 1382
1095 $self 1383 $self
1096} 1384}
1097 1385
1098sub add { 1386sub add {
1099 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1100 1388
1101 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1392}
1104 1393
1105sub border { 1394sub border {
1106 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1107} 1396}
1108 1397
1109sub size_request { 1398sub size_request {
1110 my ($self) = @_; 1399 my ($self) = @_;
1111 1400
1112 $self->{title}->size_request 1401 $self->{title_widget}->size_request
1113 if $self->{title}; 1402 if $self->{title_widget};
1403
1404 $self->{close_button}->size_request
1405 if $self->{close_button};
1114 1406
1115 my ($w, $h) = $self->SUPER::size_request; 1407 my ($w, $h) = $self->SUPER::size_request;
1116 1408
1117 ( 1409 (
1118 $w + $self->border * 2, 1410 $w + $self->border * 2,
1119 $h + $self->border * 2, 1411 $h + $self->border * 2,
1120 ) 1412 )
1121} 1413}
1122 1414
1123sub size_allocate { 1415sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
1125 1417
1126 if ($self->{title}) { 1418 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1419 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1420 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1421 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1422 }
1131 1423
1132 my $border = $self->border; 1424 my $border = $self->border;
1133 1425
1134 $h -= List::Util::max 0, $border * 2; 1426 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1427 $w -= List::Util::max 0, $border * 2;
1428
1429 $self->child->configure ($border, $border, $w, $h);
1430
1431 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1432 if $self->{close_button};
1433
1434 1
1435}
1436
1437sub invoke_delete {
1438 my ($self) = @_;
1439
1440 $self->hide;
1136 1441
1137 $self->child->configure ($border, $border, $w, $h); 1442 1
1138} 1443}
1139 1444
1140sub button_down { 1445sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
1142 1447
1143 my ($w, $h) = @$self{qw(w h)}; 1448 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1449 my $border = $self->border;
1145 1450
… …
1176 1481
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1482 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1483
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1484 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1485 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1486 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1487 };
1183 } else { 1488 } else {
1184 return 0; 1489 return 0;
1185 } 1490 }
1186 1491
1187 1 1492 1
1188} 1493}
1189 1494
1190sub button_up { 1495sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1496 my ($self, $ev, $x, $y) = @_;
1192 1497
1193 !!delete $self->{motion} 1498 ! ! delete $self->{motion}
1194} 1499}
1195 1500
1196sub mouse_motion { 1501sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1198 1503
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1505
1201 !!$self->{motion} 1506 ! ! $self->{motion}
1507}
1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1202} 1515}
1203 1516
1204sub _draw { 1517sub _draw {
1205 my ($self) = @_; 1518 my ($self) = @_;
1206 1519
… …
1232 1545
1233 glDisable GL_TEXTURE_2D; 1546 glDisable GL_TEXTURE_2D;
1234 1547
1235 $child->draw; 1548 $child->draw;
1236 1549
1237 if ($self->{title}) { 1550 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1551 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1552 $self->{title_widget}->_draw;
1553
1554 glTranslate 0, - ($border - $self->{h});
1240 } 1555 }
1556
1557 $self->{close_button}->draw
1558 if $self->{close_button};
1241} 1559}
1242 1560
1243############################################################################# 1561#############################################################################
1244 1562
1245package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1246 1564
1247our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1248 1566
1249use List::Util qw(max sum); 1567use List::Util qw(max sum);
1250 1568
1251use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1252 1570
1253sub new { 1571sub new {
1254 my $class = shift; 1572 my $class = shift;
1255 1573
1256 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1257 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1258 @_, 1578 @_,
1259 ) 1579 )
1260} 1580}
1261 1581
1262sub children { 1582sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1584}
1265 1585
1586# TODO: store row/col info in child widget and use standard add/del
1266sub add { 1587sub add {
1267 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1268 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1592 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1271 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1598 $self->realloc;
1599}
1600
1601sub remove {
1602 my ($self, $child) = @_;
1603
1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1273} 1609}
1274 1610
1275# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1612sub clear {
1277 my ($self) = @_; 1613 my ($self) = @_;
… …
1318 (sum @$ws), 1654 (sum @$ws),
1319 (sum @$hs), 1655 (sum @$hs),
1320 ) 1656 )
1321} 1657}
1322 1658
1323sub size_allocate { 1659sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1660 my ($self, $w, $h) = @_;
1325 1661
1326 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1327 1663
1328 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1329 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1330 1666
1331 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1332 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1333 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1334 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1335 1671
1336 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1673
1340 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1341 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1342 1683
1343 my $y; 1684 my $y;
1344 1685
1345 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1360 } 1701 }
1361 1702
1362 $y += $row_h; 1703 $y += $row_h;
1363 } 1704 }
1364 1705
1706 1
1365} 1707}
1366 1708
1367sub find_widget { 1709sub find_widget {
1368 my ($self, $x, $y) = @_; 1710 my ($self, $x, $y) = @_;
1369 1711
… …
1388 } 1730 }
1389} 1731}
1390 1732
1391############################################################################# 1733#############################################################################
1392 1734
1393package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1394 1736
1737use List::Util qw(min max);
1738
1395our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1396 1820
1397sub size_request { 1821sub size_request {
1398 my ($self) = @_; 1822 my ($self) = @_;
1399 1823
1400 $self->{vertical} 1824 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1831 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1832 )
1409} 1833}
1410 1834
1411sub size_allocate { 1835sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1413 1837
1414 my $space = $self->{vertical} ? $h : $w; 1838 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1839 my @children = $self->visible_children;
1416 1840
1417 my @req; 1841 my @req;
1418 1842
1419 if ($self->{homogeneous}) { 1843 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1844 @req = ($space / (@children || 1)) x @children;
1421 } else { 1845 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1846 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1847 my $req = List::Util::sum @req;
1424 1848
1425 if ($req > $space) { 1849 if ($req > $space) {
1426 # ah well, not enough space 1850 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1851 $_ *= $space / $req for @req;
1428 } else { 1852 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1853 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1854
1431 $space = ($space - $req) / $expand; # remaining space to give away 1855 $space = ($space - $req) / $expand; # remaining space to give away
1432 1856
1433 $req[$_] += $space * $children->[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1858 for 0 .. $#children;
1435 } 1859 }
1436 } 1860 }
1437 1861
1438 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1439 1863
1440 my $pos = 0; 1864 my $pos = 0;
1441 for (0 .. $#$children) { 1865 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1868
1445 $pos += $alloc; 1869 $pos += $alloc;
1446 } 1870 }
1447 1871
1448 1 1872 1
1449} 1873}
1450 1874
1451############################################################################# 1875#############################################################################
1452 1876
1453package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1454 1878
1455our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1456 1880
1457sub new { 1881sub new {
1458 my $class = shift; 1882 my $class = shift;
1459 1883
1460 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1463 ) 1887 )
1464} 1888}
1465 1889
1466############################################################################# 1890#############################################################################
1467 1891
1468package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1469 1893
1470our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1471 1895
1472sub new { 1896sub new {
1473 my $class = shift; 1897 my $class = shift;
1474 1898
1475 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1478 ) 1902 )
1479} 1903}
1480 1904
1481############################################################################# 1905#############################################################################
1482 1906
1483package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1484 1908
1485our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1486 1910
1487use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1488 1912
1489sub new { 1913sub new {
1490 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1491 1915
1492 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1919 #active_bg => none
1496 #font => default_font 1920 #font => default_font
1497 #text => initial text 1921 #text => initial text
1498 #markup => initial narkup 1922 #markup => initial narkup
1499 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1500 ellipsise => 3, # end 1925 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1927 fontsize => 1,
1503 align => -1, 1928 align => -1,
1504 valign => -1, 1929 valign => -1,
1505 padding_x => 2, 1930 padding_x => 2,
1506 padding_y => 2, 1931 padding_y => 2,
1507 can_events => 0, 1932 can_events => 0,
1508 %arg 1933 %arg
1509 ); 1934 );
1510 1935
1511 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1939 $self->{template} = $layout;
1515 } 1940 }
1516 1941
1517 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1521 } 1946 }
1522 1947
1523 $self 1948 $self
1524} 1949}
1525 1950
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1951sub update {
1537 my ($self) = @_; 1952 my ($self) = @_;
1538 1953
1539 delete $self->{texture}; 1954 delete $self->{texture};
1540 $self->SUPER::update; 1955 $self->SUPER::update;
… …
1542 1957
1543sub realloc { 1958sub realloc {
1544 my ($self) = @_; 1959 my ($self) = @_;
1545 1960
1546 delete $self->{ox}; 1961 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1962 $self->SUPER::realloc;
1549} 1963}
1550 1964
1551sub set_text { 1965sub set_text {
1552 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1553 1967
1554 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1556 1970
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1559 1972
1973 delete $self->{size_req};
1560 $self->realloc; 1974 $self->realloc;
1561 $self->update; 1975 $self->update;
1562} 1976}
1563 1977
1564sub set_markup { 1978sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1569 1983
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1985
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1574 1987
1988 delete $self->{size_req};
1575 $self->realloc; 1989 $self->realloc;
1576 $self->update; 1990 $self->update;
1577} 1991}
1578 1992
1579sub size_request { 1993sub size_request {
1580 my ($self) = @_; 1994 my ($self) = @_;
1581 1995
1582 if (exists $self->{req_h}) { 1996 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1998 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 2002
1591 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1592 2004
1593 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 2006 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 2009
1597 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1598 2011
1599 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 2013 $h = List::Util::max $h, $h2;
1601 } 2014 }
1602 2015
1603 ($w, $h) 2016 [$w, $h]
1604 } 2017 };
1605}
1606 2018
2019 @{ $self->{size_req} }
2020}
2021
2022sub baseline_shift {
2023 $_[0]{layout}->descent
2024}
2025
1607sub size_allocate { 2026sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 2027 my ($self, $w, $h) = @_;
1609 2028
1610 delete $self->{ox}; 2029 delete $self->{ox};
1611 2030
1612 delete $self->{texture} 2031 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2032 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2033
2034 1
1614} 2035}
1615 2036
1616sub set_fontsize { 2037sub set_fontsize {
1617 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1618 2039
1619 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1620 delete $self->{texture}; 2042 delete $self->{texture};
1621 2043
1622 $self->realloc; 2044 $self->realloc;
1623} 2045}
1624 2046
2047sub reconfigure {
2048 my ($self) = @_;
2049
2050 delete $self->{size_req};
2051 delete $self->{texture};
2052
2053 $self->SUPER::reconfigure;
2054}
2055
1625sub _draw { 2056sub _draw {
1626 my ($self) = @_; 2057 my ($self) = @_;
1627 2058
1628 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1629 2060
1630 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 2068
1638 new_from_layout CFClient::Texture $self->{layout} 2069 [$self->{layout}->size]
1639 }; 2070 };
1640 2071
1641 unless (exists $self->{ox}) { 2072 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 2075 : ($self->{w} - $size->[0]) * 0.5);
1645 2076
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 2079 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 2080 };
1650 2081
1651 glEnable GL_TEXTURE_2D; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 2084
1654 glColor_premultiply @{$self->{fg}} 2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 2086}
1661 2087
1662############################################################################# 2088#############################################################################
1663 2089
1664package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1665 2091
1666our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1667 2093
1668use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1669 2095
1670sub new { 2096sub new {
1671 my $class = shift; 2097 my $class = shift;
1672 2098
1673 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1677 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1678 can_hover => 1, 2104 can_hover => 1,
1679 can_focus => 1, 2105 can_focus => 1,
1680 valign => 0, 2106 valign => 0,
1681 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1682 #text => ... 2109 #text => ...
2110 #hidden => "*",
1683 @_ 2111 @_
1684 ) 2112 )
1685} 2113}
1686 2114
1687sub _set_text { 2115sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 2122 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 2123 $self->{text} = $text;
1696 2124
1697 $text =~ s/./*/g if $self->{hidden}; 2125 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 2126 $self->{layout}->set_text ("$text ");
2127 delete $self->{size_req};
1699 2128
1700 $self->_emit (changed => $self->{text}); 2129 $self->emit (changed => $self->{text});
2130
2131 $self->realloc;
1701 $self->update; 2132 $self->update;
1702} 2133}
1703 2134
1704sub set_text { 2135sub set_text {
1705 my ($self, $text) = @_; 2136 my ($self, $text) = @_;
1706 2137
1707 $self->{cursor} = length $text; 2138 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 2139 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 2140}
1712 2141
1713sub get_text { 2142sub get_text {
1714 $_[0]{text} 2143 $_[0]{text}
1715} 2144}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 2149 my ($w, $h) = $self->SUPER::size_request;
1721 2150
1722 ($w + 1, $h) # add 1 for cursor 2151 ($w + 1, $h) # add 1 for cursor
1723} 2152}
1724 2153
1725sub key_down { 2154sub invoke_key_down {
1726 my ($self, $ev) = @_; 2155 my ($self, $ev) = @_;
1727 2156
1728 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1731 2160
1732 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1733 2164
1734 if ($uni == 8) { 2165 if ($uni == 8) {
1735 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1737 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1738 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1739 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1740 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1741 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1742 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1743 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 2189 $self->emit ('escape');
1748 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 2194 } else {
1751 return 0; 2195 return 0;
1752 } 2196 }
1753 2197
1754 $self->_set_text ($text); 2198 $self->_set_text ($text);
1755 2199
1756 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1757 2202
1758 1 2203 1
1759} 2204}
1760 2205
1761sub focus_in { 2206sub invoke_focus_in {
1762 my ($self) = @_; 2207 my ($self) = @_;
1763 2208
1764 $self->{last_activity} = $::NOW; 2209 $self->{last_activity} = $::NOW;
1765 2210
1766 $self->SUPER::focus_in; 2211 $self->SUPER::invoke_focus_in
1767} 2212}
1768 2213
1769sub button_down { 2214sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1771 2216
1772 $self->SUPER::button_down ($ev, $x, $y); 2217 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 2218
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 2220
1776 # byte-index to char-index 2221 # byte-index to char-index
1777 my $text = $self->{text}; 2222 my $text = $self->{text};
1778 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1780 2225
1781 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1782 $self->update; 2227 $self->update;
1783 2228
1784 1 2229 1
1785} 2230}
1786 2231
1787sub mouse_motion { 2232sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2234# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790 2235
1791 0 2236 1
1792} 2237}
1793 2238
1794sub _draw { 2239sub _draw {
1795 my ($self) = @_; 2240 my ($self) = @_;
1796 2241
… …
1823 utf8::encode $text; 2268 utf8::encode $text;
1824 2269
1825 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1826 } 2271 }
1827 2272
1828 glColor @{$self->{fg}};
1829 glBegin GL_LINES; 2273 glBegin GL_LINES;
1830 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1831 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1832 glEnd; 2276 glEnd;
1833 } 2277 }
1834} 2278}
1835 2279
2280#############################################################################
2281
1836package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1837 2283
1838our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1839 2285
1840use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1841 2287
1842sub key_down { 2288sub invoke_key_down {
1843 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1844 2290
1845 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1846 2292
1847 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1848 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1850 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 2299 $self->emit (activate => $txt);
1853 $self->update; 2300 $self->update;
1854 2301
1855 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1858 } 2305 }
1859 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1860 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1862 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1863 } 2310 }
1864 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1865 } 2312 }
1866 2313
1867 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1868 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1869 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870 2317
1871 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1872 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1873 } else { 2320 } else {
1874 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1875 } 2322 }
1876 2323
1877 } else { 2324 } else {
1878 return $self->SUPER::key_down ($ev) 2325 return $self->SUPER::invoke_key_down ($ev)
1879 } 2326 }
1880 2327
1881 1 2328 1
1882} 2329}
1883 2330
1884############################################################################# 2331#############################################################################
1885 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1886package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1887 2373
1888our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1889 2375
1890use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1891 2377
1892my @tex = 2378my @tex =
1893 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1895 2381
1896sub new { 2382sub new {
1897 my $class = shift; 2383 my $class = shift;
1898 2384
… …
1907 can_events => 1, 2393 can_events => 1,
1908 @_ 2394 @_
1909 ) 2395 )
1910} 2396}
1911 2397
1912sub activate { }
1913
1914sub button_up { 2398sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 2399 my ($self, $ev, $x, $y) = @_;
1916 2400
1917 $self->emit ("activate") 2401 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 2402 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 2403 && $y >= 0 && $y < $self->{h};
… …
1937 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1938} 2422}
1939 2423
1940############################################################################# 2424#############################################################################
1941 2425
1942package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
1943 2427
1944our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
1945 2429
1946my @tex = 2430my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949 2433
1950use CFClient::OpenGL; 2434use CFPlus::OpenGL;
1951 2435
1952sub new { 2436sub new {
1953 my $class = shift; 2437 my $class = shift;
1954 2438
1955 $class->SUPER::new ( 2439 $class->SUPER::new (
… …
1969 my ($self) = @_; 2453 my ($self) = @_;
1970 2454
1971 (6) x 2 2455 (6) x 2
1972} 2456}
1973 2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
1974sub button_down { 2466sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2467 my ($self, $ev, $x, $y) = @_;
1976 2468
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2471 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2472 } else {
1982 return 0 2473 return 0
1983 } 2474 }
1984 2475
1985 1 2476 1
… …
2005 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2006} 2497}
2007 2498
2008############################################################################# 2499#############################################################################
2009 2500
2010package CFClient::UI::Image; 2501package CFPlus::UI::Image;
2011 2502
2012our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
2013 2504
2014use CFClient::OpenGL; 2505use CFPlus::OpenGL;
2015use Carp qw/confess/;
2016 2506
2017our %loaded_images; 2507our %texture_cache;
2018 2508
2019sub new { 2509sub new {
2020 my $class = shift; 2510 my $class = shift;
2021 2511
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2023 2516
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2025 2519
2026 $loaded_images{$self->{image}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2028 2522
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2030 2524
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2526
2035 $self 2527 $self
2036} 2528}
2037 2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2038sub size_request { 2545sub size_request {
2039 my ($self) = @_; 2546 my ($self) = @_;
2040 2547
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2548 ($self->{tex}{w}, $self->{tex}{h})
2042} 2549}
2043 2550
2044sub _draw { 2551sub _draw {
2045 my ($self) = @_; 2552 my ($self) = @_;
2046 2553
… …
2056 } 2563 }
2057 2564
2058 glEnable GL_TEXTURE_2D; 2565 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2567
2061 $tex->draw_quad_alpha (0, 0, $w, $h); 2568 $tex->draw_quad (0, 0, $w, $h);
2062 2569
2063 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
2064} 2571}
2065 2572
2066############################################################################# 2573#############################################################################
2067 2574
2575package CFPlus::UI::ImageButton;
2576
2577our @ISA = CFPlus::UI::Image::;
2578
2579use CFPlus::OpenGL;
2580
2581my %textures;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 padding_x => 4,
2588 padding_y => 4,
2589 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1],
2591 can_hover => 1,
2592 align => 0,
2593 valign => 0,
2594 can_events => 1,
2595 @_
2596 );
2597}
2598
2599sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_;
2601
2602 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w}
2604 && $y >= 0 && $y < $self->{h};
2605
2606 1
2607}
2608
2609#############################################################################
2610
2068package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
2069 2612
2070our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
2071 2614
2072use List::Util qw(min max); 2615use List::Util qw(min max);
2073 2616
2074use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2075 2618
2076my %tex = ( 2619my %tex = (
2077 food => [ 2620 food => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080 ], 2623 ],
2081 grace => [ 2624 grace => [
2082 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2084 ], 2627 ],
2085 hp => [ 2628 hp => [
2086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088 ], 2631 ],
2089 mana => [ 2632 mana => [
2090 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2092 ], 2635 ],
2093); 2636);
2094 2637
2095# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2700
2158 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2159 my $h2 = $self->{h} * (1 - $ycut2); 2702 my $h2 = $self->{h} * (1 - $ycut2);
2703 my $h3 = $self->{h};
2704
2705 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160 2706
2161 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2708 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2709 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
… …
2183 2729
2184 if ($t3) { 2730 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2737 glEnd;
2192 } 2738 }
2193 2739
2194 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2195 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2196} 2742}
2197 2743
2198############################################################################# 2744#############################################################################
2199 2745
2200package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2201 2747
2202our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2203 2749
2204sub new { 2750sub new {
2205 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2206 2752
2207 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2209 can_hover => 1, 2755 can_hover => 1,
2210 can_events => 1, 2756 can_events => 1,
2211 %arg, 2757 %arg,
2212 ); 2758 );
2213 2759
2214 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2215 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2216 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2217 2763
2218 $self 2764 $self
2219} 2765}
2220 2766
2221sub set_fontsize { 2767sub set_fontsize {
… …
2242 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2243} 2789}
2244 2790
2245############################################################################# 2791#############################################################################
2246 2792
2247package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2248 2794
2249use strict; 2795use strict;
2250 2796
2251use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2252 2798
2253our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2254 2800
2255my @tex = 2801my @tex =
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2258 2804
2259sub new { 2805sub new {
2260 my $class = shift; 2806 my $class = shift;
2261 2807
… …
2282 $self->update; 2828 $self->update;
2283 2829
2284 $self 2830 $self
2285} 2831}
2286 2832
2287sub changed { }
2288
2289sub set_range { 2833sub set_range {
2290 my ($self, $range) = @_; 2834 my ($self, $range) = @_;
2291 2835
2292 ($range, $self->{range}) = ($self->{range}, $range); 2836 ($range, $self->{range}) = ($self->{range}, $range);
2293 2837
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2838 if ("@$range" ne "@{$self->{range}}") {
2839 $self->update;
2840 $self->set_value ($self->{range}[0]);
2841 }
2296} 2842}
2297 2843
2298sub set_value { 2844sub set_value {
2299 my ($self, $value) = @_; 2845 my ($self, $value) = @_;
2300 2846
… …
2311 if $unit; 2857 if $unit;
2312 2858
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2860
2315 if ($value != $old_value) { 2861 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2862 $self->emit (changed => $value);
2317 $self->update; 2863 $self->update;
2318 } 2864 }
2319} 2865}
2320 2866
2321sub size_request { 2867sub size_request {
2322 my ($self) = @_; 2868 my ($self) = @_;
2323 2869
2324 ($self->{req_w}, $self->{req_h}) 2870 ($self->{req_w}, $self->{req_h})
2325} 2871}
2326 2872
2327sub button_down { 2873sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2329 2875
2330 $self->SUPER::button_down ($ev, $x, $y); 2876 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2877
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2879
2334 $self->mouse_motion ($ev, $x, $y) 2880 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2881}
2336 2882
2337sub mouse_motion { 2883sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2884 my ($self, $ev, $x, $y) = @_;
2339 2885
2340 if ($GRAB == $self) { 2886 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2887 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2888
… …
2348 } else { 2894 } else {
2349 return 0; 2895 return 0;
2350 } 2896 }
2351 2897
2352 1 2898 1
2899}
2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2353} 2911}
2354 2912
2355sub update { 2913sub update {
2356 my ($self) = @_; 2914 my ($self) = @_;
2357 2915
… …
2406 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2407} 2965}
2408 2966
2409############################################################################# 2967#############################################################################
2410 2968
2411package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2412 2970
2413our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2414 2972
2415sub new { 2973sub new {
2416 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2417 2975
2418 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2419 2977
2420 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2421 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423 to_value => sub { shift }, 2981 to_value => sub { shift },
2424 from_value => sub { shift }, 2982 from_value => sub { shift },
2425 %arg, 2983 %arg,
2426 ); 2984 );
2427 2985
… …
2447sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2449 3007
2450############################################################################# 3008#############################################################################
2451 3009
2452package CFClient::UI::TextView; 3010package CFPlus::UI::TextScroller;
2453 3011
2454our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2455 3013
2456use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2457 3015
2458sub new { 3016sub new {
2459 my $class = shift; 3017 my $class = shift;
2460 3018
2461 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2462 fontsize => 1, 3020 fontsize => 1,
2463 can_events => 0, 3021 can_events => 1,
3022 indent => 0,
2464 #font => default_font 3023 #font => default_font
2465 @_, 3024 @_,
2466 3025
2467 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2468 par => [], 3027 par => [],
3028 max_par => 0,
2469 height => 0, 3029 height => 0,
2470 children => [ 3030 children => [
2471 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2473 ], 3033 ],
2474 ); 3034 );
2475 3035
2476 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2477 3037
… …
2483 3043
2484 $self->{fontsize} = $fontsize; 3044 $self->{fontsize} = $fontsize;
2485 $self->reflow; 3045 $self->reflow;
2486} 3046}
2487 3047
3048sub size_request {
3049 my ($self) = @_;
3050
3051 my ($empty, $slider) = @{ $self->{children} };
3052
3053 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request
3055}
3056
2488sub size_allocate { 3057sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h) = @_;
2490 3059
2491 $self->SUPER::size_allocate ($w, $h); 3060 my ($empty, $slider, @other) = @{ $self->{children} };
3061 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 3062
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3063 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3064 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 3065 $self->{layout}->set_width ($empty->{w});
3066 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 3067
2497 $self->reflow; 3068 $self->reflow;
2498}
2499 3069
2500sub text_size { 3070 local $self->{children} = [$empty, $slider];
3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
2501 my ($self, $text, $indent) = @_; 3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
3082}
3083
3084sub get_layout {
3085 my ($self, $para) = @_;
2502 3086
2503 my $layout = $self->{layout}; 3087 my $layout = $self->{layout};
2504 3088
3089 $layout->set_font ($self->{font}) if $self->{font};
3090 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3091 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 3092 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 3094 $layout->set_markup ($para->{markup});
3095
3096 $layout->set_shapes (
3097 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}}
2508 3100 );
3101
2509 $layout->size 3102 $layout
2510} 3103}
2511 3104
2512sub reflow { 3105sub reflow {
2513 my ($self) = @_; 3106 my ($self) = @_;
2514 3107
… …
2521 3114
2522 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2523 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2524} 3117}
2525 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2526sub clear { 3134sub clear {
2527 my ($self) = @_; 3135 my ($self) = @_;
3136
3137 my (undef, undef, @other) = @{ $self->{children} };
3138 $self->remove ($_) for @other;
2528 3139
2529 $self->{par} = []; 3140 $self->{par} = [];
2530 $self->{height} = 0; 3141 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 3143}
2533 3144
2534sub add_paragraph { 3145sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 3146 my $self = shift;
2536 3147
2537 for my $line (split /\n/, $text) { 3148 for my $para (@_) {
2538 my ($w, $h) = $self->text_size ($line); 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
3155 w => 1e10,
3156 wrapped => 1,
3157 };
3158
3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
3166
3167 $self->{need_reflow}++;
3168 $self->update;
3169}
3170
3171sub scroll_to_bottom {
3172 my ($self) = @_;
3173
3174 $self->{scroll_to} = $#{$self->{par}};
3175 $self->update;
3176}
3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
2539 $self->{height} += $h; 3200 $self->{height} = $height;
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2541 }
2542 3202
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
2544} 3209}
2545 3210
2546sub update { 3211sub update {
2547 my ($self) = @_; 3212 my ($self) = @_;
2548 3213
… …
2550 3215
2551 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2552 3217
2553 delete $self->{texture}; 3218 delete $self->{texture};
2554 3219
2555 $ROOT->on_post_alloc ($self, sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 3224
2558 if (delete $self->{need_reflow}) {
2559 my $height = 0;
2560
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567 $layout->set_width ($W - $_->[3]);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3];
2571 $_->[1] = $h;
2572 }
2573
2574 $height += $_->[1];
2575 }
2576
2577 $self->{height} = $height;
2578
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2580
2581 delete $self->{texture};
2582 }
2583
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2587 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2588 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2589 3238
2590 my $y0 = $top; 3239 my $y0 = $top;
2591 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2592 3241
2593 my $y = 0;
2594
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 3242 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2605 3245
2606 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] }); 3247 my $layout = $self->get_layout ($para);
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 3248
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3249 $layout->render ($para->{indent}, $y - $y0);
2612 3250
2613 glRasterPos $par->[3], $y - $y0; 3251 if (my @w = @{ $para->{widget} }) {
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3252 my @s = $layout->get_shapes;
3253
3254 for (@w) {
3255 my ($dx, $dy) = splice @s, 0, 2, ();
3256
3257 $_->{x} = $dx + $para->{indent};
3258 $_->{y} = $dy + $y - $y0;
3259
3260 $_->draw;
3261 }
3262 }
2615 } 3263 }
2616 3264
2617 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2618 } 3267 }
2619 3268
2620 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2621 }; 3270 };
2622 }); 3271 });
3272}
3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 $self->SUPER::reconfigure;
3278
3279 $_->{w} = 1e10 for @{ $self->{par} };
3280 $self->reflow;
2623} 3281}
2624 3282
2625sub _draw { 3283sub _draw {
2626 my ($self) = @_; 3284 my ($self) = @_;
2627 3285
… …
2630 glColor 0, 0, 0, 1; 3288 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3289 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 3290 glDisable GL_TEXTURE_2D;
2633 3291
2634 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2635
2636} 3293}
2637 3294
2638############################################################################# 3295#############################################################################
2639 3296
2640package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2641 3298
2642use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2643 3300
2644our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2645 3302
2646sub moveto { 3303sub moveto {
2647 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2648 3305
2649 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2677 glPopMatrix; 3334 glPopMatrix;
2678} 3335}
2679 3336
2680############################################################################# 3337#############################################################################
2681 3338
2682package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2683 3340
2684our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2685 3342
2686sub new { 3343sub new {
2687 my $class = shift; 3344 my $class = shift;
2688 3345
2689 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2701 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2702} 3359}
2703 3360
2704############################################################################# 3361#############################################################################
2705 3362
2706package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2707 3364
2708our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2709 3366
2710use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2711 3368
2712sub new { 3369sub new {
2713 my $class = shift; 3370 my $class = shift;
2714 3371
2715 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2718 ) 3375 )
2719} 3376}
2720 3377
2721sub set_tooltip_from { 3378sub set_tooltip_from {
2722 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2723 3383
2724 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2725 3385
2726 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 3389 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 3390 . "visible $widget->{visible}";
2731 } 3391 }
2732 3392
3393 $tooltip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//;
3395
2733 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2734 markup => $tooltip, 3397 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 3399 fontsize => 0.8,
2737 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2738 ellipsise => 0, 3401 ellipsise => 0,
2739 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2740 ); 3403 );
2741} 3404}
2742 3405
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3409 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 3410
2748 ($w + 4, $h + 4) 3411 ($w + 4, $h + 4)
2749} 3412}
2750 3413
2751sub size_allocate { 3414sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 3415 my ($self, $w, $h) = @_;
2753 3416
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 3417 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 3418}
2756 3419
2757sub visibility_change { 3420sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 3421 my ($self, $visible) = @_;
2759 3422
2760 return unless $visible; 3423 return unless $visible;
2761 3424
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2764 or return; 3427 or return;
2765 3428
3429 if ($widget->{visible}) {
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 3431
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 3433 if $x + $self->{w} > $self->{root}{w};
2770 3434
2771 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2772 }); 3439 });
2773} 3440}
2774 3441
2775sub _draw { 3442sub _draw {
2776 my ($self) = @_; 3443 my ($self) = @_;
… …
2800 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2801} 3468}
2802 3469
2803############################################################################# 3470#############################################################################
2804 3471
2805package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2806 3473
2807our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2808 3475
2809use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2810 3477
2811sub new { 3478sub new {
2812 my $class = shift; 3479 my $class = shift;
2813 3480
2814 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2815 aspect => 1, 3484 aspect => 1,
2816 can_events => 0, 3485 can_events => 0,
2817 @_, 3486 @_,
2818 ); 3487 );
2819 3488
2820 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2821 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2822 3491
2823 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2824 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2825 hard => 1, 3494 hard => 1,
2826 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2827 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2828 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2829 $widget->update; 3501 $self->update;
2830 }, 3502 },
2831 ); 3503 );
3504
3505 $self->update_face;
2832 } 3506 }
2833 3507
2834 $self 3508 $self
2835} 3509}
2836 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2837sub size_request { 3524sub size_request {
2838 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2839} 3540}
2840 3541
2841sub update { 3542sub update {
2842 my ($self) = @_; 3543 my ($self) = @_;
2843 3544
… …
2849sub _draw { 3550sub _draw {
2850 my ($self) = @_; 3551 my ($self) = @_;
2851 3552
2852 return unless $::CONN; 3553 return unless $::CONN;
2853 3554
2854 my $face; 3555 $self->SUPER::_draw;
2855 3556
2856 if ($self->{frame}) {
2857 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
2858 3558 or return;
2859 $face = $anim->[ $self->{frame} % @$anim ]
2860 if $anim && @$anim;
2861 }
2862 3559
2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
2864 3561
2865 if ($tex) { 3562 if ($tex) {
2866 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2868 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3567 glDisable GL_TEXTURE_2D;
2871 } 3568 }
2872} 3569}
2873 3570
2874sub DESTROY { 3571sub destroy {
2875 my ($self) = @_; 3572 my ($self) = @_;
2876 3573
2877 $self->{timer}->cancel 3574 $self->{timer}->cancel
2878 if $self->{timer}; 3575 if $self->{timer};
2879 3576
2880 $self->SUPER::DESTROY; 3577 $self->SUPER::destroy;
2881} 3578}
2882 3579
2883############################################################################# 3580#############################################################################
2884 3581
2885package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
2886 3583
2887our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
2888 3585
2889# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
2890 3587
2891############################################################################# 3588#############################################################################
2892 3589
2893package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
2894 3591
2895our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
2896 3593
2897use CFClient::OpenGL; 3594use CFPlus::OpenGL;
2898 3595
2899sub new { 3596sub new {
2900 my $class = shift; 3597 my $class = shift;
2901 3598
2902 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
2903 items => [], 3600 items => [],
2904 z => 100, 3601 z => 100,
2905 @_, 3602 @_,
2906 ); 3603 );
2907 3604
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909 3606
2910 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
2912 3609
2913 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
2914 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
2915 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
2916 can_hover => 1, 3616 can_hover => 1,
2917 can_events => 1, 3617 can_events => 1,
3618 tooltip => $tooltip,
3619 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ],
3623 ;
3624
3625 } else {
3626 $widget = new CFPlus::UI::Label
3627 can_hover => 1,
3628 can_events => 1,
2918 text => $widget; 3629 markup => $widget,
3630 tooltip => $tooltip;
3631 }
2919 } 3632 }
2920 3633
2921 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
2922 3635
2923 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
2928 3641
2929# popup given the event (must be a mouse button down event currently) 3642# popup given the event (must be a mouse button down event currently)
2930sub popup { 3643sub popup {
2931 my ($self, $ev) = @_; 3644 my ($self, $ev) = @_;
2932 3645
2933 $self->_emit ("popdown"); 3646 $self->emit ("popdown");
2934 3647
2935 # maybe save $GRAB? must be careful about events... 3648 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3649 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3650 $self->{button} = $ev->{button};
2938 3651
2939 $self->show; 3652 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3653 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3654}
2942 3655
2943sub mouse_motion { 3656sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3657 my ($self, $ev, $x, $y) = @_;
2945 3658
2946 # TODO: should use vbox->find_widget or so 3659 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3660 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3661 $self->{hover} = $self->{item}{$HOVER};
2949 3662
2950 0 3663 0
2951} 3664}
2952 3665
2953sub button_up { 3666sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3667 my ($self, $ev, $x, $y) = @_;
2955 3668
2956 if ($ev->{button} == $self->{button}) { 3669 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3670 undef $GRAB;
2958 $self->hide; 3671 $self->hide;
2959 3672
2960 $self->_emit ("popdown"); 3673 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3674 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3675 } else {
2963 return 0 3676 return 0
2964 } 3677 }
2965 3678
2966 1 3679 1
2967} 3680}
2968 3681
2969############################################################################# 3682#############################################################################
2970 3683
2971package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
2972 3685
2973our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
2974 3687
2975sub new { 3688sub new {
2976 my $class = shift; 3689 my $class = shift;
2977 3690
2978 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
2992 3705
2993 $self->{current} = $self->{children}[0] 3706 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3707 if @{ $self->{children} };
2995} 3708}
2996 3709
3710sub get_current_page {
3711 my ($self) = @_;
3712
3713 $self->{current}
3714}
3715
2997sub set_current_page { 3716sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3717 my ($self, $page_or_widget) = @_;
2999 3718
3000 my $widget = ref $page_or_widget 3719 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3720 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3721 : $self->{children}[$page_or_widget];
3003 3722
3004 $self->{current} = $widget; 3723 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3724 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3725
3007 $self->_emit (page_changed => $self->{current}); 3726 $self->emit (page_changed => $self->{current});
3008 3727
3009 $self->realloc; 3728 $self->realloc;
3010} 3729}
3011 3730
3012sub visible_children { 3731sub visible_children {
… …
3017 my ($self) = @_; 3736 my ($self) = @_;
3018 3737
3019 $self->{current}->size_request 3738 $self->{current}->size_request
3020} 3739}
3021 3740
3022sub size_allocate { 3741sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3742 my ($self, $w, $h) = @_;
3024 3743
3025 $self->{current}->configure (0, 0, $w, $h); 3744 $self->{current}->configure (0, 0, $w, $h);
3745
3746 1
3026} 3747}
3027 3748
3028sub _draw { 3749sub _draw {
3029 my ($self) = @_; 3750 my ($self) = @_;
3030 3751
3031 $self->{current}->draw; 3752 $self->{current}->draw;
3032} 3753}
3033 3754
3034############################################################################# 3755#############################################################################
3035 3756
3036package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3037 3758
3038our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3039 3760
3040sub new { 3761sub new {
3041 my $class = shift; 3762 my $class = shift;
3042 3763
3043 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3047 @_, 3768 @_,
3048 ); 3769 );
3049 3770
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3054} 3775}
3055 3776
3056sub add { 3777sub add {
3057 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3058 3779
3059 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3060 3781
3061 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3062 markup => $title, 3783 markup => $title,
3063 tooltip => $tooltip, 3784 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3065 ); 3786 );
3066 3787
3067 $self->{multiplexer}->add ($widget); 3788 $self->{multiplexer}->add ($widget);
3068} 3789}
3069 3790
3791sub get_current_page {
3792 my ($self) = @_;
3793
3794 $self->{multiplexer}->get_current_page
3795}
3796
3070sub set_current_page { 3797sub set_current_page {
3071 my ($self, $page) = @_; 3798 my ($self, $page) = @_;
3072 3799
3073 $self->{multiplexer}->set_current_page ($page); 3800 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3075} 3802}
3076 3803
3077############################################################################# 3804#############################################################################
3078 3805
3806package CFPlus::UI::Selector;
3807
3808use utf8;
3809
3810our @ISA = CFPlus::UI::Button::;
3811
3812sub new {
3813 my $class = shift;
3814
3815 my $self = $class->SUPER::new (
3816 options => [], # [value, title, longdesc], ...
3817 value => undef,
3818 @_,
3819 );
3820
3821 $self->_set_value ($self->{value});
3822
3823 $self
3824}
3825
3826sub invoke_button_down {
3827 my ($self, $ev) = @_;
3828
3829 my @menu_items;
3830
3831 for (@{ $self->{options} }) {
3832 my ($value, $title, $tooltip) = @$_;
3833
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 }
3836
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838}
3839
3840sub _set_value {
3841 my ($self, $value) = @_;
3842
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3844 or return;
3845
3846 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]);
3849}
3850
3851sub set_value {
3852 my ($self, $value) = @_;
3853
3854 return unless $self->{value} ne $value;
3855
3856 $self->_set_value ($value);
3857 $self->emit (changed => $value);
3858}
3859
3860#############################################################################
3861
3079package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3080 3863
3081our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3082 3865
3083sub new { 3866sub new {
3084 my $class = shift; 3867 my $class = shift;
3085 3868
3086 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3087 fontsize => 0.8, 3870 fontsize => 0.8,
3088 @_, 3871 @_,
3089 ); 3872 );
3090 3873
3091 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3092 3875
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094 3877
3095 $self 3878 $self
3096} 3879}
… …
3098sub reorder { 3881sub reorder {
3099 my ($self) = @_; 3882 my ($self) = @_;
3100 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3101 3884
3102 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3106 3889
3107 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3108 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109 } 3892 }
… …
3130 for ($short) { 3913 for ($short) {
3131 s/^\s+//; 3914 s/^\s+//;
3132 s/\s+/ /g; 3915 s/\s+/ /g;
3133 } 3916 }
3134 3917
3135 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3136 markup => $short, 3919 markup => $short,
3137 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3138 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3139 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3140 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3178 $item->{count}++; 3961 $item->{count}++;
3179 } else { 3962 } else {
3180 $item->{count} = 1; 3963 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3964 $item->{text} = $item->{tooltip} = $text;
3182 } 3965 }
3183 $item->{id} = ++$self->{id}; 3966 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3967 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3968 delete $item->{label};
3186 } else { 3969 } else {
3187 $self->{item}{$group} = { 3970 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3971 id => ++$self->{id},
… …
3194 count => 1, 3977 count => 1,
3195 %arg, 3978 %arg,
3196 }; 3979 };
3197 } 3980 }
3198 3981
3982 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3983 $self->reorder;
3984 });
3200} 3985}
3201 3986
3202sub reconfigure { 3987sub reconfigure {
3203 my ($self) = @_; 3988 my ($self) = @_;
3204 3989
… …
3207 3992
3208 $self->reorder; 3993 $self->reorder;
3209 $self->SUPER::reconfigure; 3994 $self->SUPER::reconfigure;
3210} 3995}
3211 3996
3212sub DESTROY { 3997sub destroy {
3213 my ($self) = @_; 3998 my ($self) = @_;
3214 3999
3215 $self->{timer}->cancel; 4000 $self->{timer}->cancel;
3216 4001
3217 $self->SUPER::DESTROY; 4002 $self->SUPER::destroy;
3218} 4003}
3219 4004
3220############################################################################# 4005#############################################################################
3221 4006
3222package CFClient::UI::Inventory;
3223
3224our @ISA = CFClient::UI::ScrolledWindow::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
3471 @_,
3472 )
3473}
3474
3475# XXX: Do sorting? Argl...
3476sub add_spell {
3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
3479
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root; 4007package CFPlus::UI::Root;
3518 4008
3519our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3520 4010
3521use List::Util qw(min max); 4011use List::Util qw(min max);
3522 4012
3523use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3524 4014
3525sub new { 4015sub new {
3526 my $class = shift; 4016 my $class = shift;
3527 4017
3528 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3529 visible => 1, 4019 visible => 1,
3530 @_, 4020 @_,
3531 ); 4021 );
3532 4022
3533 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3534 4024
3535 $self 4025 $self
3536} 4026}
3537 4027
3538sub size_request { 4028sub size_request {
… …
3553 $coord = $max - $size if $coord > $max - $size; 4043 $coord = $max - $size if $coord > $max - $size;
3554 4044
3555 int $coord + 0.5 4045 int $coord + 0.5
3556} 4046}
3557 4047
3558sub size_allocate { 4048sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 4049 my ($self, $w, $h) = @_;
3560 4050
3561 for my $child ($self->children) { 4051 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 4053
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 4057 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 4058 $Y = _to_pixel $Y, $H, $self->{h};
3569 4059
3570 $child->configure ($X, $Y, $W, $H); 4060 $child->configure ($X, $Y, $W, $H);
3571 } 4061 }
4062
4063 1
3572} 4064}
3573 4065
3574sub coord2local { 4066sub coord2local {
3575 my ($self, $x, $y) = @_; 4067 my ($self, $x, $y) = @_;
3576 4068
… …
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703 4195
3704 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3705 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3706 4198
4199 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h;
4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207
3707 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3708 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
3709 4210
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w}; 4212 $widget->{old_w} = $widget->{w};
… …
3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3736 glLoadIdentity; 4237 glLoadIdentity;
3737 4238
3738 { 4239 {
3739 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3740 4241
3741 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3743 }
3744 4244
3745 $self->_draw; 4245 $self->_draw;
4246 }
3746} 4247}
3747 4248
3748############################################################################# 4249#############################################################################
3749 4250
3750package CFClient::UI; 4251package CFPlus::UI;
3751 4252
3752$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3753$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754 4255
37551 42561
3756 4257

Diff Legend

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