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

Diff Legend

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