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.276 by root, Sun Jun 4 00:16:01 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
… …
1160 my $dy = $ev->{y} - $oy; 1398 my $dy = $ev->{y} - $oy;
1161 1399
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1400 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1401 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1402
1403 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1404 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1405 };
1168 1406
1169 } elsif ($lr ^ $td) { 1407 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1408 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1409 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1412 my ($ev, $x, $y) = @_;
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);
1417 # HACK: the next line is required to enforce placement
1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1419 };
1180 } else { 1420 } else {
1181 return 0; 1421 return 0;
1182 } 1422 }
1183 1423
1184 1 1424 1
1185} 1425}
1186 1426
1187sub button_up { 1427sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1189 1429
1190 !!delete $self->{motion} 1430 ! ! delete $self->{motion}
1191} 1431}
1192 1432
1193sub mouse_motion { 1433sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1195 1435
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1437
1198 !!$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
1199} 1447}
1200 1448
1201sub _draw { 1449sub _draw {
1202 my ($self) = @_; 1450 my ($self) = @_;
1203 1451
… …
1229 1477
1230 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
1231 1479
1232 $child->draw; 1480 $child->draw;
1233 1481
1234 if ($self->{title}) { 1482 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1483 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1237 } 1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1238} 1491}
1239 1492
1240############################################################################# 1493#############################################################################
1241 1494
1242package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1243 1496
1244our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1245 1498
1246use List::Util qw(max sum); 1499use List::Util qw(max sum);
1247 1500
1248use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1249 1502
1250sub new { 1503sub new {
1251 my $class = shift; 1504 my $class = shift;
1252 1505
1253 $class->SUPER::new ( 1506 $class->SUPER::new (
1254 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1255 @_, 1509 @_,
1256 ) 1510 )
1257} 1511}
1258 1512
1259sub children { 1513sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1261} 1515}
1262 1516
1263sub add { 1517sub add {
1264 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1265 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1266 $child->set_parent ($self); 1522 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1268 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1269 $self->realloc; 1528 $self->realloc;
1529}
1530
1531sub remove {
1532 my ($self, $child) = @_;
1533
1534 # TODO: not yet implemented
1270} 1535}
1271 1536
1272# 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?
1273sub clear { 1538sub clear {
1274 my ($self) = @_; 1539 my ($self) = @_;
… …
1315 (sum @$ws), 1580 (sum @$ws),
1316 (sum @$hs), 1581 (sum @$hs),
1317 ) 1582 )
1318} 1583}
1319 1584
1320sub size_allocate { 1585sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1322 1587
1323 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1324 1589
1325 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1326 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1327 1592
1328 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1329 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1330 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1331 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1332 1597
1333 # linearly scale sizes
1334 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1335 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1336 1599
1337 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
1338 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1339 1609
1340 my $y; 1610 my $y;
1341 1611
1342 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1343 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1357 } 1627 }
1358 1628
1359 $y += $row_h; 1629 $y += $row_h;
1360 } 1630 }
1361 1631
1632 1
1362} 1633}
1363 1634
1364sub find_widget { 1635sub find_widget {
1365 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1366 1637
… …
1385 } 1656 }
1386} 1657}
1387 1658
1388############################################################################# 1659#############################################################################
1389 1660
1390package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1391 1662
1392our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1393 1664
1394sub size_request { 1665sub size_request {
1395 my ($self) = @_; 1666 my ($self) = @_;
1396 1667
1397 $self->{vertical} 1668 $self->{vertical}
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1676 )
1406} 1677}
1407 1678
1408sub size_allocate { 1679sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1410 1681
1411 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1413 1684
1414 my @req; 1685 my @req;
1415 1686
1416 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1418 } else { 1689 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1421 1692
1422 if ($req > $space) { 1693 if ($req > $space) {
1423 # ah well, not enough space 1694 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1425 } else { 1696 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1698
1428 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1429 1700
1430 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1702 for 0 .. $#children;
1432 } 1703 }
1433 } 1704 }
1434 1705
1435 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1436 1707
1437 my $pos = 0; 1708 my $pos = 0;
1438 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1440 $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));
1441 1712
1442 $pos += $alloc; 1713 $pos += $alloc;
1443 } 1714 }
1444 1715
1445 1 1716 1
1446} 1717}
1447 1718
1448############################################################################# 1719#############################################################################
1449 1720
1450package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1451 1722
1452our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1453 1724
1454sub new { 1725sub new {
1455 my $class = shift; 1726 my $class = shift;
1456 1727
1457 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1460 ) 1731 )
1461} 1732}
1462 1733
1463############################################################################# 1734#############################################################################
1464 1735
1465package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1466 1737
1467our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1468 1739
1469sub new { 1740sub new {
1470 my $class = shift; 1741 my $class = shift;
1471 1742
1472 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1475 ) 1746 )
1476} 1747}
1477 1748
1478############################################################################# 1749#############################################################################
1479 1750
1480package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1481 1752
1482our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1483 1754
1484use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1485 1756
1486sub new { 1757sub new {
1487 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1488 1759
1489 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1492 #active_bg => none 1763 #active_bg => none
1493 #font => default_font 1764 #font => default_font
1494 #text => initial text 1765 #text => initial text
1495 #markup => initial narkup 1766 #markup => initial narkup
1496 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1497 ellipsise => 3, # end 1769 ellipsise => 3, # end
1498 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1499 fontsize => 1, 1771 fontsize => 1,
1500 align => -1, 1772 align => -1,
1501 valign => -1, 1773 valign => -1,
1502 padding_x => 2, 1774 padding_x => 2,
1503 padding_y => 2, 1775 padding_y => 2,
1504 can_events => 0, 1776 can_events => 0,
1505 %arg 1777 %arg
1506 ); 1778 );
1507 1779
1508 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1509 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1510 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1511 $self->{template} = $layout; 1783 $self->{template} = $layout;
1512 } 1784 }
1513 1785
1514 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1518 } 1790 }
1519 1791
1520 $self 1792 $self
1521} 1793}
1522 1794
1523sub escape($) {
1524 local $_ = $_[0];
1525
1526 s/&/&amp;/g;
1527 s/>/&gt;/g;
1528 s/</&lt;/g;
1529
1530 $_
1531}
1532
1533sub update { 1795sub update {
1534 my ($self) = @_; 1796 my ($self) = @_;
1535 1797
1536 delete $self->{texture}; 1798 delete $self->{texture};
1537 $self->SUPER::update; 1799 $self->SUPER::update;
1538} 1800}
1539 1801
1802sub realloc {
1803 my ($self) = @_;
1804
1805 delete $self->{ox};
1806 $self->SUPER::realloc;
1807}
1808
1540sub set_text { 1809sub set_text {
1541 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1542 1811
1543 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1545 1814
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1548 1816
1817 delete $self->{size_req};
1549 $self->realloc; 1818 $self->realloc;
1550 $self->update; 1819 $self->update;
1551} 1820}
1552 1821
1553sub set_markup { 1822sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1558 1827
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1829
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1563 1831
1832 delete $self->{size_req};
1564 $self->realloc; 1833 $self->realloc;
1565 $self->update; 1834 $self->update;
1566} 1835}
1567 1836
1568sub size_request { 1837sub size_request {
1569 my ($self) = @_; 1838 my ($self) = @_;
1570 1839
1840 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1842 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1843 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1846
1577 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1578 1848
1579 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1580 $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);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1853
1583 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1584 1855
1585 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1858 }
1859
1860 [$w, $h]
1587 } 1861 };
1588 1862
1589 ($w, $h) 1863 @{ $self->{size_req} }
1590} 1864}
1591 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1592sub size_allocate { 1870sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1594 1872
1595 delete $self->{ox}; 1873 delete $self->{ox};
1596 1874
1597 delete $self->{texture} 1875 delete $self->{texture}
1598 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
1599} 1879}
1600 1880
1601sub set_fontsize { 1881sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1603 1883
1604 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1605 delete $self->{texture}; 1886 delete $self->{texture};
1606 1887
1607 $self->realloc; 1888 $self->realloc;
1608} 1889}
1609 1890
1891sub reconfigure {
1892 my ($self) = @_;
1893
1894 delete $self->{size_req};
1895 delete $self->{texture};
1896
1897 $self->SUPER::reconfigure;
1898}
1899
1610sub _draw { 1900sub _draw {
1611 my ($self) = @_; 1901 my ($self) = @_;
1612 1902
1613 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1614 1904
1615 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1912
1623 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1624 }; 1914 };
1625 1915
1626 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1630 1920
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1924 };
1635 1925
1636 glEnable GL_TEXTURE_2D; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1928
1639 if ($tex->{format} == GL_ALPHA) { 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1930}
1648 1931
1649############################################################################# 1932#############################################################################
1650 1933
1651package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1652 1935
1653our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1654 1937
1655use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1656 1939
1657sub new { 1940sub new {
1658 my $class = shift; 1941 my $class = shift;
1659 1942
1660 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1664 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1665 can_hover => 1, 1948 can_hover => 1,
1666 can_focus => 1, 1949 can_focus => 1,
1667 valign => 0, 1950 valign => 0,
1668 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1669 #text => ... 1953 #text => ...
1954 #hidden => "*",
1670 @_ 1955 @_
1671 ) 1956 )
1672} 1957}
1673 1958
1674sub _set_text { 1959sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1967 $self->{text} = $text;
1683 1968
1684 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1971 delete $self->{size_req};
1686 1972
1687 $self->_emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1974
1975 $self->realloc;
1688 $self->update; 1976 $self->update;
1689} 1977}
1690 1978
1691sub set_text { 1979sub set_text {
1692 my ($self, $text) = @_; 1980 my ($self, $text) = @_;
1693 1981
1694 $self->{cursor} = length $text; 1982 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1983 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1984}
1699 1985
1700sub get_text { 1986sub get_text {
1701 $_[0]{text} 1987 $_[0]{text}
1702} 1988}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1708 1994
1709 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1710} 1996}
1711 1997
1712sub key_down { 1998sub invoke_key_down {
1713 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1714 2000
1715 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1718 2004
1719 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;
1720 2008
1721 if ($uni == 8) { 2009 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } 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 = "";
1730 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 2033 $self->emit ('escape');
1735 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2038 } else {
1738 return 0; 2039 return 0;
1739 } 2040 }
1740 2041
1741 $self->_set_text ($text); 2042 $self->_set_text ($text);
1742 2043
1743 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1744 2046
1745 1 2047 1
1746} 2048}
1747 2049
1748sub focus_in { 2050sub invoke_focus_in {
1749 my ($self) = @_; 2051 my ($self) = @_;
1750 2052
1751 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1752 2054
1753 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1754} 2056}
1755 2057
1756sub button_down { 2058sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1758 2060
1759 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2062
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2064
1763 # byte-index to char-index 2065 # byte-index to char-index
1764 my $text = $self->{text}; 2066 my $text = $self->{text};
1765 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1767 2069
1768 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1769 $self->update; 2071 $self->update;
1770 2072
1771 1 2073 1
1772} 2074}
1773 2075
1774sub mouse_motion { 2076sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1776# 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#
1777 2079
1778 0 2080 1
1779} 2081}
1780 2082
1781sub _draw { 2083sub _draw {
1782 my ($self) = @_; 2084 my ($self) = @_;
1783 2085
1784 local $self->{fg} = $self->{fg}; 2086 local $self->{fg} = $self->{fg};
1785 2087
1786 if ($FOCUS == $self) { 2088 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2089 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2090 $self->{fg} = $self->{active_fg};
1789 } else { 2091 } else {
1790 glColor @{$self->{bg}}; 2092 glColor_premultiply @{$self->{bg}};
1791 } 2093 }
1792 2094
1793 glEnable GL_BLEND; 2095 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 2097 glBegin GL_QUADS;
1796 glVertex 0 , 0; 2098 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 2099 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2100 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 2101 glVertex $self->{w}, 0;
… …
1810 utf8::encode $text; 2112 utf8::encode $text;
1811 2113
1812 @$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)
1813 } 2115 }
1814 2116
1815 glColor @{$self->{fg}};
1816 glBegin GL_LINES; 2117 glBegin GL_LINES;
1817 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};
1818 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};
1819 glEnd; 2120 glEnd;
1820 } 2121 }
1821} 2122}
1822 2123
2124#############################################################################
2125
1823package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1824 2127
1825our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1826 2129
1827use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1828 2131
1829sub key_down { 2132sub invoke_key_down {
1830 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1831 2134
1832 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1833 2136
1834 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1837 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2143 $self->emit (activate => $txt);
1840 $self->update; 2144 $self->update;
1841 2145
1842 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1845 } 2149 }
1846 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2154 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2156 }
1853 2157
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2161
1858 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2164 } else {
1861 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1862 } 2166 }
1863 2167
1864 } else { 2168 } else {
1865 return $self->SUPER::key_down ($ev) 2169 return $self->SUPER::invoke_key_down ($ev)
1866 } 2170 }
1867 2171
1868 1 2172 1
1869} 2173}
1870 2174
1871############################################################################# 2175#############################################################################
1872 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
1873package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1874 2217
1875our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1876 2219
1877use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1878 2221
1879my @tex = 2222my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1882 2225
1883sub new { 2226sub new {
1884 my $class = shift; 2227 my $class = shift;
1885 2228
… …
1894 can_events => 1, 2237 can_events => 1,
1895 @_ 2238 @_
1896 ) 2239 )
1897} 2240}
1898 2241
1899sub activate { }
1900
1901sub button_up { 2242sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1903 2244
1904 $self->emit ("activate") 2245 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2247 && $y >= 0 && $y < $self->{h};
… …
1909} 2250}
1910 2251
1911sub _draw { 2252sub _draw {
1912 my ($self) = @_; 2253 my ($self) = @_;
1913 2254
1914 local $self->{fg} = $self->{fg}; 2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2256
1920 glEnable GL_TEXTURE_2D; 2257 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2259 glColor 0, 0, 0, 1;
1923 2260
… …
1928 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1929} 2266}
1930 2267
1931############################################################################# 2268#############################################################################
1932 2269
1933package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1934 2271
1935our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1936 2273
1937my @tex = 2274my @tex =
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2277
1941use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1942 2279
1943sub new { 2280sub new {
1944 my $class = shift; 2281 my $class = shift;
1945 2282
1946 $class->SUPER::new ( 2283 $class->SUPER::new (
… …
1960 my ($self) = @_; 2297 my ($self) = @_;
1961 2298
1962 (6) x 2 2299 (6) x 2
1963} 2300}
1964 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1965sub button_down { 2310sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1967 2312
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2315 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2316 } else {
1973 return 0 2317 return 0
1974 } 2318 }
1975 2319
1976 1 2320 1
… …
1996 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
1997} 2341}
1998 2342
1999############################################################################# 2343#############################################################################
2000 2344
2001package CFClient::UI::Image; 2345package CFPlus::UI::Image;
2002 2346
2003our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
2004 2348
2005use CFClient::OpenGL; 2349use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2350
2008our %loaded_images; 2351our %texture_cache;
2009 2352
2010sub new { 2353sub new {
2011 my $class = shift; 2354 my $class = shift;
2012 2355
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2014 2360
2015 $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";
2016 2363
2017 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 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;
2019 2366
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2021 2368
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2370
2026 $self 2371 $self
2027} 2372}
2028 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
2029sub size_request { 2389sub size_request {
2030 my ($self) = @_; 2390 my ($self) = @_;
2031 2391
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
2033} 2393}
2034 2394
2035sub _draw { 2395sub _draw {
2036 my ($self) = @_; 2396 my ($self) = @_;
2037 2397
… …
2047 } 2407 }
2048 2408
2049 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2411
2052 $tex->draw_quad_alpha (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
2053 2413
2054 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2055} 2415}
2056 2416
2057############################################################################# 2417#############################################################################
2058 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
2059package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
2060 2456
2061our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2062 2458
2063use List::Util qw(min max); 2459use List::Util qw(min max);
2064 2460
2065use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2066 2462
2067my %tex = ( 2463my %tex = (
2068 food => [ 2464 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2467 ],
2072 grace => [ 2468 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 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/
2075 ], 2471 ],
2076 hp => [ 2472 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2475 ],
2080 mana => [ 2476 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 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/
2083 ], 2479 ],
2084); 2480);
2085 2481
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2544
2149 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2150 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);
2151 2550
2152 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2153 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;
2154 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2556
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2557 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2558 glBegin GL_QUADS;
… …
2173 2573
2174 if ($t3) { 2574 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2581 glEnd;
2182 } 2582 }
2183 2583
2184 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2186} 2586}
2187 2587
2188############################################################################# 2588#############################################################################
2189 2589
2190package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2191 2591
2192our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2193 2593
2194sub new { 2594sub new {
2195 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2196 2596
2197 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2599 can_hover => 1,
2200 can_events => 1, 2600 can_events => 1,
2201 %arg, 2601 %arg,
2202 ); 2602 );
2203 2603
2204 $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");
2205 $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);
2206 $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");
2207 2607
2208 $self 2608 $self
2209} 2609}
2210 2610
2211sub set_fontsize { 2611sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2233} 2633}
2234 2634
2235############################################################################# 2635#############################################################################
2236 2636
2237package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2238 2638
2239use strict; 2639use strict;
2240 2640
2241use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2242 2642
2243our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2244 2644
2245my @tex = 2645my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2248 2648
2249sub new { 2649sub new {
2250 my $class = shift; 2650 my $class = shift;
2251 2651
… …
2272 $self->update; 2672 $self->update;
2273 2673
2274 $self 2674 $self
2275} 2675}
2276 2676
2277sub changed { }
2278
2279sub set_range { 2677sub set_range {
2280 my ($self, $range) = @_; 2678 my ($self, $range) = @_;
2281 2679
2282 ($range, $self->{range}) = ($self->{range}, $range); 2680 ($range, $self->{range}) = ($self->{range}, $range);
2283 2681
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2682 if ("@$range" ne "@{$self->{range}}") {
2683 $self->update;
2684 $self->set_value ($self->{range}[0]);
2685 }
2286} 2686}
2287 2687
2288sub set_value { 2688sub set_value {
2289 my ($self, $value) = @_; 2689 my ($self, $value) = @_;
2290 2690
… …
2301 if $unit; 2701 if $unit;
2302 2702
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2704
2305 if ($value != $old_value) { 2705 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2706 $self->emit (changed => $value);
2307 $self->update; 2707 $self->update;
2308 } 2708 }
2309} 2709}
2310 2710
2311sub size_request { 2711sub size_request {
2312 my ($self) = @_; 2712 my ($self) = @_;
2313 2713
2314 ($self->{req_w}, $self->{req_h}) 2714 ($self->{req_w}, $self->{req_h})
2315} 2715}
2316 2716
2317sub button_down { 2717sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2319 2719
2320 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2721
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2723
2324 $self->mouse_motion ($ev, $x, $y) 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2725}
2326 2726
2327sub mouse_motion { 2727sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2329 2729
2330 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2732
… …
2338 } else { 2738 } else {
2339 return 0; 2739 return 0;
2340 } 2740 }
2341 2741
2342 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
2343} 2755}
2344 2756
2345sub update { 2757sub update {
2346 my ($self) = @_; 2758 my ($self) = @_;
2347 2759
… …
2396 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2397} 2809}
2398 2810
2399############################################################################# 2811#############################################################################
2400 2812
2401package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2402 2814
2403our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2404 2816
2405sub new { 2817sub new {
2406 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2407 2819
2408 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2409 2821
2410 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 2825 to_value => sub { shift },
2414 from_value => sub { shift }, 2826 from_value => sub { shift },
2415 %arg, 2827 %arg,
2416 ); 2828 );
2417 2829
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2439 2851
2440############################################################################# 2852#############################################################################
2441 2853
2442package CFClient::UI::TextView; 2854package CFPlus::UI::TextScroller;
2443 2855
2444our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2445 2857
2446use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2447 2859
2448sub new { 2860sub new {
2449 my $class = shift; 2861 my $class = shift;
2450 2862
2451 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2452 fontsize => 1, 2864 fontsize => 1,
2453 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2454 #font => default_font 2867 #font => default_font
2455 @_, 2868 @_,
2456 2869
2457 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2458 par => [], 2871 par => [],
2872 max_par => 0,
2459 height => 0, 2873 height => 0,
2460 children => [ 2874 children => [
2461 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2463 ], 2877 ],
2464 ); 2878 );
2465 2879
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2467 2881
… …
2473 2887
2474 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2889 $self->reflow;
2476} 2890}
2477 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
2478sub size_allocate { 2901sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2480 2903
2481 $self->SUPER::size_allocate ($w, $h); 2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2906
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $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});
2486 2911
2487 $self->reflow; 2912 $self->reflow;
2488}
2489 2913
2490sub text_size { 2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2491 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) = @_;
2492 2930
2493 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2494 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $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});
2497 $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}}
2498 2944 );
2945
2499 $layout->size 2946 $layout
2500} 2947}
2501 2948
2502sub reflow { 2949sub reflow {
2503 my ($self) = @_; 2950 my ($self) = @_;
2504 2951
… …
2511 2958
2512 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2514} 2961}
2515 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
2516sub clear { 2978sub clear {
2517 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2518 2983
2519 $self->{par} = []; 2984 $self->{par} = [];
2520 $self->{height} = 0; 2985 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2987}
2523 2988
2524sub add_paragraph { 2989sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2526 2991
2527 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2528 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
2529 $self->{height} += $h; 3044 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3046
2533 $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 }
2534} 3053}
2535 3054
2536sub update { 3055sub update {
2537 my ($self) = @_; 3056 my ($self) = @_;
2538 3057
… …
2540 3059
2541 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2542 3061
2543 delete $self->{texture}; 3062 delete $self->{texture};
2544 3063
2545 $ROOT->on_post_alloc ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3068
2548 if (delete $self->{need_reflow}) {
2549 my $height = 0;
2550
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2566
2567 $self->{height} = $height;
2568
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570
2571 delete $self->{texture};
2572 }
2573
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3070 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2577 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;
2578 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2579 3082
2580 my $y0 = $top; 3083 my $y0 = $top;
2581 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2582 3085
2583 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2595 3089
2596 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3092
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2602 3094
2603 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2604 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 }
2605 } 3107 }
2606 3108
2607 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3111 }
2609 3112
2610 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2611 }; 3114 };
2612 }); 3115 });
2613} 3116}
2614 3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
3125}
3126
2615sub _draw { 3127sub _draw {
2616 my ($self) = @_; 3128 my ($self) = @_;
2617 3129
2618 glEnable GL_TEXTURE_2D; 3130 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3132 glColor 0, 0, 0, 1;
2621 $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});
2622 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2623 3135
2624 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2625
2626} 3137}
2627 3138
2628############################################################################# 3139#############################################################################
2629 3140
2630package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2631 3142
2632use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2633 3144
2634our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2635 3146
2636sub moveto { 3147sub moveto {
2637 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2638 3149
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3178 glPopMatrix;
2668} 3179}
2669 3180
2670############################################################################# 3181#############################################################################
2671 3182
2672package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2673 3184
2674our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2675 3186
2676sub new { 3187sub new {
2677 my $class = shift; 3188 my $class = shift;
2678 3189
2679 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2692} 3203}
2693 3204
2694############################################################################# 3205#############################################################################
2695 3206
2696package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2697 3208
2698our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2699 3210
2700use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2701 3212
2702sub new { 3213sub new {
2703 my $class = shift; 3214 my $class = shift;
2704 3215
2705 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2708 ) 3219 )
2709} 3220}
2710 3221
2711sub set_tooltip_from { 3222sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2713 3227
2714 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2715 3229
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3233 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3234 . "visible $widget->{visible}";
2721 } 3235 }
2722 3236
3237 $tooltip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//;
3239
2723 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3241 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3243 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3245 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3247 );
2731} 3248}
2732 3249
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3254
2738 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2739} 3256}
2740 3257
2741sub size_allocate { 3258sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2743 3260
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3262}
2746 3263
2747sub visibility_change { 3264sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3265 my ($self, $visible) = @_;
2749 3266
2750 return unless $visible; 3267 return unless $visible;
2751 3268
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2754 or return; 3271 or return;
2755 3272
3273 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3275
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3277 if $x + $self->{w} > $self->{root}{w};
2760 3278
2761 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2762 }); 3283 });
2763} 3284}
2764 3285
2765sub _draw { 3286sub _draw {
2766 my ($self) = @_; 3287 my ($self) = @_;
… …
2790 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2791} 3312}
2792 3313
2793############################################################################# 3314#############################################################################
2794 3315
2795package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2796 3317
2797our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2798 3319
2799use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2800 3321
2801sub new { 3322sub new {
2802 my $class = shift; 3323 my $class = shift;
2803 3324
2804 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2806 can_events => 0, 3327 can_events => 0,
2807 @_, 3328 @_,
2808 ); 3329 );
2809 3330
2810 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2812 3333
2813 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1, 3336 hard => 1,
2816 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
… …
2839sub _draw { 3360sub _draw {
2840 my ($self) = @_; 3361 my ($self) = @_;
2841 3362
2842 return unless $::CONN; 3363 return unless $::CONN;
2843 3364
3365 $self->SUPER::_draw;
3366
2844 my $face; 3367 my $face;
2845 3368
2846 if ($self->{frame}) { 3369 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}]; 3370 my $anim = $::CONN->{anim}[$self->{anim}];
2848 3371
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3376 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3377
2855 if ($tex) { 3378 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3379 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3380 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3381 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3383 glDisable GL_TEXTURE_2D;
2861 } 3384 }
2862} 3385}
2863 3386
2864sub DESTROY { 3387sub destroy {
2865 my ($self) = @_; 3388 my ($self) = @_;
2866 3389
2867 $self->{timer}->cancel 3390 $self->{timer}->cancel
2868 if $self->{timer}; 3391 if $self->{timer};
2869 3392
2870 $self->SUPER::DESTROY; 3393 $self->SUPER::destroy;
2871} 3394}
2872 3395
2873############################################################################# 3396#############################################################################
2874 3397
2875package CFClient::UI::Buttonbar; 3398package CFPlus::UI::Buttonbar;
2876 3399
2877our @ISA = CFClient::UI::HBox::; 3400our @ISA = CFPlus::UI::HBox::;
2878 3401
2879# TODO: should actualyl wrap buttons and other goodies. 3402# TODO: should actually wrap buttons and other goodies.
2880 3403
2881############################################################################# 3404#############################################################################
2882 3405
2883package CFClient::UI::Menu; 3406package CFPlus::UI::Menu;
2884 3407
2885our @ISA = CFClient::UI::FancyFrame::; 3408our @ISA = CFPlus::UI::Toplevel::;
2886 3409
2887use CFClient::OpenGL; 3410use CFPlus::OpenGL;
2888 3411
2889sub new { 3412sub new {
2890 my $class = shift; 3413 my $class = shift;
2891 3414
2892 my $self = $class->SUPER::new ( 3415 my $self = $class->SUPER::new (
2893 items => [], 3416 items => [],
2894 z => 100, 3417 z => 100,
2895 @_, 3418 @_,
2896 ); 3419 );
2897 3420
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3421 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3422
2900 for my $item (@{ $self->{items} }) { 3423 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3424 my ($widget, $cb, $tooltip) = @$item;
2902 3425
2903 # handle various types of items, only text for now 3426 # handle various types of items, only text for now
2904 if (!ref $widget) { 3427 if (!ref $widget) {
3428 if ($widget =~ /\t/) {
3429 my ($left, $right) = split /\t/, $widget, 2;
3430
2905 $widget = new CFClient::UI::Label 3431 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3432 can_hover => 1,
2907 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,
2908 text => $widget; 3445 markup => $widget,
3446 tooltip => $tooltip;
3447 }
2909 } 3448 }
2910 3449
2911 $self->{item}{$widget} = $item; 3450 $self->{item}{$widget} = $item;
2912 3451
2913 $self->{vbox}->add ($widget); 3452 $self->{vbox}->add ($widget);
… …
2918 3457
2919# 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)
2920sub popup { 3459sub popup {
2921 my ($self, $ev) = @_; 3460 my ($self, $ev) = @_;
2922 3461
2923 $self->_emit ("popdown"); 3462 $self->emit ("popdown");
2924 3463
2925 # maybe save $GRAB? must be careful about events... 3464 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3465 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3466 $self->{button} = $ev->{button};
2928 3467
2929 $self->show; 3468 $self->show;
2930 $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);
2931} 3470}
2932 3471
2933sub mouse_motion { 3472sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3473 my ($self, $ev, $x, $y) = @_;
2935 3474
2936 # TODO: should use vbox->find_widget or so 3475 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3476 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3477 $self->{hover} = $self->{item}{$HOVER};
2939 3478
2940 0 3479 0
2941} 3480}
2942 3481
2943sub button_up { 3482sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3483 my ($self, $ev, $x, $y) = @_;
2945 3484
2946 if ($ev->{button} == $self->{button}) { 3485 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3486 undef $GRAB;
2948 $self->hide; 3487 $self->hide;
2949 3488
2950 $self->_emit ("popdown"); 3489 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3490 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3491 } else {
2953 return 0 3492 return 0
2954 } 3493 }
2955 3494
2956 1 3495 1
2957} 3496}
2958 3497
2959############################################################################# 3498#############################################################################
2960 3499
2961package CFClient::UI::Multiplexer; 3500package CFPlus::UI::Multiplexer;
2962 3501
2963our @ISA = CFClient::UI::Container::; 3502our @ISA = CFPlus::UI::Container::;
2964 3503
2965sub new { 3504sub new {
2966 my $class = shift; 3505 my $class = shift;
2967 3506
2968 my $self = $class->SUPER::new ( 3507 my $self = $class->SUPER::new (
… …
2982 3521
2983 $self->{current} = $self->{children}[0] 3522 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3523 if @{ $self->{children} };
2985} 3524}
2986 3525
3526sub get_current_page {
3527 my ($self) = @_;
3528
3529 $self->{current}
3530}
3531
2987sub set_current_page { 3532sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3533 my ($self, $page_or_widget) = @_;
2989 3534
2990 my $widget = ref $page_or_widget 3535 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3536 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3537 : $self->{children}[$page_or_widget];
2993 3538
2994 $self->{current} = $widget; 3539 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3540 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3541
2997 $self->_emit (page_changed => $self->{current}); 3542 $self->emit (page_changed => $self->{current});
2998 3543
2999 $self->realloc; 3544 $self->realloc;
3000} 3545}
3001 3546
3002sub visible_children { 3547sub visible_children {
… …
3007 my ($self) = @_; 3552 my ($self) = @_;
3008 3553
3009 $self->{current}->size_request 3554 $self->{current}->size_request
3010} 3555}
3011 3556
3012sub size_allocate { 3557sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3558 my ($self, $w, $h) = @_;
3014 3559
3015 $self->{current}->configure (0, 0, $w, $h); 3560 $self->{current}->configure (0, 0, $w, $h);
3561
3562 1
3016} 3563}
3017 3564
3018sub _draw { 3565sub _draw {
3019 my ($self) = @_; 3566 my ($self) = @_;
3020 3567
3021 $self->{current}->draw; 3568 $self->{current}->draw;
3022} 3569}
3023 3570
3024############################################################################# 3571#############################################################################
3025 3572
3026package CFClient::UI::Notebook; 3573package CFPlus::UI::Notebook;
3027 3574
3028our @ISA = CFClient::UI::VBox::; 3575our @ISA = CFPlus::UI::VBox::;
3029 3576
3030sub new { 3577sub new {
3031 my $class = shift; 3578 my $class = shift;
3032 3579
3033 my $self = $class->SUPER::new ( 3580 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3581 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3582 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self 3583 # filter => # will be put between multiplexer and $self
3037 @_, 3584 @_,
3038 ); 3585 );
3039 3586
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3587 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3044} 3591}
3045 3592
3046sub add { 3593sub add {
3047 my ($self, $title, $widget, $tooltip) = @_; 3594 my ($self, $title, $widget, $tooltip) = @_;
3048 3595
3049 Scalar::Util::weaken $self; 3596 CFPlus::weaken $self;
3050 3597
3051 $self->{buttonbar}->add (new CFClient::UI::Button 3598 $self->{buttonbar}->add (new CFPlus::UI::Button
3052 markup => $title, 3599 markup => $title,
3053 tooltip => $tooltip, 3600 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) }, 3601 on_activate => sub { $self->set_current_page ($widget) },
3055 ); 3602 );
3056 3603
3057 $self->{multiplexer}->add ($widget); 3604 $self->{multiplexer}->add ($widget);
3058} 3605}
3059 3606
3607sub get_current_page {
3608 my ($self) = @_;
3609
3610 $self->{multiplexer}->get_current_page
3611}
3612
3060sub set_current_page { 3613sub set_current_page {
3061 my ($self, $page) = @_; 3614 my ($self, $page) = @_;
3062 3615
3063 $self->{multiplexer}->set_current_page ($page); 3616 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3617 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3618}
3066 3619
3067############################################################################# 3620#############################################################################
3068 3621
3069package CFClient::UI::Statusbox; 3622package CFPlus::UI::Selector;
3070 3623
3624use utf8;
3625
3071our @ISA = CFClient::UI::VBox::; 3626our @ISA = CFPlus::UI::Button::;
3072 3627
3073sub new { 3628sub new {
3074 my $class = shift; 3629 my $class = shift;
3075 3630
3076 $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 (
3077 fontsize => 0.8, 3686 fontsize => 0.8,
3078 @_, 3687 @_,
3079 ) 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
3080} 3695}
3081 3696
3082sub reorder { 3697sub reorder {
3083 my ($self) = @_; 3698 my ($self) = @_;
3084 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} };
3085 3705
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3706 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3707 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3708 }
3089 3709
… …
3092 my @items = sort { 3712 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3713 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3714 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3715 } values %{ $self->{item} };
3096 3716
3717 $self->{timer}->interval (1);
3718
3097 my $count = 10 + 1; 3719 my $count = 10 + 1;
3098 for my $item (@items) { 3720 for my $item (@items) {
3099 last unless --$count; 3721 last unless --$count;
3100 3722
3101 push @widgets, $item->{label} ||= do { 3723 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3724 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3725 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3726 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3727 : $item->{text};
3106 3728
3107 for ($short) { 3729 for ($short) {
3108 s/^\s+//; 3730 s/^\s+//;
3109 s/\s+/ /g; 3731 s/\s+/ /g;
3110 } 3732 }
3111 3733
3112 new CFClient::UI::Label 3734 new CFPlus::UI::Label
3113 markup => $short, 3735 markup => $short,
3114 tooltip => $item->{tooltip}, 3736 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3737 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3738 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3739 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3740 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3741 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3742 can_events => 1,
3121 can_hover => 1 3743 can_hover => 1
3122 }; 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;
3123 } 3757 }
3124 3758
3125 $self->clear; 3759 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3760 $self->SUPER::add (reverse @widgets);
3127} 3761}
… …
3132 $text =~ s/^\s+//; 3766 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3767 $text =~ s/\s+$//;
3134 3768
3135 return unless $text; 3769 return unless $text;
3136 3770
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3771 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3772
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3773 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3774
3141 if (my $item = $self->{item}{$group}) { 3775 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3776 if ($item->{text} eq $text) {
3143 $item->{count}++; 3777 $item->{count}++;
3144 } else { 3778 } else {
3145 $item->{count} = 1; 3779 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3780 $item->{text} = $item->{tooltip} = $text;
3147 } 3781 }
3148 $item->{id} = ++$self->{id}; 3782 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3783 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3784 delete $item->{label};
3151 } else { 3785 } else {
3152 $self->{item}{$group} = { 3786 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3787 id => ++$self->{id},
… …
3159 count => 1, 3793 count => 1,
3160 %arg, 3794 %arg,
3161 }; 3795 };
3162 } 3796 }
3163 3797
3798 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3799 $self->reorder;
3800 });
3165} 3801}
3166 3802
3167sub reconfigure { 3803sub reconfigure {
3168 my ($self) = @_; 3804 my ($self) = @_;
3169 3805
… …
3172 3808
3173 $self->reorder; 3809 $self->reorder;
3174 $self->SUPER::reconfigure; 3810 $self->SUPER::reconfigure;
3175} 3811}
3176 3812
3813sub destroy {
3814 my ($self) = @_;
3815
3816 $self->{timer}->cancel;
3817
3818 $self->SUPER::destroy;
3819}
3820
3177############################################################################# 3821#############################################################################
3178 3822
3179package CFClient::UI::Inventory;
3180
3181our @ISA = CFClient::UI::ScrolledWindow::;
3182
3183sub new {
3184 my $class = shift;
3185
3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3428 @_,
3429 )
3430}
3431
3432# XXX: Do sorting? Argl...
3433sub add_spell {
3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3436
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root; 3823package CFPlus::UI::Root;
3475 3824
3476our @ISA = CFClient::UI::Container::; 3825our @ISA = CFPlus::UI::Container::;
3477 3826
3827use List::Util qw(min max);
3828
3478use CFClient::OpenGL; 3829use CFPlus::OpenGL;
3479 3830
3480sub new { 3831sub new {
3481 my $class = shift; 3832 my $class = shift;
3482 3833
3483 my $self = $class->SUPER::new ( 3834 my $self = $class->SUPER::new (
3484 visible => 1, 3835 visible => 1,
3485 @_, 3836 @_,
3486 ); 3837 );
3487 3838
3488 Scalar::Util::weaken ($self->{root} = $self); 3839 CFPlus::weaken ($self->{root} = $self);
3489 3840
3490 $self 3841 $self
3491} 3842}
3492 3843
3493sub size_request { 3844sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 3859 $coord = $max - $size if $coord > $max - $size;
3509 3860
3510 int $coord + 0.5 3861 int $coord + 0.5
3511} 3862}
3512 3863
3513sub size_allocate { 3864sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3865 my ($self, $w, $h) = @_;
3515 3866
3516 for my $child ($self->children) { 3867 for my $child ($self->children) {
3517 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)};
3518 3869
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3873 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3874 $Y = _to_pixel $Y, $H, $self->{h};
3524 3875
3525 $child->configure ($X, $Y, $W, $H); 3876 $child->configure ($X, $Y, $W, $H);
3526 } 3877 }
3878
3879 1
3527} 3880}
3528 3881
3529sub coord2local { 3882sub coord2local {
3530 my ($self, $x, $y) = @_; 3883 my ($self, $x, $y) = @_;
3531 3884
… …
3616 3969
3617 delete $queue{$widget+0}; 3970 delete $queue{$widget+0};
3618 3971
3619 my ($w, $h) = $widget->size_request; 3972 my ($w, $h) = $widget->size_request;
3620 3973
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3974 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $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};
3623 3979
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3980 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3981 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3982
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3983 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 4009
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4010 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4011
3656 $w = 0 if $w < 0; 4012 $w = 0 if $w < 0;
3657 $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};
3658 4023
3659 $w = int $w + 0.5; 4024 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4025 $h = int $h + 0.5;
3661 4026
3662 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}) {
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4051 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4052 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4053 glLoadIdentity;
3689 4054
3690 { 4055 {
3691 package CFClient::UI::Base; 4056 package CFPlus::UI::Base;
3692 4057
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4058 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4059 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4060
3697 $self->_draw; 4061 $self->_draw;
4062 }
3698} 4063}
3699 4064
3700############################################################################# 4065#############################################################################
3701 4066
3702package CFClient::UI; 4067package CFPlus::UI;
3703 4068
3704$ROOT = new CFClient::UI::Root; 4069$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4070$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4071
37071 40721
3708 4073

Diff Legend

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