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

Diff Legend

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