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

Diff Legend

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