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

Diff Legend

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