ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
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
462} 503}
463 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)
550}
551
464sub find_widget { 552#sub find_widget {
465 my ($self, $x, $y) = @_; 553# in .xs
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475 554
476sub set_parent { 555sub set_parent {
477 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
478 557
479 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 559 $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} 560}
505 561
506sub realloc { 562sub realloc {
507 my ($self) = @_; 563 my ($self) = @_;
508 564
… …
541 return unless $self->{h} && $self->{w}; 597 return unless $self->{h} && $self->{w};
542 598
543 # update screen rectangle 599 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 600 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 601 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 602
549 # skip widgets that are entirely outside the drawing area 603 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 604 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 605 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 606
… …
575 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
578 glEnd; 632 glEnd;
579 glPopMatrix; 633 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 635 }
582 636
583 $self->_draw; 637 $self->_draw;
584 glPopMatrix; 638 glPopMatrix;
585} 639}
… …
588 my ($self) = @_; 642 my ($self) = @_;
589 643
590 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
591} 645}
592 646
647my $cntx;#d#
593sub DESTROY { 648sub DESTROY {
594 my ($self) = @_; 649 my ($self) = @_;
595 650
651 return if CFPlus::in_destruct;
652
653 eval { $self->destroy };
654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
596 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
597 #$self->deactivate;
598} 657}
599 658
600############################################################################# 659#############################################################################
601 660
602package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
603 662
604our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
605 664
606use strict; 665use strict;
607use CFClient::OpenGL; 666use CFPlus::OpenGL;
608 667
609sub new { 668sub new {
610 my $class = shift; 669 my $class = shift;
611 670
612 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
643 } 702 }
644} 703}
645 704
646############################################################################# 705#############################################################################
647 706
648package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
649 708
650our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
651 710
652sub new { 711sub new {
653 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
655} 714}
… …
662 721
663sub draw { } 722sub draw { }
664 723
665############################################################################# 724#############################################################################
666 725
667package CFClient::UI::Container; 726package CFPlus::UI::Container;
668 727
669our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
670 729
671sub new { 730sub new {
672 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
673 732
674 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
683 if $children; 742 if $children;
684 743
685 $self 744 $self
686} 745}
687 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
688sub add { 755sub add {
689 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
690 757
691 $_->set_parent ($self) 758 $_->set_parent ($self)
692 for @widgets; 759 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
753} 820}
754 821
755############################################################################# 822#############################################################################
756 823
757package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
758 825
759our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
760 827
761sub new { 828sub new {
762 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
763 830
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 832
766 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
767} 834}
768 835
769sub add { 836sub add {
770 my ($self, $child) = @_; 837 my ($self, $child) = @_;
771 838
772 $self->{children} = []; 839 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 840 $self->SUPER::add ($child);
775} 841}
776 842
777sub remove { 843sub remove {
778 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
779 845
780 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
781 847
782 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
783 unless @{$self->{children}}; 849 unless @{$self->{children}};
784} 850}
785 851
786sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
787 853
788sub size_request { 854sub size_request {
789 $_[0]{children}[0]->size_request 855 $_[0]{children}[0]->size_request
790} 856}
791 857
792sub size_allocate { 858sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 859 my ($self, $w, $h) = @_;
794 860
795 $self->{children}[0]->configure (0, 0, $w, $h); 861 $self->{children}[0]->configure (0, 0, $w, $h);
862
863 1
796} 864}
797 865
798############################################################################# 866#############################################################################
799 867
800# back-buffered drawing area 868# back-buffered drawing area
801 869
802package CFClient::UI::Window; 870package CFPlus::UI::Window;
803 871
804our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
805 873
806use CFClient::OpenGL; 874use CFPlus::OpenGL;
807 875
808sub new { 876sub new {
809 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
810 878
811 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
816 884
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 885 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 886 $self->SUPER::update;
819} 887}
820 888
821sub size_allocate { 889sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 890 my ($self, $w, $h) = @_;
823 891
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 892 $self->update;
893
894 $self->SUPER::invoke_size_allocate ($w, $h)
826} 895}
827 896
828sub _render { 897sub _render {
829 my ($self) = @_; 898 my ($self) = @_;
830 899
… …
832} 901}
833 902
834sub render_child { 903sub render_child {
835 my ($self) = @_; 904 my ($self) = @_;
836 905
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
840 909
841 { 910 {
842 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
843 912
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
846 } 917 }
847
848 $self->_render;
849 }; 918 };
850} 919}
851 920
852sub _draw { 921sub _draw {
853 my ($self) = @_; 922 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 923
857 my $tex = $self->{texture} 924 my $tex = $self->{texture}
858 or return; 925 or return;
859 926
860 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
863 930
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
865 932
866 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
867} 934}
868 935
869############################################################################# 936#############################################################################
870 937
871package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
872 939
940use List::Util qw(min max);
941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
891 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
892 961
893 ($w, $h) 962 ($w, $h)
894} 963}
895 964
896sub size_allocate { 965sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
898 967
899 my $child = $self->child; 968 my $child = $self->child;
900 969
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 972
904 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
905 $self->update; 974 $self->update;
975
976 1
906} 977}
907 978
908sub set_offset { 979sub set_offset {
909 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
910 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
911 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
912 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
913 988
989 $self->emit (changed => $x, $y);
914 $self->update; 990 $self->update;
991 }
915} 992}
916 993
917# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
918sub coord2local { 995sub coord2local {
919 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
934 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
935 1012
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1015 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1017 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1019 }
943} 1020}
944 1021
945sub _render { 1022sub _render {
946 my ($self) = @_; 1023 my ($self) = @_;
947 1024
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 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}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1027
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1029
953 $self->SUPER::_render; 1030 $self->SUPER::_render;
954} 1031}
955 1032
956############################################################################# 1033#############################################################################
957 1034
958package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
959 1036
960our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
961 1038
962sub new { 1039sub new {
963 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
964 1041
965 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
966 1043
967 my $self; 1044 my $self;
968 1045
969 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
970 vertical => 1, 1056 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1058 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1061 },
975 ; 1062 ;
976 1063
977 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
979 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
980 %arg, 1072 %arg,
981 ); 1073 );
982 1074
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
984 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
985 1092
986 $self 1093 $self
987} 1094}
1095
1096#TODO# update range on size_allocate depending on child
988 1097
989sub add { 1098sub add {
990 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
991 1100
992 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
993} 1102}
994 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
995sub update { 1128sub update {
996 my ($self) = @_; 1129 my ($self) = @_;
997 1130
1131 $self->update_slider;
998 $self->SUPER::update; 1132 $self->SUPER::update;
999
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} 1133}
1004 1134
1135sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_;
1137
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev);
1141
1142 1
1143}
1144
1145sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_;
1147
1148 if ($ev->{button} == 2) {
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1186}
1187
1005sub size_allocate { 1188sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1007 1190
1191 $self->update_slider;
1008 $self->SUPER::size_allocate ($w, $h); 1192 $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} 1193}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1194
1017############################################################################# 1195#############################################################################
1018 1196
1019package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1020 1198
1021our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1022 1200
1023use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1024 1202
1025sub new { 1203sub new {
1026 my $class = shift; 1204 my $class = shift;
1027 1205
1028 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1055} 1233}
1056 1234
1057############################################################################# 1235#############################################################################
1058 1236
1059package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1060 1238
1061our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1062 1240
1063use CFClient::OpenGL; 1241use 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 1242
1073sub new { 1243sub new {
1074 my ($class, %arg) = @_; 1244 my ($class, %arg) = @_;
1075 1245
1076 my $title = delete $arg{title}; 1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1342
1343my $bg =
1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1345 mipmap => 1, wrap => 1;
1346
1347my @border =
1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1355sub new {
1356 my ($class, %arg) = @_;
1077 1357
1078 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1361 border => 0.6,
1082 can_events => 1, 1362 can_events => 1,
1083 min_w => 16, 1363 min_w => 64,
1084 min_h => 16, 1364 min_h => 32,
1085 %arg, 1365 %arg,
1086 ); 1366 );
1087 1367
1088 $self->{title} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1369 align => 0,
1090 valign => 1, 1370 valign => 1,
1091 text => $title, 1371 text => $self->{title},
1092 fontsize => $self->{border} 1372 fontsize => $self->{border},
1093 if defined $title; 1373 if exists $self->{title};
1374
1375 if ($self->{has_close_button}) {
1376 $self->{close_button} =
1377 new CFPlus::UI::ImageButton
1378 path => 'x1_close.png',
1379 on_activate => sub { $self->emit ("delete") };
1380
1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1382 }
1094 1383
1095 $self 1384 $self
1096} 1385}
1097 1386
1098sub add { 1387sub add {
1099 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1100 1389
1101 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1393}
1104 1394
1105sub border { 1395sub border {
1106 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1107} 1397}
1108 1398
1109sub size_request { 1399sub size_request {
1110 my ($self) = @_; 1400 my ($self) = @_;
1111 1401
1112 $self->{title}->size_request 1402 $self->{title_widget}->size_request
1113 if $self->{title}; 1403 if $self->{title_widget};
1404
1405 $self->{close_button}->size_request
1406 if $self->{close_button};
1114 1407
1115 my ($w, $h) = $self->SUPER::size_request; 1408 my ($w, $h) = $self->SUPER::size_request;
1116 1409
1117 ( 1410 (
1118 $w + $self->border * 2, 1411 $w + $self->border * 2,
1119 $h + $self->border * 2, 1412 $h + $self->border * 2,
1120 ) 1413 )
1121} 1414}
1122 1415
1123sub size_allocate { 1416sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1125 1418
1126 if ($self->{title}) { 1419 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1420 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1421 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1422 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1423 }
1131 1424
1132 my $border = $self->border; 1425 my $border = $self->border;
1133 1426
1134 $h -= List::Util::max 0, $border * 2; 1427 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1428 $w -= List::Util::max 0, $border * 2;
1429
1430 $self->child->configure ($border, $border, $w, $h);
1431
1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1433 if $self->{close_button};
1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1136 1442
1137 $self->child->configure ($border, $border, $w, $h); 1443 1
1138} 1444}
1139 1445
1140sub button_down { 1446sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
1142 1448
1143 my ($w, $h) = @$self{qw(w h)}; 1449 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1450 my $border = $self->border;
1145 1451
… …
1176 1482
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1483 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1484
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1485 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1486 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1487 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1488 };
1183 } else { 1489 } else {
1184 return 0; 1490 return 0;
1185 } 1491 }
1186 1492
1187 1 1493 1
1188} 1494}
1189 1495
1190sub button_up { 1496sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1497 my ($self, $ev, $x, $y) = @_;
1192 1498
1193 !!delete $self->{motion} 1499 ! ! delete $self->{motion}
1194} 1500}
1195 1501
1196sub mouse_motion { 1502sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1198 1504
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1506
1201 !!$self->{motion} 1507 ! ! $self->{motion}
1508}
1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1202} 1516}
1203 1517
1204sub _draw { 1518sub _draw {
1205 my ($self) = @_; 1519 my ($self) = @_;
1206 1520
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1528
1215 my $border = $self->border; 1529 my $border = $self->border;
1216 1530
1217 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222 1550
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1225 1553
1226 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1232 1560
1233 glDisable GL_TEXTURE_2D; 1561 glDisable GL_TEXTURE_2D;
1234 1562
1235 $child->draw; 1563 $child->draw;
1236 1564
1237 if ($self->{title}) { 1565 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1566 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1567 $self->{title_widget}->_draw;
1568
1569 glTranslate 0, - ($border - $self->{h});
1240 } 1570 }
1571
1572 $self->{close_button}->draw
1573 if $self->{close_button};
1241} 1574}
1242 1575
1243############################################################################# 1576#############################################################################
1244 1577
1245package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1246 1579
1247our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1248 1581
1249use List::Util qw(max sum); 1582use List::Util qw(max sum);
1250 1583
1251use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1252 1585
1253sub new { 1586sub new {
1254 my $class = shift; 1587 my $class = shift;
1255 1588
1256 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1257 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1258 @_, 1593 @_,
1259 ) 1594 )
1260} 1595}
1261 1596
1262sub children { 1597sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1599}
1265 1600
1601# TODO: store row/col info in child widget and use standard add/del
1266sub add { 1602sub add {
1267 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1268 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1269 $child->set_parent ($self); 1615 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1271 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1621 $self->realloc;
1622}
1623
1624sub remove {
1625 my ($self, $child) = @_;
1626
1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1273} 1632}
1274 1633
1275# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1635sub clear {
1277 my ($self) = @_; 1636 my ($self) = @_;
… …
1318 (sum @$ws), 1677 (sum @$ws),
1319 (sum @$hs), 1678 (sum @$hs),
1320 ) 1679 )
1321} 1680}
1322 1681
1323sub size_allocate { 1682sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1683 my ($self, $w, $h) = @_;
1325 1684
1326 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1327 1686
1328 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1329 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1330 1689
1331 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1332 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1333 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1334 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1335 1694
1336 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1696
1340 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1341 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1342 1706
1343 my $y; 1707 my $y;
1344 1708
1345 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1360 } 1724 }
1361 1725
1362 $y += $row_h; 1726 $y += $row_h;
1363 } 1727 }
1364 1728
1729 1
1365} 1730}
1366 1731
1367sub find_widget { 1732sub find_widget {
1368 my ($self, $x, $y) = @_; 1733 my ($self, $x, $y) = @_;
1369 1734
… …
1388 } 1753 }
1389} 1754}
1390 1755
1391############################################################################# 1756#############################################################################
1392 1757
1393package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1394 1759
1760use List::Util qw(min max);
1761
1395our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1396 1843
1397sub size_request { 1844sub size_request {
1398 my ($self) = @_; 1845 my ($self) = @_;
1399 1846
1400 $self->{vertical} 1847 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1853 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1854 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1855 )
1409} 1856}
1410 1857
1411sub size_allocate { 1858sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1859 my ($self, $w, $h) = @_;
1413 1860
1414 my $space = $self->{vertical} ? $h : $w; 1861 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1862 my @children = $self->visible_children;
1416 1863
1417 my @req; 1864 my @req;
1418 1865
1419 if ($self->{homogeneous}) { 1866 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1867 @req = ($space / (@children || 1)) x @children;
1421 } else { 1868 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1869 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1870 my $req = List::Util::sum @req;
1424 1871
1425 if ($req > $space) { 1872 if ($req > $space) {
1426 # ah well, not enough space 1873 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1874 $_ *= $space / $req for @req;
1428 } else { 1875 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1876 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1877
1431 $space = ($space - $req) / $expand; # remaining space to give away 1878 $space = ($space - $req) / $expand; # remaining space to give away
1432 1879
1433 $req[$_] += $space * $children->[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1881 for 0 .. $#children;
1435 } 1882 }
1436 } 1883 }
1437 1884
1438 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1439 1886
1440 my $pos = 0; 1887 my $pos = 0;
1441 for (0 .. $#$children) { 1888 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1891
1445 $pos += $alloc; 1892 $pos += $alloc;
1446 } 1893 }
1447 1894
1448 1 1895 1
1449} 1896}
1450 1897
1451############################################################################# 1898#############################################################################
1452 1899
1453package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1454 1901
1455our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1456 1903
1457sub new { 1904sub new {
1458 my $class = shift; 1905 my $class = shift;
1459 1906
1460 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1463 ) 1910 )
1464} 1911}
1465 1912
1466############################################################################# 1913#############################################################################
1467 1914
1468package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1469 1916
1470our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1471 1918
1472sub new { 1919sub new {
1473 my $class = shift; 1920 my $class = shift;
1474 1921
1475 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1478 ) 1925 )
1479} 1926}
1480 1927
1481############################################################################# 1928#############################################################################
1482 1929
1483package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1484 1931
1485our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1486 1933
1487use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1488 1935
1489sub new { 1936sub new {
1490 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1491 1938
1492 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1942 #active_bg => none
1496 #font => default_font 1943 #font => default_font
1497 #text => initial text 1944 #text => initial text
1498 #markup => initial narkup 1945 #markup => initial narkup
1499 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1500 ellipsise => 3, # end 1948 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1950 fontsize => 1,
1503 align => -1, 1951 align => -1,
1504 valign => -1, 1952 valign => -1,
1505 padding_x => 2, 1953 padding_x => 2,
1506 padding_y => 2, 1954 padding_y => 2,
1507 can_events => 0, 1955 can_events => 0,
1508 %arg 1956 %arg
1509 ); 1957 );
1510 1958
1511 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1962 $self->{template} = $layout;
1515 } 1963 }
1516 1964
1517 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1521 } 1969 }
1522 1970
1523 $self 1971 $self
1524} 1972}
1525 1973
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1974sub update {
1537 my ($self) = @_; 1975 my ($self) = @_;
1538 1976
1539 delete $self->{texture}; 1977 delete $self->{texture};
1540 $self->SUPER::update; 1978 $self->SUPER::update;
… …
1551 my ($self, $text) = @_; 1989 my ($self, $text) = @_;
1552 1990
1553 return if $self->{text} eq "T$text"; 1991 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1992 $self->{text} = "T$text";
1555 1993
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1994 $self->{layout}->set_text ($text);
1995
1558 delete $self->{req_h}; 1996 delete $self->{size_req};
1559
1560 $self->realloc; 1997 $self->realloc;
1561 $self->update; 1998 $self->update;
1562} 1999}
1563 2000
1564sub set_markup { 2001sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 2004 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 2005 $self->{text} = "M$markup";
1569 2006
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2007 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 2008
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 2009 $self->{layout}->set_markup ($markup);
2010
1574 delete $self->{req_h}; 2011 delete $self->{size_req};
1575
1576 $self->realloc; 2012 $self->realloc;
1577 $self->update; 2013 $self->update;
1578} 2014}
1579 2015
1580sub size_request { 2016sub size_request {
1581 my ($self) = @_; 2017 my ($self) = @_;
1582 2018
1583 if (exists $self->{req_h}) { 2019 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2020 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 2021 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2022 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2023 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2024 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 2025
1592 my ($w, $h) = $self->{layout}->size; 2026 my ($w, $h) = $self->{layout}->size;
1593 2027
1594 if (exists $self->{template}) { 2028 if (exists $self->{template}) {
1595 $self->{template}->set_font ($self->{font}) if $self->{font}; 2029 $self->{template}->set_font ($self->{font}) if $self->{font};
2030 $self->{template}->set_width ($self->{max_w} || -1);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 2032
1598 my ($w2, $h2) = $self->{template}->size; 2033 my ($w2, $h2) = $self->{template}->size;
1599 2034
1600 $w = List::Util::max $w, $w2; 2035 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 2036 $h = List::Util::max $h, $h2;
1602 } 2037 }
1603 2038
1604 ($w, $h) 2039 [$w, $h]
1605 } 2040 };
1606}
1607 2041
2042 @{ $self->{size_req} }
2043}
2044
2045sub baseline_shift {
2046 $_[0]{layout}->descent
2047}
2048
1608sub size_allocate { 2049sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 2050 my ($self, $w, $h) = @_;
1610 2051
1611 delete $self->{ox}; 2052 delete $self->{ox};
1612 2053
1613 delete $self->{texture} 2054 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2055 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2056
2057 1
1615} 2058}
1616 2059
1617sub set_fontsize { 2060sub set_fontsize {
1618 my ($self, $fontsize) = @_; 2061 my ($self, $fontsize) = @_;
1619 2062
1620 $self->{fontsize} = $fontsize; 2063 $self->{fontsize} = $fontsize;
2064 delete $self->{size_req};
1621 delete $self->{texture}; 2065 delete $self->{texture};
1622 2066
1623 $self->realloc; 2067 $self->realloc;
1624} 2068}
1625 2069
2070sub reconfigure {
2071 my ($self) = @_;
2072
2073 delete $self->{size_req};
2074 delete $self->{texture};
2075
2076 $self->SUPER::reconfigure;
2077}
2078
1626sub _draw { 2079sub _draw {
1627 my ($self) = @_; 2080 my ($self) = @_;
1628 2081
1629 $self->SUPER::_draw; # draw background, if applicable 2082 $self->SUPER::_draw; # draw background, if applicable
1630 2083
1631 my $tex = $self->{texture} ||= do { 2084 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 2085 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2086 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 2087 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2088 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2089 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2090 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 2091
1639 new_from_layout CFClient::Texture $self->{layout} 2092 [$self->{layout}->size]
1640 }; 2093 };
1641 2094
1642 unless (exists $self->{ox}) { 2095 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 2098 : ($self->{w} - $size->[0]) * 0.5);
1646 2099
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 2102 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 2103 };
1651 2104
1652 glEnable GL_TEXTURE_2D; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 2107
1655 glColor_premultiply @{$self->{fg}} 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 2109}
1662 2110
1663############################################################################# 2111#############################################################################
1664 2112
1665package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1666 2114
1667our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1668 2116
1669use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1670 2118
1671sub new { 2119sub new {
1672 my $class = shift; 2120 my $class = shift;
1673 2121
1674 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1678 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1679 can_hover => 1, 2127 can_hover => 1,
1680 can_focus => 1, 2128 can_focus => 1,
1681 valign => 0, 2129 valign => 0,
1682 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1683 #text => ... 2132 #text => ...
2133 #hidden => "*",
1684 @_ 2134 @_
1685 ) 2135 )
1686} 2136}
1687 2137
1688sub _set_text { 2138sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 2145 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 2146 $self->{text} = $text;
1697 2147
1698 $text =~ s/./*/g if $self->{hidden}; 2148 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 2149 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 2150 delete $self->{size_req};
1701 2151
1702 $self->_emit (changed => $self->{text}); 2152 $self->emit (changed => $self->{text});
1703 2153
1704 $self->realloc; 2154 $self->realloc;
1705 $self->update; 2155 $self->update;
1706} 2156}
1707 2157
… …
1722 my ($w, $h) = $self->SUPER::size_request; 2172 my ($w, $h) = $self->SUPER::size_request;
1723 2173
1724 ($w + 1, $h) # add 1 for cursor 2174 ($w + 1, $h) # add 1 for cursor
1725} 2175}
1726 2176
1727sub key_down { 2177sub invoke_key_down {
1728 my ($self, $ev) = @_; 2178 my ($self, $ev) = @_;
1729 2179
1730 my $mod = $ev->{mod}; 2180 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1733 2183
1734 my $text = $self->get_text; 2184 my $text = $self->get_text;
2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1735 2187
1736 if ($uni == 8) { 2188 if ($uni == 8) {
1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1739 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1740 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1741 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1742 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1743 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1744 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1745 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 2212 $self->emit ('escape');
1750 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 2217 } else {
1753 return 0; 2218 return 0;
1754 } 2219 }
1755 2220
1756 $self->_set_text ($text); 2221 $self->_set_text ($text);
1757 2222
1758 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1759 2225
1760 1 2226 1
1761} 2227}
1762 2228
1763sub focus_in { 2229sub invoke_focus_in {
1764 my ($self) = @_; 2230 my ($self) = @_;
1765 2231
1766 $self->{last_activity} = $::NOW; 2232 $self->{last_activity} = $::NOW;
1767 2233
1768 $self->SUPER::focus_in; 2234 $self->SUPER::invoke_focus_in
1769} 2235}
1770 2236
1771sub button_down { 2237sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 2238 my ($self, $ev, $x, $y) = @_;
1773 2239
1774 $self->SUPER::button_down ($ev, $x, $y); 2240 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 2241
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 2243
1778 # byte-index to char-index 2244 # byte-index to char-index
1779 my $text = $self->{text}; 2245 my $text = $self->{text};
1780 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1782 2248
1783 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1784 $self->update; 2250 $self->update;
1785 2251
1786 1 2252 1
1787} 2253}
1788 2254
1789sub mouse_motion { 2255sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 2256 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2257# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 2258
1793 0 2259 1
1794} 2260}
1795 2261
1796sub _draw { 2262sub _draw {
1797 my ($self) = @_; 2263 my ($self) = @_;
1798 2264
… …
1825 utf8::encode $text; 2291 utf8::encode $text;
1826 2292
1827 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1828 } 2294 }
1829 2295
1830 glColor @{$self->{fg}};
1831 glBegin GL_LINES; 2296 glBegin GL_LINES;
1832 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1834 glEnd; 2299 glEnd;
1835 } 2300 }
1836} 2301}
1837 2302
2303#############################################################################
2304
1838package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1839 2306
1840our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1841 2308
1842use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1843 2310
1844sub key_down { 2311sub invoke_key_down {
1845 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1846 2313
1847 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1848 2315
1849 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1850 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
2319
1852 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 2322 $self->emit (activate => $txt);
1855 $self->update; 2323 $self->update;
1856 2324
1857 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1860 } 2328 }
1861 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 2333 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 2335 }
1868 2336
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 2340
1873 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 2343 } else {
1876 $self->set_text ($self->{history_saveback}); 2344 $self->set_text ($self->{history_saveback});
1877 } 2345 }
1878 2346
1879 } else { 2347 } else {
1880 return $self->SUPER::key_down ($ev) 2348 return $self->SUPER::invoke_key_down ($ev)
1881 } 2349 }
1882 2350
1883 1 2351 1
1884} 2352}
1885 2353
1886############################################################################# 2354#############################################################################
1887 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1888package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1889 2396
1890our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1891 2398
1892use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1893 2400
1894my @tex = 2401my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1897 2404
1898sub new { 2405sub new {
1899 my $class = shift; 2406 my $class = shift;
1900 2407
1901 $class->SUPER::new ( 2408 $class->SUPER::new (
1902 padding_x => 4, 2409 padding_x => 4,
1903 padding_y => 4, 2410 padding_y => 4,
1904 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1905 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1906 can_hover => 1, 2413 can_hover => 1,
1907 align => 0, 2414 align => 0,
1908 valign => 0, 2415 valign => 0,
1909 can_events => 1, 2416 can_events => 1,
1910 @_ 2417 @_
1911 ) 2418 )
1912} 2419}
1913 2420
1914sub activate { }
1915
1916sub button_up { 2421sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2422 my ($self, $ev, $x, $y) = @_;
1918 2423
1919 $self->emit ("activate") 2424 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2425 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2426 && $y >= 0 && $y < $self->{h};
… …
1930 2435
1931 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1933 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1934 2439
2440 my $tex = $tex[$GRAB == $self];
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 2442
1937 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1938 2444
1939 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1940} 2446}
1941 2447
1942############################################################################# 2448#############################################################################
1943 2449
1944package CFClient::UI::CheckBox; 2450package CFPlus::UI::CheckBox;
1945 2451
1946our @ISA = CFClient::UI::DrawBG::; 2452our @ISA = CFPlus::UI::DrawBG::;
1947 2453
1948my @tex = 2454my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2457
1952use CFClient::OpenGL; 2458use CFPlus::OpenGL;
1953 2459
1954sub new { 2460sub new {
1955 my $class = shift; 2461 my $class = shift;
1956 2462
1957 $class->SUPER::new ( 2463 $class->SUPER::new (
… …
1971 my ($self) = @_; 2477 my ($self) = @_;
1972 2478
1973 (6) x 2 2479 (6) x 2
1974} 2480}
1975 2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
1976sub button_down { 2490sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2491 my ($self, $ev, $x, $y) = @_;
1978 2492
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2495 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2496 } else {
1984 return 0 2497 return 0
1985 } 2498 }
1986 2499
1987 1 2500 1
… …
2007 glDisable GL_TEXTURE_2D; 2520 glDisable GL_TEXTURE_2D;
2008} 2521}
2009 2522
2010############################################################################# 2523#############################################################################
2011 2524
2012package CFClient::UI::Image; 2525package CFPlus::UI::Image;
2013 2526
2014our @ISA = CFClient::UI::Base::; 2527our @ISA = CFPlus::UI::Base::;
2015 2528
2016use CFClient::OpenGL; 2529use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2530
2019our %loaded_images; 2531our %texture_cache;
2020 2532
2021sub new { 2533sub new {
2022 my $class = shift; 2534 my $class = shift;
2023 2535
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2025 2540
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2027 2543
2028 $loaded_images{$self->{image}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2030 2546
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
2032 2548
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2550
2037 $self 2551 $self
2038} 2552}
2039 2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2040sub size_request { 2569sub size_request {
2041 my ($self) = @_; 2570 my ($self) = @_;
2042 2571
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2572 ($self->{tex}{w}, $self->{tex}{h})
2044} 2573}
2045 2574
2046sub _draw { 2575sub _draw {
2047 my ($self) = @_; 2576 my ($self) = @_;
2048 2577
… …
2058 } 2587 }
2059 2588
2060 glEnable GL_TEXTURE_2D; 2589 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2591
2063 $tex->draw_quad_alpha (0, 0, $w, $h); 2592 $tex->draw_quad (0, 0, $w, $h);
2064 2593
2065 glDisable GL_TEXTURE_2D; 2594 glDisable GL_TEXTURE_2D;
2066} 2595}
2067 2596
2068############################################################################# 2597#############################################################################
2069 2598
2599package CFPlus::UI::ImageButton;
2600
2601our @ISA = CFPlus::UI::Image::;
2602
2603use CFPlus::OpenGL;
2604
2605my %textures;
2606
2607sub new {
2608 my $class = shift;
2609
2610 my $self = $class->SUPER::new (
2611 padding_x => 4,
2612 padding_y => 4,
2613 fg => [1, 1, 1],
2614 active_fg => [0, 0, 1],
2615 can_hover => 1,
2616 align => 0,
2617 valign => 0,
2618 can_events => 1,
2619 @_
2620 );
2621}
2622
2623sub invoke_button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 $self->emit ("activate")
2627 if $x >= 0 && $x < $self->{w}
2628 && $y >= 0 && $y < $self->{h};
2629
2630 1
2631}
2632
2633#############################################################################
2634
2070package CFClient::UI::VGauge; 2635package CFPlus::UI::VGauge;
2071 2636
2072our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2073 2638
2074use List::Util qw(min max); 2639use List::Util qw(min max);
2075 2640
2076use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2077 2642
2078my %tex = ( 2643my %tex = (
2079 food => [ 2644 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2647 ],
2083 grace => [ 2648 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2086 ], 2651 ],
2087 hp => [ 2652 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2655 ],
2091 mana => [ 2656 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2094 ], 2659 ],
2095); 2660);
2096 2661
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2722 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2723 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2724
2160 my $h1 = $self->{h} * (1 - $ycut1); 2725 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2726 my $h2 = $self->{h} * (1 - $ycut2);
2727 my $h3 = $self->{h};
2728
2729 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2730
2163 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2732 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2734 glEnable GL_TEXTURE_2D;
… …
2185 2753
2186 if ($t3) { 2754 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2755 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2756 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2758 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2761 glEnd;
2194 } 2762 }
2195 2763
2196 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2198} 2766}
2199 2767
2200############################################################################# 2768#############################################################################
2201 2769
2202package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2203 2771
2204our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2205 2773
2206sub new { 2774sub new {
2207 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2208 2776
2209 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2779 can_hover => 1,
2212 can_events => 1, 2780 can_events => 1,
2213 %arg, 2781 %arg,
2214 ); 2782 );
2215 2783
2216 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2217 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2218 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2219 2787
2220 $self 2788 $self
2221} 2789}
2222 2790
2223sub set_fontsize { 2791sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2245} 2813}
2246 2814
2247############################################################################# 2815#############################################################################
2248 2816
2249package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2250 2818
2251use strict; 2819use strict;
2252 2820
2253use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2254 2822
2255our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2256 2824
2257my @tex = 2825my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2260 2828
2261sub new { 2829sub new {
2262 my $class = shift; 2830 my $class = shift;
2263 2831
… …
2284 $self->update; 2852 $self->update;
2285 2853
2286 $self 2854 $self
2287} 2855}
2288 2856
2289sub changed { }
2290
2291sub set_range { 2857sub set_range {
2292 my ($self, $range) = @_; 2858 my ($self, $range) = @_;
2293 2859
2294 ($range, $self->{range}) = ($self->{range}, $range); 2860 ($range, $self->{range}) = ($self->{range}, $range);
2295 2861
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2862 if ("@$range" ne "@{$self->{range}}") {
2863 $self->update;
2864 $self->set_value ($self->{range}[0]);
2865 }
2298} 2866}
2299 2867
2300sub set_value { 2868sub set_value {
2301 my ($self, $value) = @_; 2869 my ($self, $value) = @_;
2302 2870
… …
2313 if $unit; 2881 if $unit;
2314 2882
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2883 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2884
2317 if ($value != $old_value) { 2885 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2886 $self->emit (changed => $value);
2319 $self->update; 2887 $self->update;
2320 } 2888 }
2321} 2889}
2322 2890
2323sub size_request { 2891sub size_request {
2324 my ($self) = @_; 2892 my ($self) = @_;
2325 2893
2326 ($self->{req_w}, $self->{req_h}) 2894 ($self->{req_w}, $self->{req_h})
2327} 2895}
2328 2896
2329sub button_down { 2897sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2898 my ($self, $ev, $x, $y) = @_;
2331 2899
2332 $self->SUPER::button_down ($ev, $x, $y); 2900 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2901
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2903
2336 $self->mouse_motion ($ev, $x, $y) 2904 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2905}
2338 2906
2339sub mouse_motion { 2907sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2908 my ($self, $ev, $x, $y) = @_;
2341 2909
2342 if ($GRAB == $self) { 2910 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2911 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2912
… …
2350 } else { 2918 } else {
2351 return 0; 2919 return 0;
2352 } 2920 }
2353 2921
2354 1 2922 1
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933
2934 ! ! $delta
2355} 2935}
2356 2936
2357sub update { 2937sub update {
2358 my ($self) = @_; 2938 my ($self) = @_;
2359 2939
… …
2408 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2409} 2989}
2410 2990
2411############################################################################# 2991#############################################################################
2412 2992
2413package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2414 2994
2415our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2416 2996
2417sub new { 2997sub new {
2418 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2419 2999
2420 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2421 3001
2422 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 3005 to_value => sub { shift },
2426 from_value => sub { shift }, 3006 from_value => sub { shift },
2427 %arg, 3007 %arg,
2428 ); 3008 );
2429 3009
… …
2449sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2451 3031
2452############################################################################# 3032#############################################################################
2453 3033
2454package CFClient::UI::TextView; 3034package CFPlus::UI::TextScroller;
2455 3035
2456our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2457 3037
2458use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2459 3039
2460sub new { 3040sub new {
2461 my $class = shift; 3041 my $class = shift;
2462 3042
2463 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2464 fontsize => 1, 3044 fontsize => 1,
2465 can_events => 0, 3045 can_events => 1,
3046 indent => 0,
2466 #font => default_font 3047 #font => default_font
2467 @_, 3048 @_,
2468 3049
2469 layout => (new CFClient::Layout 1), 3050 layout => (new CFPlus::Layout),
2470 par => [], 3051 par => [],
3052 max_par => 0,
2471 height => 0, 3053 height => 0,
2472 children => [ 3054 children => [
2473 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2475 ], 3057 ],
2476 ); 3058 );
2477 3059
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2479 3061
… …
2485 3067
2486 $self->{fontsize} = $fontsize; 3068 $self->{fontsize} = $fontsize;
2487 $self->reflow; 3069 $self->reflow;
2488} 3070}
2489 3071
3072sub size_request {
3073 my ($self) = @_;
3074
3075 my ($empty, $slider) = @{ $self->{children} };
3076
3077 local $self->{children} = [$empty, $slider];
3078 $self->SUPER::size_request
3079}
3080
2490sub size_allocate { 3081sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 3082 my ($self, $w, $h) = @_;
2492 3083
2493 $self->SUPER::size_allocate ($w, $h); 3084 my ($empty, $slider, @other) = @{ $self->{children} };
3085 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 3086
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3087 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3088 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 3089 $self->{layout}->set_width ($empty->{w});
3090 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 3091
2499 $self->reflow; 3092 $self->reflow;
2500}
2501 3093
2502sub text_size { 3094 local $self->{children} = [$empty, $slider];
3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
2503 my ($self, $text, $indent) = @_; 3099 my ($self, $ev) = @_;
3100
3101 return 0 unless $ev->{dy}; # only vertical movements
3102
3103 $self->{children}[1]->emit (mouse_wheel => $ev);
3104
3105 1
3106}
3107
3108sub get_layout {
3109 my ($self, $para) = @_;
2504 3110
2505 my $layout = $self->{layout}; 3111 my $layout = $self->{layout};
2506 3112
3113 $layout->set_font ($self->{font}) if $self->{font};
3114 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3115 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 3116 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3117 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 3118 $layout->set_markup ($para->{markup});
3119
3120 $layout->set_shapes (
3121 map
3122 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3123 @{$para->{widget}}
2510 3124 );
3125
2511 $layout->size 3126 $layout
2512} 3127}
2513 3128
2514sub reflow { 3129sub reflow {
2515 my ($self) = @_; 3130 my ($self) = @_;
2516 3131
… …
2523 3138
2524 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2526} 3141}
2527 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2528sub clear { 3158sub clear {
2529 my ($self) = @_; 3159 my ($self) = @_;
3160
3161 my (undef, undef, @other) = @{ $self->{children} };
3162 $self->remove ($_) for @other;
2530 3163
2531 $self->{par} = []; 3164 $self->{par} = [];
2532 $self->{height} = 0; 3165 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 3167}
2535 3168
2536sub add_paragraph { 3169sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 3170 my $self = shift;
2538 3171
2539 for my $line (split /\n/, $text) { 3172 for my $para (@_) {
2540 my ($w, $h) = $self->text_size ($line); 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
3179 w => 1e10,
3180 wrapped => 1,
3181 };
3182
3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
3190
3191 $self->{need_reflow}++;
3192 $self->update;
3193}
3194
3195sub scroll_to_bottom {
3196 my ($self) = @_;
3197
3198 $self->{scroll_to} = $#{$self->{par}};
3199 $self->update;
3200}
3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
2541 $self->{height} += $h; 3224 $self->{height} = $height;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2543 }
2544 3226
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
2546} 3233}
2547 3234
2548sub update { 3235sub update {
2549 my ($self) = @_; 3236 my ($self) = @_;
2550 3237
… …
2552 3239
2553 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2554 3241
2555 delete $self->{texture}; 3242 delete $self->{texture};
2556 3243
2557 $ROOT->on_post_alloc ($self, sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 3248
2560 if (delete $self->{need_reflow}) {
2561 my $height = 0;
2562
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2578
2579 $self->{height} = $height;
2580
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582
2583 delete $self->{texture};
2584 }
2585
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2589 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2590 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2591 3262
2592 my $y0 = $top; 3263 my $y0 = $top;
2593 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2594 3265
2595 my $y = 0;
2596
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2607 3269
2608 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 3271 my $layout = $self->get_layout ($para);
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 3272
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3273 $layout->render ($para->{indent}, $y - $y0);
2614 3274
2615 glRasterPos $par->[3], $y - $y0; 3275 if (my @w = @{ $para->{widget} }) {
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3276 my @s = $layout->get_shapes;
3277
3278 for (@w) {
3279 my ($dx, $dy) = splice @s, 0, 2, ();
3280
3281 $_->{x} = $dx + $para->{indent};
3282 $_->{y} = $dy + $y - $y0;
3283
3284 $_->draw;
3285 }
3286 }
2617 } 3287 }
2618 3288
2619 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2620 } 3291 }
2621 3292
2622 glDisable GL_BLEND; 3293 $self->{top_paragraph} = $top_paragraph;
2623 }; 3294 };
2624 }); 3295 });
3296}
3297
3298sub reconfigure {
3299 my ($self) = @_;
3300
3301 $self->SUPER::reconfigure;
3302
3303 $_->{w} = 1e10 for @{ $self->{par} };
3304 $self->reflow;
2625} 3305}
2626 3306
2627sub _draw { 3307sub _draw {
2628 my ($self) = @_; 3308 my ($self) = @_;
2629 3309
… …
2632 glColor 0, 0, 0, 1; 3312 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3313 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 3314 glDisable GL_TEXTURE_2D;
2635 3315
2636 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2637
2638} 3317}
2639 3318
2640############################################################################# 3319#############################################################################
2641 3320
2642package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2643 3322
2644use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2645 3324
2646our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2647 3326
2648sub moveto { 3327sub moveto {
2649 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2650 3329
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 3358 glPopMatrix;
2680} 3359}
2681 3360
2682############################################################################# 3361#############################################################################
2683 3362
2684package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2685 3364
2686our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2687 3366
2688sub new { 3367sub new {
2689 my $class = shift; 3368 my $class = shift;
2690 3369
2691 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2704} 3383}
2705 3384
2706############################################################################# 3385#############################################################################
2707 3386
2708package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2709 3388
2710our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2711 3390
2712use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2713 3392
2714sub new { 3393sub new {
2715 my $class = shift; 3394 my $class = shift;
2716 3395
2717 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2720 ) 3399 )
2721} 3400}
2722 3401
2723sub set_tooltip_from { 3402sub set_tooltip_from {
2724 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2725 3407
2726 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2727 3409
2728 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3412 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 3413 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 3414 . "visible $widget->{visible}";
2733 } 3415 }
2734 3416
3417 $tooltip =~ s/^\n+//;
3418 $tooltip =~ s/\n+$//;
3419
2735 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 3421 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 3423 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2740 ellipsise => 0, 3425 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 ); 3427 );
2743} 3428}
2744 3429
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3433 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3434
2750 ($w + 4, $h + 4) 3435 ($w + 4, $h + 4)
2751} 3436}
2752 3437
2753sub size_allocate { 3438sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3439 my ($self, $w, $h) = @_;
2755 3440
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3441 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3442}
2758 3443
2759sub visibility_change { 3444sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3445 my ($self, $visible) = @_;
2761 3446
2762 return unless $visible; 3447 return unless $visible;
2763 3448
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2766 or return; 3451 or return;
2767 3452
3453 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3455
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3457 if $x + $self->{w} > $self->{root}{w};
2772 3458
2773 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2774 }); 3463 });
2775} 3464}
2776 3465
2777sub _draw { 3466sub _draw {
2778 my ($self) = @_; 3467 my ($self) = @_;
… …
2802 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2803} 3492}
2804 3493
2805############################################################################# 3494#############################################################################
2806 3495
2807package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2808 3497
2809our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2810 3499
2811use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2812 3501
2813sub new { 3502sub new {
2814 my $class = shift; 3503 my $class = shift;
2815 3504
2816 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2817 aspect => 1, 3508 aspect => 1,
2818 can_events => 0, 3509 can_events => 0,
2819 @_, 3510 @_,
2820 ); 3511 );
2821 3512
2822 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2824 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2825 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1, 3519 parked => 1,
2828 interval => $self->{animspeed},
2829 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2830 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2831 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2832 }, 3528 },
2833 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2834 } 3533 }
2835 3534
2836 $self 3535 $self
2837} 3536}
2838 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
2839sub size_request { 3568sub size_request {
2840 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
2841} 3584}
2842 3585
2843sub update { 3586sub update {
2844 my ($self) = @_; 3587 my ($self) = @_;
2845 3588
2846 return unless $self->{visible}; 3589 return unless $self->{visible};
2847 3590
2848 $self->SUPER::update; 3591 $self->SUPER::update;
2849} 3592}
2850 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
2851sub _draw { 3602sub _draw {
2852 my ($self) = @_; 3603 my ($self) = @_;
2853 3604
2854 return unless $::CONN; 3605 return unless $::CONN;
2855 3606
2856 my $face; 3607 $self->SUPER::_draw;
2857 3608
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
2860 3610 or return;
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864 3611
2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
2866 3613
2867 if ($tex) { 3614 if ($tex) {
2868 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2870 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3619 glDisable GL_TEXTURE_2D;
2873 } 3620 }
2874} 3621}
2875 3622
2876sub DESTROY { 3623sub destroy {
2877 my ($self) = @_; 3624 my ($self) = @_;
2878 3625
2879 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
2880 if $self->{timer}; 3627 if $self->{timer};
2881 3628
2882 $self->SUPER::DESTROY; 3629 $self->SUPER::destroy;
2883} 3630}
2884 3631
2885############################################################################# 3632#############################################################################
2886 3633
2887package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
2888 3635
2889our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
2890 3637
2891# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
2892 3639
2893############################################################################# 3640#############################################################################
2894 3641
2895package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
2896 3643
2897our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
2898 3645
2899use CFClient::OpenGL; 3646use CFPlus::OpenGL;
2900 3647
2901sub new { 3648sub new {
2902 my $class = shift; 3649 my $class = shift;
2903 3650
2904 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
2905 items => [], 3652 items => [],
2906 z => 100, 3653 z => 100,
2907 @_, 3654 @_,
2908 ); 3655 );
2909 3656
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3658
2912 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
2914 3661
2915 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
2916 if (!ref $widget) { 3663 if (!ref $widget) {
3664 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2;
3666
2917 $widget = new CFClient::UI::Label 3667 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3668 can_hover => 1,
2919 can_events => 1, 3669 can_events => 1,
3670 tooltip => $tooltip,
3671 children => [
3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3673 (new CFPlus::UI::Label markup => $right, align => +1),
3674 ],
3675 ;
3676
3677 } else {
3678 $widget = new CFPlus::UI::Label
3679 can_hover => 1,
3680 can_events => 1,
2920 text => $widget; 3681 markup => $widget,
3682 tooltip => $tooltip;
3683 }
2921 } 3684 }
2922 3685
2923 $self->{item}{$widget} = $item; 3686 $self->{item}{$widget} = $item;
2924 3687
2925 $self->{vbox}->add ($widget); 3688 $self->{vbox}->add ($widget);
… …
2930 3693
2931# popup given the event (must be a mouse button down event currently) 3694# popup given the event (must be a mouse button down event currently)
2932sub popup { 3695sub popup {
2933 my ($self, $ev) = @_; 3696 my ($self, $ev) = @_;
2934 3697
2935 $self->_emit ("popdown"); 3698 $self->emit ("popdown");
2936 3699
2937 # maybe save $GRAB? must be careful about events... 3700 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3701 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3702 $self->{button} = $ev->{button};
2940 3703
2941 $self->show; 3704 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3705 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3706}
2944 3707
2945sub mouse_motion { 3708sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3709 my ($self, $ev, $x, $y) = @_;
2947 3710
2948 # TODO: should use vbox->find_widget or so 3711 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3712 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3713 $self->{hover} = $self->{item}{$HOVER};
2951 3714
2952 0 3715 0
2953} 3716}
2954 3717
2955sub button_up { 3718sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3719 my ($self, $ev, $x, $y) = @_;
2957 3720
2958 if ($ev->{button} == $self->{button}) { 3721 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3722 undef $GRAB;
2960 $self->hide; 3723 $self->hide;
2961 3724
2962 $self->_emit ("popdown"); 3725 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3726 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3727 } else {
2965 return 0 3728 return 0
2966 } 3729 }
2967 3730
2968 1 3731 1
2969} 3732}
2970 3733
2971############################################################################# 3734#############################################################################
2972 3735
2973package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
2974 3737
2975our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
2976 3739
2977sub new { 3740sub new {
2978 my $class = shift; 3741 my $class = shift;
2979 3742
2980 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
2994 3757
2995 $self->{current} = $self->{children}[0] 3758 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3759 if @{ $self->{children} };
2997} 3760}
2998 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{current}
3766}
3767
2999sub set_current_page { 3768sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3769 my ($self, $page_or_widget) = @_;
3001 3770
3002 my $widget = ref $page_or_widget 3771 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3772 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3773 : $self->{children}[$page_or_widget];
3005 3774
3006 $self->{current} = $widget; 3775 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3776 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3777
3009 $self->_emit (page_changed => $self->{current}); 3778 $self->emit (page_changed => $self->{current});
3010 3779
3011 $self->realloc; 3780 $self->realloc;
3012} 3781}
3013 3782
3014sub visible_children { 3783sub visible_children {
… …
3019 my ($self) = @_; 3788 my ($self) = @_;
3020 3789
3021 $self->{current}->size_request 3790 $self->{current}->size_request
3022} 3791}
3023 3792
3024sub size_allocate { 3793sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
3026 3795
3027 $self->{current}->configure (0, 0, $w, $h); 3796 $self->{current}->configure (0, 0, $w, $h);
3797
3798 1
3028} 3799}
3029 3800
3030sub _draw { 3801sub _draw {
3031 my ($self) = @_; 3802 my ($self) = @_;
3032 3803
3033 $self->{current}->draw; 3804 $self->{current}->draw;
3034} 3805}
3035 3806
3036############################################################################# 3807#############################################################################
3037 3808
3038package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3039 3810
3040our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3041 3812
3042sub new { 3813sub new {
3043 my $class = shift; 3814 my $class = shift;
3044 3815
3045 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3049 @_, 3820 @_,
3050 ); 3821 );
3051 3822
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3056} 3827}
3057 3828
3058sub add { 3829sub add {
3059 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3060 3831
3061 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3062 3833
3063 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3064 markup => $title, 3835 markup => $title,
3065 tooltip => $tooltip, 3836 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3067 ); 3838 );
3068 3839
3069 $self->{multiplexer}->add ($widget); 3840 $self->{multiplexer}->add ($widget);
3070} 3841}
3071 3842
3843sub get_current_page {
3844 my ($self) = @_;
3845
3846 $self->{multiplexer}->get_current_page
3847}
3848
3072sub set_current_page { 3849sub set_current_page {
3073 my ($self, $page) = @_; 3850 my ($self, $page) = @_;
3074 3851
3075 $self->{multiplexer}->set_current_page ($page); 3852 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3077} 3854}
3078 3855
3079############################################################################# 3856#############################################################################
3080 3857
3858package CFPlus::UI::Selector;
3859
3860use utf8;
3861
3862our @ISA = CFPlus::UI::Button::;
3863
3864sub new {
3865 my $class = shift;
3866
3867 my $self = $class->SUPER::new (
3868 options => [], # [value, title, longdesc], ...
3869 value => undef,
3870 @_,
3871 );
3872
3873 $self->_set_value ($self->{value});
3874
3875 $self
3876}
3877
3878sub invoke_button_down {
3879 my ($self, $ev) = @_;
3880
3881 my @menu_items;
3882
3883 for (@{ $self->{options} }) {
3884 my ($value, $title, $tooltip) = @$_;
3885
3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3887 }
3888
3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3890}
3891
3892sub _set_value {
3893 my ($self, $value) = @_;
3894
3895 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3896 or return;
3897
3898 $self->{value} = $item->[0];
3899 $self->set_markup ("$item->[1] ⇓");
3900 $self->set_tooltip ($item->[2]);
3901}
3902
3903sub set_value {
3904 my ($self, $value) = @_;
3905
3906 return unless $self->{value} ne $value;
3907
3908 $self->_set_value ($value);
3909 $self->emit (changed => $value);
3910}
3911
3912#############################################################################
3913
3081package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3082 3915
3083our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3084 3917
3085sub new { 3918sub new {
3086 my $class = shift; 3919 my $class = shift;
3087 3920
3088 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3089 fontsize => 0.8, 3922 fontsize => 0.8,
3090 @_, 3923 @_,
3091 ); 3924 );
3092 3925
3093 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3094 3927
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096 3929
3097 $self 3930 $self
3098} 3931}
… …
3100sub reorder { 3933sub reorder {
3101 my ($self) = @_; 3934 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3103 3936
3104 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3108 3941
3109 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 3944 }
… …
3132 for ($short) { 3965 for ($short) {
3133 s/^\s+//; 3966 s/^\s+//;
3134 s/\s+/ /g; 3967 s/\s+/ /g;
3135 } 3968 }
3136 3969
3137 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3138 markup => $short, 3971 markup => $short,
3139 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3180 $item->{count}++; 4013 $item->{count}++;
3181 } else { 4014 } else {
3182 $item->{count} = 1; 4015 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 4016 $item->{text} = $item->{tooltip} = $text;
3184 } 4017 }
3185 $item->{id} = ++$self->{id}; 4018 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 4019 $item->{timeout} = $timeout;
3187 delete $item->{label}; 4020 delete $item->{label};
3188 } else { 4021 } else {
3189 $self->{item}{$group} = { 4022 $self->{item}{$group} = {
3190 id => ++$self->{id}, 4023 id => ++$self->{id},
… …
3196 count => 1, 4029 count => 1,
3197 %arg, 4030 %arg,
3198 }; 4031 };
3199 } 4032 }
3200 4033
4034 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 4035 $self->reorder;
4036 });
3202} 4037}
3203 4038
3204sub reconfigure { 4039sub reconfigure {
3205 my ($self) = @_; 4040 my ($self) = @_;
3206 4041
… …
3209 4044
3210 $self->reorder; 4045 $self->reorder;
3211 $self->SUPER::reconfigure; 4046 $self->SUPER::reconfigure;
3212} 4047}
3213 4048
3214sub DESTROY { 4049sub destroy {
3215 my ($self) = @_; 4050 my ($self) = @_;
3216 4051
3217 $self->{timer}->cancel; 4052 $self->{timer}->cancel;
3218 4053
3219 $self->SUPER::DESTROY; 4054 $self->SUPER::destroy;
3220} 4055}
3221 4056
3222############################################################################# 4057#############################################################################
3223 4058
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3520 4060
3521our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3522 4062
3523use List::Util qw(min max); 4063use List::Util qw(min max);
3524 4064
3525use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3526 4066
3527sub new { 4067sub new {
3528 my $class = shift; 4068 my $class = shift;
3529 4069
3530 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3531 visible => 1, 4071 visible => 1,
3532 @_, 4072 @_,
3533 ); 4073 );
3534 4074
3535 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3536 4076
3537 $self 4077 $self
3538} 4078}
3539 4079
3540sub size_request { 4080sub size_request {
… …
3555 $coord = $max - $size if $coord > $max - $size; 4095 $coord = $max - $size if $coord > $max - $size;
3556 4096
3557 int $coord + 0.5 4097 int $coord + 0.5
3558} 4098}
3559 4099
3560sub size_allocate { 4100sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 4101 my ($self, $w, $h) = @_;
3562 4102
3563 for my $child ($self->children) { 4103 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4104 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 4105
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 4109 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 4110 $Y = _to_pixel $Y, $H, $self->{h};
3571 4111
3572 $child->configure ($X, $Y, $W, $H); 4112 $child->configure ($X, $Y, $W, $H);
3573 } 4113 }
4114
4115 1
3574} 4116}
3575 4117
3576sub coord2local { 4118sub coord2local {
3577 my ($self, $x, $y) = @_; 4119 my ($self, $x, $y) = @_;
3578 4120
… …
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 4247
3706 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3708 4250
4251 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h;
4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259
3709 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
3711 4262
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w}; 4264 $widget->{old_w} = $widget->{w};
… …
3723 4274
3724 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3725 $_->() 4276 $_->()
3726 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3727 } 4278 }
3728
3729 4279
3730 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3732 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3733 4283
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 4288 glLoadIdentity;
3739 4289
3740 { 4290 {
3741 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3742 4292
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3745 }
3746 4295
3747 $self->_draw; 4296 $self->_draw;
4297 }
3748} 4298}
3749 4299
3750############################################################################# 4300#############################################################################
3751 4301
3752package CFClient::UI; 4302package CFPlus::UI;
3753 4303
3754$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4306
37571 43071
3758 4308

Diff Legend

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