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

Diff Legend

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