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

Diff Legend

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