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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
97 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
99 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
192 reconfigure_widgets; 210 reconfigure_widgets;
193} 211}
194 212
195############################################################################# 213#############################################################################
196 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
197package CFClient::UI::Base; 223package CFPlus::UI::Base;
198 224
199use strict; 225use strict;
200 226
201use CFClient::OpenGL; 227use CFPlus::OpenGL;
202 228
203sub new { 229sub new {
204 my $class = shift; 230 my $class = shift;
205 231
206 my $self = bless { 232 my $self = bless {
… …
211 h => undef, 237 h => undef,
212 can_events => 1, 238 can_events => 1,
213 @_ 239 @_
214 }, $class; 240 }, $class;
215 241
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 243
218 for (keys %$self) { 244 for (keys %$self) {
219 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
221 } 247 }
222 } 248 }
223 249
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 255
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 258
233 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
238 264
239sub destroy { 265sub destroy {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
242 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
243 %$self = (); 270 %$self = ();
244} 271}
245 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
246sub show { 277sub show {
247 my ($self) = @_; 278 my ($self) = @_;
248 279
249 return if $self->{parent}; 280 return if $self->{parent};
250 281
251 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
252} 283}
253 284
254sub set_visible { 285sub set_visible {
255 my ($self) = @_; 286 my ($self) = @_;
256 287
… …
271 302
272 return unless $self->{visible}; 303 return unless $self->{visible};
273 304
274 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
275 306
307 delete $self->{visible};
276 delete $self->{root}; 308 delete $self->{root};
277 delete $self->{visible};
278 309
279 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
281 312
282 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
284 315
285 $self->focus_out; 316 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
289 319
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
314} 344}
315 345
316sub move_abs { 346sub move_abs {
317 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
318 348
319 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
322 352
323 $self->update; 353 $self->update;
324} 354}
325 355
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
366 400
367 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
368 } 402 }
369} 403}
370 404
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 405sub children {
376 # nop 406 # nop
377} 407}
378 408
379sub visible_children { 409sub visible_children {
… …
381} 411}
382 412
383sub set_max_size { 413sub set_max_size {
384 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
385 415
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
388} 420}
389 421
390sub set_tooltip { 422sub set_tooltip {
391 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
392 424
… …
395 427
396 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
397 429
398 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
399 431
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 435 }
404} 436}
405 437
406# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
407sub coord2local { 439sub coord2local {
408 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
409 441
442 Carp::confess unless $self->{parent};#d#
443
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 445}
412 446
413# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
414sub coord2global { 448sub coord2global {
415 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
416 450
451 Carp::confess unless $self->{parent};#d#
452
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 454}
419 455
420sub focus_in { 456sub invoke_focus_in {
421 my ($self) = @_; 457 my ($self) = @_;
422 458
423 return if $FOCUS == $self; 459 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
425 461
426 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
427 463
428 $self->_emit (focus_in => $focus); 464 $self->update;
429 465
430 $focus->update if $focus; 466 0
431 $FOCUS->update;
432} 467}
433 468
434sub focus_out { 469sub invoke_focus_out {
435 my ($self) = @_; 470 my ($self) = @_;
436 471
437 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
438 473
439 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
440 475
441 $self->_emit (focus_out => $focus); 476 $self->update;
442 477
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447}
448 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
449sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 492sub invoke_button_up { 0 }
451sub key_down { 0 } 493sub invoke_key_down { 0 }
452sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
453 496
454sub button_down { 497sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
456 499
457 $self->focus_in; 500 $self->grab_focus;
458 501
459 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
460} 550}
461 551
462sub find_widget { 552sub find_widget {
463 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
464 554
… …
472} 562}
473 563
474sub set_parent { 564sub set_parent {
475 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
476 566
477 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
506 573
… …
539 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
540 607
541 # update screen rectangle 608 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 611
547 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 615
551 glPushMatrix; 616 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 617 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 618
556 if ($self == $HOVER && $self->{can_hover}) { 619 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 621 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 623 glBegin GL_QUADS;
563 glVertex $x , $y; 624 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 625 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 626 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 627 glVertex 0 , $self->{h};
567 glEnd; 628 glEnd;
568 glDisable GL_BLEND; 629 glDisable GL_BLEND;
569 } 630 }
570 631
571 if ($ENV{CFPLUS_DEBUG} & 1) { 632 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 633 glPushMatrix;
573 glColor 1, 1, 0, 1; 634 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 635 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 636 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 637 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
580 glEnd; 641 glEnd;
581 glPopMatrix; 642 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 644 }
645
646 $self->_draw;
647 glPopMatrix;
584} 648}
585 649
586sub _draw { 650sub _draw {
587 my ($self) = @_; 651 my ($self) = @_;
588 652
589 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
590} 654}
591 655
656my $cntx;#d#
592sub DESTROY { 657sub DESTROY {
593 my ($self) = @_; 658 my ($self) = @_;
594 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
595 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
596 #$self->deactivate;
597} 666}
598 667
599############################################################################# 668#############################################################################
600 669
601package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
602 671
603our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
604 673
605use strict; 674use strict;
606use CFClient::OpenGL; 675use CFPlus::OpenGL;
607 676
608sub new { 677sub new {
609 my $class = shift; 678 my $class = shift;
610 679
611 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
626 695
627 if ($color && (@$color < 4 || $color->[3])) { 696 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
629 698
630 glEnable GL_BLEND; 699 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 701 glColor_premultiply @$color;
633 702
634 glBegin GL_QUADS; 703 glBegin GL_QUADS;
635 glVertex 0 , 0; 704 glVertex 0 , 0;
636 glVertex 0 , $h; 705 glVertex 0 , $h;
637 glVertex $w, $h; 706 glVertex $w, $h;
… …
642 } 711 }
643} 712}
644 713
645############################################################################# 714#############################################################################
646 715
647package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
648 717
649our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
650 719
651sub new { 720sub new {
652 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
653 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
654} 723}
… …
661 730
662sub draw { } 731sub draw { }
663 732
664############################################################################# 733#############################################################################
665 734
666package CFClient::UI::Container; 735package CFPlus::UI::Container;
667 736
668our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
669 738
670sub new { 739sub new {
671 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
672 741
673 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
682 if $children; 751 if $children;
683 752
684 $self 753 $self
685} 754}
686 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
687sub add { 764sub add {
688 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
689 766
690 $_->set_parent ($self) 767 $_->set_parent ($self)
691 for @widgets; 768 for @widgets;
… …
751 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
752} 829}
753 830
754############################################################################# 831#############################################################################
755 832
756package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
757 834
758our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
759 836
760sub new { 837sub new {
761 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
762 839
763 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
764 841
765 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
766} 843}
767 844
768sub add { 845sub add {
769 my ($self, $child) = @_; 846 my ($self, $child) = @_;
770 847
771 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
774} 850}
775 851
776sub remove { 852sub remove {
777 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
778 854
779 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
780 856
781 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 858 unless @{$self->{children}};
783} 859}
784 860
785sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
786 862
787sub size_request { 863sub size_request {
788 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
789} 865}
790 866
791sub size_allocate { 867sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
793 869
794 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
795} 873}
796 874
797############################################################################# 875#############################################################################
798 876
877# back-buffered drawing area
878
799package CFClient::UI::Window; 879package CFPlus::UI::Window;
800 880
801our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
802 882
803use CFClient::OpenGL; 883use CFPlus::OpenGL;
804 884
805sub new { 885sub new {
806 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
807 887
808 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
813 893
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 895 $self->SUPER::update;
816} 896}
817 897
818sub size_allocate { 898sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
820 900
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
823} 904}
824 905
825sub _render { 906sub _render {
826 my ($self) = @_; 907 my ($self) = @_;
827 908
… …
829} 910}
830 911
831sub render_child { 912sub render_child {
832 my ($self) = @_; 913 my ($self) = @_;
833 914
834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
837 918
838 { 919 {
839 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
840 921
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
843 } 926 }
844
845 $self->_render;
846 }; 927 };
847} 928}
848 929
849sub _draw { 930sub _draw {
850 my ($self) = @_; 931 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 932
854 my $tex = $self->{texture} 933 my $tex = $self->{texture}
855 or return; 934 or return;
856 935
857 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 938 glColor 0, 0, 0, 1;
860 939
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
862 941
863 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
864} 943}
865 944
866############################################################################# 945#############################################################################
867 946
868package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
869 948
870our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
871 950
872sub new { 951sub new {
873 my $class = shift; 952 my $class = shift;
874 953
875 $class->SUPER::new ( 954 $class->SUPER::new (
… …
888 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
889 968
890 ($w, $h) 969 ($w, $h)
891} 970}
892 971
893sub size_allocate { 972sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
895 974
896 my $child = $self->child; 975 my $child = $self->child;
897 976
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 979
901 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
902 $self->update; 981 $self->update;
982
983 1
903} 984}
904 985
905sub set_offset { 986sub set_offset {
906 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
907 988
… …
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 1016 ) {
936 $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})
937 } else { 1018 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 1020 }
940} 1021}
941 1022
942sub _render { 1023sub _render {
943 my ($self) = @_; 1024 my ($self) = @_;
944 1025
945 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};
946 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};
947 1028
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1030
950 $self->SUPER::_render; 1031 $self->SUPER::_render;
951} 1032}
952 1033
953############################################################################# 1034#############################################################################
954 1035
955package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
956 1037
957our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
958 1039
959sub new { 1040sub new {
960 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
961 1044
962 my $self; 1045 my $self;
963 1046
964 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
965 vertical => 1, 1057 vertical => 1,
966 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
967 on_changed => sub { 1059 on_changed => sub {
968 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
969 }, 1062 },
970 ; 1063 ;
971 1064
972 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
974 slider => $slider, 1068 hslider => $hslider,
975 @_, 1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1072 %arg,
976 ); 1073 );
977 1074
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp}); 1075 $self->SUPER::add (0, 0, $self->{vp});
980 $self->add ($self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1079 $self->add ($child) if $child;
981 1080
982 $self 1081 $self
983} 1082}
984 1083
1084#TODO# update range on size_allocate depending on child
1085
1086sub add {
1087 my ($self, $widget) = @_;
1088
1089 $self->{vp}->add ($self->{child} = $widget);
1090}
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 $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
985sub update { 1116sub update {
986 my ($self) = @_; 1117 my ($self) = @_;
987 1118
988 $self->SUPER::update; 1119 $self->SUPER::update;
989 1120 $self->update_slider;
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1121}
994 1122
995sub size_allocate { 1123sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
997 1125
1126 $self->update_slider;
998 $self->SUPER::size_allocate ($w, $h); 1127 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1128}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1129
1007############################################################################# 1130#############################################################################
1008 1131
1009package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1010 1133
1011our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1012 1135
1013use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1014 1137
1015sub new { 1138sub new {
1016 my $class = shift; 1139 my $class = shift;
1017 1140
1018 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1026 1149
1027 if ($self->{bg}) { 1150 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1151 my ($w, $h) = @$self{qw(w h)};
1029 1152
1030 glEnable GL_BLEND; 1153 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1154 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1155 glColor_premultiply @{ $self->{bg} };
1033 1156
1034 glBegin GL_QUADS; 1157 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1158 glVertex 0 , 0;
1036 glVertex 0 , $h; 1159 glVertex 0 , $h;
1037 glVertex $w, $h; 1160 glVertex $w, $h;
… …
1044 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1045} 1168}
1046 1169
1047############################################################################# 1170#############################################################################
1048 1171
1049package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1050 1173
1051our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1052 1175
1053use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1054
1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1177
1063sub new { 1178sub new {
1064 my ($class, %arg) = @_; 1179 my ($class, %arg) = @_;
1065 1180
1066 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) = @_;
1067 1288
1068 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1292 border => 0.6,
1072 can_events => 1, 1293 can_events => 1,
1073 min_w => 16, 1294 min_w => 64,
1074 min_h => 16, 1295 min_h => 32,
1075 %arg, 1296 %arg,
1076 ); 1297 );
1077 1298
1078 $self->{title} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1079 align => 0, 1300 align => 0,
1080 valign => 1, 1301 valign => 1,
1081 text => $title, 1302 text => $self->{title},
1082 fontsize => $self->{border} 1303 fontsize => $self->{border},
1083 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 }
1084 1314
1085 $self 1315 $self
1086} 1316}
1087 1317
1088sub add { 1318sub add {
1089 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1090 1320
1091 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1324}
1094 1325
1095sub border { 1326sub border {
1096 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1097} 1328}
1098 1329
1099sub size_request { 1330sub size_request {
1100 my ($self) = @_; 1331 my ($self) = @_;
1101 1332
1102 $self->{title}->size_request 1333 $self->{title_widget}->size_request
1103 if $self->{title}; 1334 if $self->{title_widget};
1335
1336 $self->{close_button}->size_request
1337 if $self->{close_button};
1104 1338
1105 my ($w, $h) = $self->SUPER::size_request; 1339 my ($w, $h) = $self->SUPER::size_request;
1106 1340
1107 ( 1341 (
1108 $w + $self->border * 2, 1342 $w + $self->border * 2,
1109 $h + $self->border * 2, 1343 $h + $self->border * 2,
1110 ) 1344 )
1111} 1345}
1112 1346
1113sub size_allocate { 1347sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1348 my ($self, $w, $h) = @_;
1115 1349
1116 if ($self->{title}) { 1350 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1351 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1352 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1353 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1354 }
1121 1355
1122 my $border = $self->border; 1356 my $border = $self->border;
1123 1357
1124 $h -= List::Util::max 0, $border * 2; 1358 $h -= List::Util::max 0, $border * 2;
1125 $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;
1126 1373
1127 $self->child->configure ($border, $border, $w, $h); 1374 1
1128} 1375}
1129 1376
1130sub button_down { 1377sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
1132 1379
1133 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1381 my $border = $self->border;
1135 1382
… …
1151 my $dy = $ev->{y} - $oy; 1398 my $dy = $ev->{y} - $oy;
1152 1399
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1400 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1401 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1402
1403 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1404 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1405 };
1159 1406
1160 } elsif ($lr ^ $td) { 1407 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1408 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1409 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1412 my ($ev, $x, $y) = @_;
1166 1413
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1415
1169 $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});
1170 }; 1419 };
1171 } else { 1420 } else {
1172 return 0; 1421 return 0;
1173 } 1422 }
1174 1423
1175 1 1424 1
1176} 1425}
1177 1426
1178sub button_up { 1427sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1180 1429
1181 !!delete $self->{motion} 1430 ! ! delete $self->{motion}
1182} 1431}
1183 1432
1184sub mouse_motion { 1433sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1186 1435
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1437
1189 !!$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
1190} 1447}
1191 1448
1192sub _draw { 1449sub _draw {
1193 my ($self) = @_; 1450 my ($self) = @_;
1194 1451
… …
1220 1477
1221 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
1222 1479
1223 $child->draw; 1480 $child->draw;
1224 1481
1225 if ($self->{title}) { 1482 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1483 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1228 } 1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1229} 1491}
1230 1492
1231############################################################################# 1493#############################################################################
1232 1494
1233package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1234 1496
1235our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1236 1498
1237use List::Util qw(max sum); 1499use List::Util qw(max sum);
1238 1500
1239use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1240 1502
1241sub new { 1503sub new {
1242 my $class = shift; 1504 my $class = shift;
1243 1505
1244 $class->SUPER::new ( 1506 $class->SUPER::new (
1245 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1246 @_, 1509 @_,
1247 ) 1510 )
1248} 1511}
1249 1512
1250sub children { 1513sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252} 1515}
1253 1516
1254sub add { 1517sub add {
1255 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1256 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1257 $child->set_parent ($self); 1522 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1259 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1260 $self->realloc; 1528 $self->realloc;
1529}
1530
1531sub remove {
1532 my ($self, $child) = @_;
1533
1534 # TODO: not yet implemented
1261} 1535}
1262 1536
1263# 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?
1264sub clear { 1538sub clear {
1265 my ($self) = @_; 1539 my ($self) = @_;
… …
1306 (sum @$ws), 1580 (sum @$ws),
1307 (sum @$hs), 1581 (sum @$hs),
1308 ) 1582 )
1309} 1583}
1310 1584
1311sub size_allocate { 1585sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1313 1587
1314 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1315 1589
1316 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1317 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1318 1592
1319 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1320 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1321 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1322 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1323 1597
1324 # linearly scale sizes
1325 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1326 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1327 1599
1328 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
1329 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1330 1609
1331 my $y; 1610 my $y;
1332 1611
1333 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1334 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1348 } 1627 }
1349 1628
1350 $y += $row_h; 1629 $y += $row_h;
1351 } 1630 }
1352 1631
1632 1
1353} 1633}
1354 1634
1355sub find_widget { 1635sub find_widget {
1356 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1357 1637
… …
1376 } 1656 }
1377} 1657}
1378 1658
1379############################################################################# 1659#############################################################################
1380 1660
1381package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1382 1662
1383our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1384 1664
1385sub size_request { 1665sub size_request {
1386 my ($self) = @_; 1666 my ($self) = @_;
1387 1667
1388 $self->{vertical} 1668 $self->{vertical}
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1676 )
1397} 1677}
1398 1678
1399sub size_allocate { 1679sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1401 1681
1402 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1404 1684
1405 my @req; 1685 my @req;
1406 1686
1407 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1409 } else { 1689 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1412 1692
1413 if ($req > $space) { 1693 if ($req > $space) {
1414 # ah well, not enough space 1694 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1416 } else { 1696 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1698
1419 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1420 1700
1421 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1702 for 0 .. $#children;
1423 } 1703 }
1424 } 1704 }
1425 1705
1426 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1427 1707
1428 my $pos = 0; 1708 my $pos = 0;
1429 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1431 $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));
1432 1712
1433 $pos += $alloc; 1713 $pos += $alloc;
1434 } 1714 }
1435 1715
1436 1 1716 1
1437} 1717}
1438 1718
1439############################################################################# 1719#############################################################################
1440 1720
1441package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1442 1722
1443our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1444 1724
1445sub new { 1725sub new {
1446 my $class = shift; 1726 my $class = shift;
1447 1727
1448 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1451 ) 1731 )
1452} 1732}
1453 1733
1454############################################################################# 1734#############################################################################
1455 1735
1456package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1457 1737
1458our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1459 1739
1460sub new { 1740sub new {
1461 my $class = shift; 1741 my $class = shift;
1462 1742
1463 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1466 ) 1746 )
1467} 1747}
1468 1748
1469############################################################################# 1749#############################################################################
1470 1750
1471package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1472 1752
1473our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1474 1754
1475use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1476 1756
1477sub new { 1757sub new {
1478 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1479 1759
1480 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1483 #active_bg => none 1763 #active_bg => none
1484 #font => default_font 1764 #font => default_font
1485 #text => initial text 1765 #text => initial text
1486 #markup => initial narkup 1766 #markup => initial narkup
1487 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1488 ellipsise => 3, # end 1769 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1490 fontsize => 1, 1771 fontsize => 1,
1491 align => -1, 1772 align => -1,
1492 valign => -1, 1773 valign => -1,
1493 padding_x => 2, 1774 padding_x => 2,
1494 padding_y => 2, 1775 padding_y => 2,
1495 can_events => 0, 1776 can_events => 0,
1496 %arg 1777 %arg
1497 ); 1778 );
1498 1779
1499 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1501 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1783 $self->{template} = $layout;
1503 } 1784 }
1504 1785
1505 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1509 } 1790 }
1510 1791
1511 $self 1792 $self
1512} 1793}
1513 1794
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1795sub update {
1525 my ($self) = @_; 1796 my ($self) = @_;
1526 1797
1527 delete $self->{texture}; 1798 delete $self->{texture};
1528 $self->SUPER::update; 1799 $self->SUPER::update;
1529} 1800}
1530 1801
1802sub realloc {
1803 my ($self) = @_;
1804
1805 delete $self->{ox};
1806 $self->SUPER::realloc;
1807}
1808
1531sub set_text { 1809sub set_text {
1532 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1533 1811
1534 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1536 1814
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1539 1816
1817 delete $self->{size_req};
1540 $self->realloc; 1818 $self->realloc;
1541 $self->update; 1819 $self->update;
1542} 1820}
1543 1821
1544sub set_markup { 1822sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1549 1827
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1829
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1554 1831
1832 delete $self->{size_req};
1555 $self->realloc; 1833 $self->realloc;
1556 $self->update; 1834 $self->update;
1557} 1835}
1558 1836
1559sub size_request { 1837sub size_request {
1560 my ($self) = @_; 1838 my ($self) = @_;
1561 1839
1840 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1842 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1843 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1846
1568 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1569 1848
1570 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1571 $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);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1853
1574 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1575 1855
1576 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1858 }
1859
1860 [$w, $h]
1578 } 1861 };
1579 1862
1580 ($w, $h) 1863 @{ $self->{size_req} }
1581} 1864}
1582 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1583sub size_allocate { 1870sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1585 1872
1586 delete $self->{ox}; 1873 delete $self->{ox};
1587 1874
1588 delete $self->{texture} 1875 delete $self->{texture}
1589 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
1590} 1879}
1591 1880
1592sub set_fontsize { 1881sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1594 1883
1595 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1596 delete $self->{texture}; 1886 delete $self->{texture};
1597 1887
1598 $self->realloc; 1888 $self->realloc;
1599} 1889}
1600 1890
1891sub reconfigure {
1892 my ($self) = @_;
1893
1894 delete $self->{size_req};
1895 delete $self->{texture};
1896
1897 $self->SUPER::reconfigure;
1898}
1899
1601sub _draw { 1900sub _draw {
1602 my ($self) = @_; 1901 my ($self) = @_;
1603 1902
1604 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1605 1904
1606 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1912
1614 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1615 }; 1914 };
1616 1915
1617 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1621 1920
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1924 };
1626 1925
1627 glEnable GL_TEXTURE_2D; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1928
1630 if ($tex->{format} == GL_ALPHA) { 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1930}
1639 1931
1640############################################################################# 1932#############################################################################
1641 1933
1642package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1643 1935
1644our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1645 1937
1646use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1647 1939
1648sub new { 1940sub new {
1649 my $class = shift; 1941 my $class = shift;
1650 1942
1651 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1655 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1656 can_hover => 1, 1948 can_hover => 1,
1657 can_focus => 1, 1949 can_focus => 1,
1658 valign => 0, 1950 valign => 0,
1659 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1660 #text => ... 1953 #text => ...
1954 #hidden => "*",
1661 @_ 1955 @_
1662 ) 1956 )
1663} 1957}
1664 1958
1665sub _set_text { 1959sub _set_text {
… …
1667 1961
1668 delete $self->{cur_h}; 1962 delete $self->{cur_h};
1669 1963
1670 return if $self->{text} eq $text; 1964 return if $self->{text} eq $text;
1671 1965
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1967 $self->{text} = $text;
1676 1968
1677 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1971 delete $self->{size_req};
1679 1972
1680 $self->_emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1974
1975 $self->realloc;
1976 $self->update;
1681} 1977}
1682 1978
1683sub set_text { 1979sub set_text {
1684 my ($self, $text) = @_; 1980 my ($self, $text) = @_;
1685 1981
1686 $self->{cursor} = length $text; 1982 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1983 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1984}
1691 1985
1692sub get_text { 1986sub get_text {
1693 $_[0]{text} 1987 $_[0]{text}
1694} 1988}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1700 1994
1701 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1702} 1996}
1703 1997
1704sub key_down { 1998sub invoke_key_down {
1705 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1706 2000
1707 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1710 2004
1711 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;
1712 2008
1713 if ($uni == 8) { 2009 if ($uni == 8) {
1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1715 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1716 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1717 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1718 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1719 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1720 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1721 } 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 = "";
1722 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 2033 $self->emit ('escape');
1727 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 2038 } else {
1730 return 0; 2039 return 0;
1731 } 2040 }
1732 2041
1733 $self->_set_text ($text); 2042 $self->_set_text ($text);
1734 2043
1735 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1736 2046
1737 1 2047 1
1738} 2048}
1739 2049
1740sub focus_in { 2050sub invoke_focus_in {
1741 my ($self) = @_; 2051 my ($self) = @_;
1742 2052
1743 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1744 2054
1745 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1746} 2056}
1747 2057
1748sub button_down { 2058sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1750 2060
1751 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 2062
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 2064
1755 # byte-index to char-index 2065 # byte-index to char-index
1756 my $text = $self->{text}; 2066 my $text = $self->{text};
1757 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1759 2069
1760 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1761 $self->update; 2071 $self->update;
1762 2072
1763 1 2073 1
1764} 2074}
1765 2075
1766sub mouse_motion { 2076sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1768# 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#
1769 2079
1770 0 2080 1
1771} 2081}
1772 2082
1773sub _draw { 2083sub _draw {
1774 my ($self) = @_; 2084 my ($self) = @_;
1775 2085
1776 local $self->{fg} = $self->{fg}; 2086 local $self->{fg} = $self->{fg};
1777 2087
1778 if ($FOCUS == $self) { 2088 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 2089 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 2090 $self->{fg} = $self->{active_fg};
1781 } else { 2091 } else {
1782 glColor @{$self->{bg}}; 2092 glColor_premultiply @{$self->{bg}};
1783 } 2093 }
1784 2094
1785 glEnable GL_BLEND; 2095 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 2097 glBegin GL_QUADS;
1788 glVertex 0 , 0; 2098 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 2099 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 2100 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 2101 glVertex $self->{w}, 0;
… …
1802 utf8::encode $text; 2112 utf8::encode $text;
1803 2113
1804 @$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)
1805 } 2115 }
1806 2116
1807 glColor @{$self->{fg}};
1808 glBegin GL_LINES; 2117 glBegin GL_LINES;
1809 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};
1810 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};
1811 glEnd; 2120 glEnd;
1812 } 2121 }
1813} 2122}
1814 2123
2124#############################################################################
2125
1815package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1816 2127
1817our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1818 2129
1819use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1820 2131
1821sub key_down { 2132sub invoke_key_down {
1822 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1823 2134
1824 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1825 2136
1826 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1827 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1829 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 2143 $self->emit (activate => $txt);
1832 $self->update; 2144 $self->update;
1833 2145
1834 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1837 } 2149 }
1838 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1841 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 } 2154 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 } 2156 }
1845 2157
1846 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1847 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849 2161
1850 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else { 2164 } else {
1853 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1854 } 2166 }
1855 2167
1856 } else { 2168 } else {
1857 return $self->SUPER::key_down ($ev) 2169 return $self->SUPER::invoke_key_down ($ev)
1858 } 2170 }
1859 2171
1860 1 2172 1
1861} 2173}
1862 2174
1863############################################################################# 2175#############################################################################
1864 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
1865package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1866 2217
1867our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1868 2219
1869use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1870 2221
1871my @tex = 2222my @tex =
1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1873 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1874 2225
1875sub new { 2226sub new {
1876 my $class = shift; 2227 my $class = shift;
1877 2228
… …
1886 can_events => 1, 2237 can_events => 1,
1887 @_ 2238 @_
1888 ) 2239 )
1889} 2240}
1890 2241
1891sub activate { }
1892
1893sub button_up { 2242sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1895 2244
1896 $self->emit ("activate") 2245 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2247 && $y >= 0 && $y < $self->{h};
… …
1901} 2250}
1902 2251
1903sub _draw { 2252sub _draw {
1904 my ($self) = @_; 2253 my ($self) = @_;
1905 2254
1906 local $self->{fg} = $self->{fg}; 2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2256
1912 glEnable GL_TEXTURE_2D; 2257 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2259 glColor 0, 0, 0, 1;
1915 2260
… …
1920 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1921} 2266}
1922 2267
1923############################################################################# 2268#############################################################################
1924 2269
1925package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1926 2271
1927our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1928 2273
1929my @tex = 2274my @tex =
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1932 2277
1933use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1934 2279
1935sub new { 2280sub new {
1936 my $class = shift; 2281 my $class = shift;
1937 2282
1938 $class->SUPER::new ( 2283 $class->SUPER::new (
… …
1952 my ($self) = @_; 2297 my ($self) = @_;
1953 2298
1954 (6) x 2 2299 (6) x 2
1955} 2300}
1956 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1957sub button_down { 2310sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1959 2312
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2315 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2316 } else {
1965 return 0 2317 return 0
1966 } 2318 }
1967 2319
1968 1 2320 1
… …
1988 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
1989} 2341}
1990 2342
1991############################################################################# 2343#############################################################################
1992 2344
1993package CFClient::UI::Image; 2345package CFPlus::UI::Image;
1994 2346
1995our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
1996 2348
1997use CFClient::OpenGL; 2349use CFPlus::OpenGL;
1998use Carp qw/confess/;
1999 2350
2000our %loaded_images; 2351our %texture_cache;
2001 2352
2002sub new { 2353sub new {
2003 my $class = shift; 2354 my $class = shift;
2004 2355
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2006 2360
2007 $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";
2008 2363
2009 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 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;
2011 2366
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2013 2368
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2370
2018 $self 2371 $self
2019} 2372}
2020 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
2021sub size_request { 2389sub size_request {
2022 my ($self) = @_; 2390 my ($self) = @_;
2023 2391
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
2025} 2393}
2026 2394
2027sub _draw { 2395sub _draw {
2028 my ($self) = @_; 2396 my ($self) = @_;
2029 2397
… …
2039 } 2407 }
2040 2408
2041 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2411
2044 $tex->draw_quad_alpha (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
2045 2413
2046 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2047} 2415}
2048 2416
2049############################################################################# 2417#############################################################################
2050 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
2051package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
2052 2456
2053our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2054 2458
2055use List::Util qw(min max); 2459use List::Util qw(min max);
2056 2460
2057use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2058 2462
2059my %tex = ( 2463my %tex = (
2060 food => [ 2464 food => [
2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2063 ], 2467 ],
2064 grace => [ 2468 grace => [
2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2066 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/
2067 ], 2471 ],
2068 hp => [ 2472 hp => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2071 ], 2475 ],
2072 mana => [ 2476 mana => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 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/
2075 ], 2479 ],
2076); 2480);
2077 2481
2078# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2544
2141 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2142 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);
2143 2550
2144 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2145 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;
2146 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2556
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2557 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2558 glBegin GL_QUADS;
… …
2165 2573
2166 if ($t3) { 2574 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2581 glEnd;
2174 } 2582 }
2175 2583
2176 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2178} 2586}
2179 2587
2180############################################################################# 2588#############################################################################
2181 2589
2182package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2183 2591
2184our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2185 2593
2186sub new { 2594sub new {
2187 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2188 2596
2189 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2191 can_hover => 1, 2599 can_hover => 1,
2192 can_events => 1, 2600 can_events => 1,
2193 %arg, 2601 %arg,
2194 ); 2602 );
2195 2603
2196 $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");
2197 $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);
2198 $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");
2199 2607
2200 $self 2608 $self
2201} 2609}
2202 2610
2203sub set_fontsize { 2611sub set_fontsize {
… …
2224 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2225} 2633}
2226 2634
2227############################################################################# 2635#############################################################################
2228 2636
2229package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2230 2638
2231use strict; 2639use strict;
2232 2640
2233use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2234 2642
2235our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2236 2644
2237my @tex = 2645my @tex =
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2239 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2240 2648
2241sub new { 2649sub new {
2242 my $class = shift; 2650 my $class = shift;
2243 2651
… …
2264 $self->update; 2672 $self->update;
2265 2673
2266 $self 2674 $self
2267} 2675}
2268 2676
2269sub changed { }
2270
2271sub set_range { 2677sub set_range {
2272 my ($self, $range) = @_; 2678 my ($self, $range) = @_;
2273 2679
2274 ($range, $self->{range}) = ($self->{range}, $range); 2680 ($range, $self->{range}) = ($self->{range}, $range);
2275 2681
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2682 if ("@$range" ne "@{$self->{range}}") {
2683 $self->update;
2684 $self->set_value ($self->{range}[0]);
2685 }
2278} 2686}
2279 2687
2280sub set_value { 2688sub set_value {
2281 my ($self, $value) = @_; 2689 my ($self, $value) = @_;
2282 2690
… …
2293 if $unit; 2701 if $unit;
2294 2702
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2704
2297 if ($value != $old_value) { 2705 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2706 $self->emit (changed => $value);
2299 $self->update; 2707 $self->update;
2300 } 2708 }
2301} 2709}
2302 2710
2303sub size_request { 2711sub size_request {
2304 my ($self) = @_; 2712 my ($self) = @_;
2305 2713
2306 ($self->{req_w}, $self->{req_h}) 2714 ($self->{req_w}, $self->{req_h})
2307} 2715}
2308 2716
2309sub button_down { 2717sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2311 2719
2312 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2721
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2723
2316 $self->mouse_motion ($ev, $x, $y) 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2725}
2318 2726
2319sub mouse_motion { 2727sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2321 2729
2322 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2732
… …
2332 } 2740 }
2333 2741
2334 1 2742 1
2335} 2743}
2336 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
2755}
2756
2337sub update { 2757sub update {
2338 my ($self) = @_; 2758 my ($self) = @_;
2339 2759
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2760 delete $self->{knob_w};
2761 $self->SUPER::update;
2762}
2763
2764sub _draw {
2765 my ($self) = @_;
2766
2767 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2768 $self->set_value ($self->{range}[0]);
2342 2769
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2770 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2771 my $range = ($hi - $page - $lo) || 1e-100;
2345 2772
… …
2351 $value = ($value - $lo) / $range; 2778 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2779 $value = $value * $self->{scale} + $self->{offset};
2353 2780
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2781 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2782 $self->{knob_w} = $knob_w;
2356 }); 2783 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2784
2364 $self->SUPER::_draw (); 2785 $self->SUPER::_draw ();
2365 2786
2366 glScale $self->{w}, $self->{h}; 2787 glScale $self->{w}, $self->{h};
2367 2788
… …
2387 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2388} 2809}
2389 2810
2390############################################################################# 2811#############################################################################
2391 2812
2392package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2393 2814
2394our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2395 2816
2396sub new { 2817sub new {
2397 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2398 2819
2399 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2400 2821
2401 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift }, 2825 to_value => sub { shift },
2405 from_value => sub { shift }, 2826 from_value => sub { shift },
2406 %arg, 2827 %arg,
2407 ); 2828 );
2408 2829
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2430 2851
2431############################################################################# 2852#############################################################################
2432 2853
2433package CFClient::UI::TextView; 2854package CFPlus::UI::TextScroller;
2434 2855
2435our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2436 2857
2437use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2438 2859
2439sub new { 2860sub new {
2440 my $class = shift; 2861 my $class = shift;
2441 2862
2442 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2443 fontsize => 1, 2864 fontsize => 1,
2444 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2445 #font => default_font 2867 #font => default_font
2446 @_, 2868 @_,
2447 2869
2448 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2449 par => [], 2871 par => [],
2872 max_par => 0,
2450 height => 0, 2873 height => 0,
2451 children => [ 2874 children => [
2452 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2454 ], 2877 ],
2455 ); 2878 );
2456 2879
2457 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2458 2881
… …
2464 2887
2465 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2889 $self->reflow;
2467} 2890}
2468 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
2469sub size_allocate { 2901sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2471 2903
2472 $self->SUPER::size_allocate ($w, $h); 2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2906
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $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});
2477 2911
2478 $self->reflow; 2912 $self->reflow;
2479}
2480 2913
2481sub text_size { 2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2482 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) = @_;
2483 2930
2484 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2485 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $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});
2488 $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}}
2489 2944 );
2945
2490 $layout->size 2946 $layout
2491} 2947}
2492 2948
2493sub reflow { 2949sub reflow {
2494 my ($self) = @_; 2950 my ($self) = @_;
2495 2951
… …
2502 2958
2503 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2505} 2961}
2506 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
2507sub clear { 2978sub clear {
2508 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2509 2983
2510 $self->{par} = []; 2984 $self->{par} = [];
2511 $self->{height} = 0; 2985 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2987}
2514 2988
2515sub add_paragraph { 2989sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2517 2991
2518 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2519 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
2520 $self->{height} += $h; 3044 $self->{height} = $height;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2522 }
2523 3046
2524 $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 }
2525} 3053}
2526 3054
2527sub update { 3055sub update {
2528 my ($self) = @_; 3056 my ($self) = @_;
2529 3057
… …
2531 3059
2532 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2533 3061
2534 delete $self->{texture}; 3062 delete $self->{texture};
2535 3063
2536 $ROOT->on_post_alloc ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 3068
2539 if (delete $self->{need_reflow}) {
2540 my $height = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2557
2558 $self->{height} = $height;
2559
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561
2562 delete $self->{texture};
2563 }
2564
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 3070 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2568 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;
2569 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2570 3082
2571 my $y0 = $top; 3083 my $y0 = $top;
2572 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2573 3085
2574 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2586 3089
2587 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 3092
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2593 3094
2594 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2595 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 }
2596 } 3107 }
2597 3108
2598 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2599 } 3111 }
2600 3112
2601 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2602 }; 3114 };
2603 }); 3115 });
2604} 3116}
2605 3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
3125}
3126
2606sub _draw { 3127sub _draw {
2607 my ($self) = @_; 3128 my ($self) = @_;
2608 3129
2609 glEnable GL_TEXTURE_2D; 3130 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 3132 glColor 0, 0, 0, 1;
2612 $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});
2613 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2614 3135
2615 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2616
2617} 3137}
2618 3138
2619############################################################################# 3139#############################################################################
2620 3140
2621package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2622 3142
2623use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2624 3144
2625our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2626 3146
2627sub moveto { 3147sub moveto {
2628 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2629 3149
2630 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2658 glPopMatrix; 3178 glPopMatrix;
2659} 3179}
2660 3180
2661############################################################################# 3181#############################################################################
2662 3182
2663package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2664 3184
2665our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2666 3186
2667sub new { 3187sub new {
2668 my $class = shift; 3188 my $class = shift;
2669 3189
2670 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2682 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2683} 3203}
2684 3204
2685############################################################################# 3205#############################################################################
2686 3206
2687package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2688 3208
2689our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2690 3210
2691use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2692 3212
2693sub new { 3213sub new {
2694 my $class = shift; 3214 my $class = shift;
2695 3215
2696 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2699 ) 3219 )
2700} 3220}
2701 3221
2702sub set_tooltip_from { 3222sub set_tooltip_from {
2703 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2704 3227
2705 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2706 3229
2707 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 3233 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 3234 . "visible $widget->{visible}";
2712 } 3235 }
2713 3236
3237 $tooltip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//;
3239
2714 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2715 markup => $tooltip, 3241 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 3243 fontsize => 0.8,
2718 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2719 ellipsise => 0, 3245 ellipsise => 0,
2720 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2721 ); 3247 );
2722} 3248}
2723 3249
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3254
2729 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2730} 3256}
2731 3257
2732sub size_allocate { 3258sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2734 3260
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3262}
2737 3263
2738sub visibility_change { 3264sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3265 my ($self, $visible) = @_;
2740 3266
2741 return unless $visible; 3267 return unless $visible;
2742 3268
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2745 or return; 3271 or return;
2746 3272
3273 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3275
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3277 if $x + $self->{w} > $self->{root}{w};
2751 3278
2752 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2753 }); 3283 });
2754} 3284}
2755 3285
2756sub _draw { 3286sub _draw {
2757 my ($self) = @_; 3287 my ($self) = @_;
… …
2781 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2782} 3312}
2783 3313
2784############################################################################# 3314#############################################################################
2785 3315
2786package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2787 3317
2788our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2789 3319
2790use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2791 3321
2792sub new { 3322sub new {
2793 my $class = shift; 3323 my $class = shift;
2794 3324
2795 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2797 can_events => 0, 3327 can_events => 0,
2798 @_, 3328 @_,
2799 ); 3329 );
2800 3330
2801 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2802 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2803 3333
2804 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2805 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2806 hard => 1, 3336 hard => 1,
2807 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2808 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2809 ++$widget->{frame}; 3340 ++$widget->{frame};
2810 $widget->update; 3341 $widget->update;
2811 }, 3342 },
2812 ); 3343 );
2813 } 3344 }
… …
2830sub _draw { 3361sub _draw {
2831 my ($self) = @_; 3362 my ($self) = @_;
2832 3363
2833 return unless $::CONN; 3364 return unless $::CONN;
2834 3365
3366 $self->SUPER::_draw;
3367
2835 my $face; 3368 my $face;
2836 3369
2837 if ($self->{frame}) { 3370 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
2839 3372
2840 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
2841 if $anim && @$anim; 3374 if $anim && @$anim;
2842 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
2843 3379
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2845 3381
2846 if ($tex) { 3382 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3385 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2852 } 3392 }
2853} 3393}
2854 3394
2855sub DESTROY { 3395sub destroy {
2856 my ($self) = @_; 3396 my ($self) = @_;
2857 3397
2858 $self->{timer}->cancel 3398 $self->{timer}->cancel
2859 if $self->{timer}; 3399 if $self->{timer};
2860 3400
2861 $self->SUPER::DESTROY; 3401 $self->SUPER::destroy;
2862} 3402}
2863 3403
2864############################################################################# 3404#############################################################################
2865 3405
2866package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
2867 3407
2868our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2869 3409
2870# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
2871 3411
2872############################################################################# 3412#############################################################################
2873 3413
2874package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2875 3415
2876our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2877 3417
2878use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2879 3419
2880sub new { 3420sub new {
2881 my $class = shift; 3421 my $class = shift;
2882 3422
2883 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2884 items => [], 3424 items => [],
2885 z => 100, 3425 z => 100,
2886 @_, 3426 @_,
2887 ); 3427 );
2888 3428
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2890 3430
2891 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
2893 3433
2894 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
2895 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
2896 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
2897 can_hover => 1, 3440 can_hover => 1,
2898 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
2899 text => $widget; 3453 markup => $widget,
3454 tooltip => $tooltip;
3455 }
2900 } 3456 }
2901 3457
2902 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
2903 3459
2904 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
2909 3465
2910# popup given the event (must be a mouse button down event currently) 3466# popup given the event (must be a mouse button down event currently)
2911sub popup { 3467sub popup {
2912 my ($self, $ev) = @_; 3468 my ($self, $ev) = @_;
2913 3469
2914 $self->_emit ("popdown"); 3470 $self->emit ("popdown");
2915 3471
2916 # maybe save $GRAB? must be careful about events... 3472 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3473 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3474 $self->{button} = $ev->{button};
2919 3475
2920 $self->show; 3476 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3477 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3478}
2923 3479
2924sub mouse_motion { 3480sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2926 3482
2927 # TODO: should use vbox->find_widget or so 3483 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3484 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3485 $self->{hover} = $self->{item}{$HOVER};
2930 3486
2931 0 3487 0
2932} 3488}
2933 3489
2934sub button_up { 3490sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3491 my ($self, $ev, $x, $y) = @_;
2936 3492
2937 if ($ev->{button} == $self->{button}) { 3493 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3494 undef $GRAB;
2939 $self->hide; 3495 $self->hide;
2940 3496
2941 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3498 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3499 } else {
2944 return 0 3500 return 0
2945 } 3501 }
2946 3502
2947 1 3503 1
2948} 3504}
2949 3505
2950############################################################################# 3506#############################################################################
2951 3507
2952package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
2953 3509
2954our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
2955 3511
2956sub new { 3512sub new {
2957 my $class = shift; 3513 my $class = shift;
2958 3514
2959 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
2973 3529
2974 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3531 if @{ $self->{children} };
2976} 3532}
2977 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
2978sub set_current_page { 3540sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
2980 3542
2981 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3544 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3545 : $self->{children}[$page_or_widget];
2984 3546
2985 $self->{current} = $widget; 3547 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3548 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3549
2988 $self->_emit (page_changed => $self->{current}); 3550 $self->emit (page_changed => $self->{current});
2989 3551
2990 $self->realloc; 3552 $self->realloc;
2991} 3553}
2992 3554
2993sub visible_children { 3555sub visible_children {
… …
2998 my ($self) = @_; 3560 my ($self) = @_;
2999 3561
3000 $self->{current}->size_request 3562 $self->{current}->size_request
3001} 3563}
3002 3564
3003sub size_allocate { 3565sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3566 my ($self, $w, $h) = @_;
3005 3567
3006 $self->{current}->configure (0, 0, $w, $h); 3568 $self->{current}->configure (0, 0, $w, $h);
3569
3570 1
3007} 3571}
3008 3572
3009sub _draw { 3573sub _draw {
3010 my ($self) = @_; 3574 my ($self) = @_;
3011 3575
3012 $self->{current}->draw; 3576 $self->{current}->draw;
3013} 3577}
3014 3578
3015############################################################################# 3579#############################################################################
3016 3580
3017package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3018 3582
3019our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3020 3584
3021sub new { 3585sub new {
3022 my $class = shift; 3586 my $class = shift;
3023 3587
3024 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3591 # filter => # will be put between multiplexer and $self
3027 @_, 3592 @_,
3028 ); 3593 );
3029 3594
3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3596 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3597
3032 $self 3598 $self
3033} 3599}
3034 3600
3035sub add { 3601sub add {
3036 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3037 3603
3038 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3039 3605
3040 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3041 markup => $title, 3607 markup => $title,
3042 tooltip => $tooltip, 3608 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3044 ); 3610 );
3045 3611
3046 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3047} 3613}
3048 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3049sub set_current_page { 3621sub set_current_page {
3050 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3051 3623
3052 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3626}
3055 3627
3056############################################################################# 3628#############################################################################
3057 3629
3058package CFClient::UI::Statusbox; 3630package CFPlus::UI::Selector;
3059 3631
3632use utf8;
3633
3060our @ISA = CFClient::UI::VBox::; 3634our @ISA = CFPlus::UI::Button::;
3061 3635
3062sub new { 3636sub new {
3063 my $class = shift; 3637 my $class = shift;
3064 3638
3065 $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
3640 options => [], # [value, title, longdesc], ...
3641 value => undef,
3642 @_,
3643 );
3644
3645 $self->_set_value ($self->{value});
3646
3647 $self
3648}
3649
3650sub invoke_button_down {
3651 my ($self, $ev) = @_;
3652
3653 my @menu_items;
3654
3655 for (@{ $self->{options} }) {
3656 my ($value, $title, $tooltip) = @$_;
3657
3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3659 }
3660
3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3662}
3663
3664sub _set_value {
3665 my ($self, $value) = @_;
3666
3667 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3668 or return;
3669
3670 $self->{value} = $item->[0];
3671 $self->set_markup ("$item->[1] ⇓");
3672 $self->set_tooltip ($item->[2]);
3673}
3674
3675sub set_value {
3676 my ($self, $value) = @_;
3677
3678 return unless $self->{value} ne $value;
3679
3680 $self->_set_value ($value);
3681 $self->emit (changed => $value);
3682}
3683
3684#############################################################################
3685
3686package CFPlus::UI::Statusbox;
3687
3688our @ISA = CFPlus::UI::VBox::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3694 fontsize => 0.8,
3067 @_, 3695 @_,
3068 ) 3696 );
3697
3698 CFPlus::weaken (my $this = $self);
3699
3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3701
3702 $self
3069} 3703}
3070 3704
3071sub reorder { 3705sub reorder {
3072 my ($self) = @_; 3706 my ($self) = @_;
3073 my $NOW = time; 3707 my $NOW = Time::HiRes::time;
3708
3709 # freeze display when hovering over any label
3710 return if $CFPlus::UI::TOOLTIP->{owner}
3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3712 values %{ $self->{item} };
3074 3713
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3716 }
3078 3717
… …
3081 my @items = sort { 3720 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3721 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3722 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3723 } values %{ $self->{item} };
3085 3724
3725 $self->{timer}->interval (1);
3726
3086 my $count = 10 + 1; 3727 my $count = 10 + 1;
3087 for my $item (@items) { 3728 for my $item (@items) {
3088 last unless --$count; 3729 last unless --$count;
3089 3730
3090 push @widgets, $item->{label} ||= do { 3731 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3732 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3733 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3734 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3735 : $item->{text};
3095 3736
3096 for ($short) { 3737 for ($short) {
3097 s/^\s+//; 3738 s/^\s+//;
3098 s/\s+/ /g; 3739 s/\s+/ /g;
3099 } 3740 }
3100 3741
3101 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3102 markup => $short, 3743 markup => $short,
3103 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3748 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3749 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3750 can_events => 1,
3110 can_hover => 1 3751 can_hover => 1
3111 }; 3752 };
3753
3754 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3755 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3756 $label->update;
3757 $label->set_max_size (undef, $label->{req_h} * $diff)
3758 if $diff < 1;
3759 $self->{timer}->interval (1/30);
3760 } else {
3761 $label->{fg}[3] = $item->{fg}[3] || 1;
3762 }
3763
3764 push @widgets, $label;
3112 } 3765 }
3113 3766
3114 $self->clear; 3767 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3768 $self->SUPER::add (reverse @widgets);
3116} 3769}
… …
3121 $text =~ s/^\s+//; 3774 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3775 $text =~ s/\s+$//;
3123 3776
3124 return unless $text; 3777 return unless $text;
3125 3778
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3779 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3780
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3781 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3782
3130 if (my $item = $self->{item}{$group}) { 3783 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3784 if ($item->{text} eq $text) {
3132 $item->{count}++; 3785 $item->{count}++;
3133 } else { 3786 } else {
3134 $item->{count} = 1; 3787 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3788 $item->{text} = $item->{tooltip} = $text;
3136 } 3789 }
3137 $item->{id} = ++$self->{id}; 3790 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3791 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3792 delete $item->{label};
3140 } else { 3793 } else {
3141 $self->{item}{$group} = { 3794 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3795 id => ++$self->{id},
… …
3148 count => 1, 3801 count => 1,
3149 %arg, 3802 %arg,
3150 }; 3803 };
3151 } 3804 }
3152 3805
3806 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3807 $self->reorder;
3808 });
3154} 3809}
3155 3810
3156sub reconfigure { 3811sub reconfigure {
3157 my ($self) = @_; 3812 my ($self) = @_;
3158 3813
… …
3161 3816
3162 $self->reorder; 3817 $self->reorder;
3163 $self->SUPER::reconfigure; 3818 $self->SUPER::reconfigure;
3164} 3819}
3165 3820
3821sub destroy {
3822 my ($self) = @_;
3823
3824 $self->{timer}->cancel;
3825
3826 $self->SUPER::destroy;
3827}
3828
3166############################################################################# 3829#############################################################################
3167 3830
3168package CFClient::UI::Inventory;
3169
3170our @ISA = CFClient::UI::ScrolledWindow::;
3171
3172sub new {
3173 my $class = shift;
3174
3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_,
3419 )
3420}
3421
3422# XXX: Do sorting? Argl...
3423sub add_spell {
3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3426
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3465 3832
3466our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3467 3834
3835use List::Util qw(min max);
3836
3468use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3469 3838
3470sub new { 3839sub new {
3471 my $class = shift; 3840 my $class = shift;
3472 3841
3473 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3474 visible => 1, 3843 visible => 1,
3475 @_, 3844 @_,
3476 ); 3845 );
3477 3846
3478 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3479 3848
3480 $self 3849 $self
3481} 3850}
3482 3851
3483sub size_request { 3852sub size_request {
… …
3498 $coord = $max - $size if $coord > $max - $size; 3867 $coord = $max - $size if $coord > $max - $size;
3499 3868
3500 int $coord + 0.5 3869 int $coord + 0.5
3501} 3870}
3502 3871
3503sub size_allocate { 3872sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3873 my ($self, $w, $h) = @_;
3505 3874
3506 for my $child ($self->children) { 3875 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3876 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3877
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3881 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3882 $Y = _to_pixel $Y, $H, $self->{h};
3514 3883
3515 $child->configure ($X, $Y, $W, $H); 3884 $child->configure ($X, $Y, $W, $H);
3516 } 3885 }
3886
3887 1
3517} 3888}
3518 3889
3519sub coord2local { 3890sub coord2local {
3520 my ($self, $x, $y) = @_; 3891 my ($self, $x, $y) = @_;
3521 3892
… …
3606 3977
3607 delete $queue{$widget+0}; 3978 delete $queue{$widget+0};
3608 3979
3609 my ($w, $h) = $widget->size_request; 3980 my ($w, $h) = $widget->size_request;
3610 3981
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3982 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3983 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3984
3985 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3986 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3987
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3988 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3989 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3990
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3991 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 4017
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 4019
3646 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 4031
3649 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3651 4034
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3677 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3678 glLoadIdentity; 4061 glLoadIdentity;
3679 4062
3680 { 4063 {
3681 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3682 4065
3683 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3685 }
3686 4068
3687 $self->_draw; 4069 $self->_draw;
4070 }
3688} 4071}
3689 4072
3690############################################################################# 4073#############################################################################
3691 4074
3692package CFClient::UI; 4075package CFPlus::UI;
3693 4076
3694$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3695$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3696 4079
36971 40801
3698 4081

Diff Legend

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