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

Diff Legend

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