ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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