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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 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) = @_;
291 322
292 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
293 324
294 $visible ? $self->hide 325 $visible ? $self->show
295 : $self->show; 326 : $self->hide;
296} 327}
297 328
298sub toggle_visibility { 329sub toggle_visibility {
299 my ($self) = @_; 330 my ($self) = @_;
300 331
… …
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::Table::;
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 $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
935 vertical => 1, 1057 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1059 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939 }, 1062 },
940 ; 1063 ;
941 1064
942 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
944 slider => $slider, 1068 hslider => $hslider,
945 @_, 1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1072 %arg,
946 ); 1073 );
947 1074
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp}); 1075 $self->SUPER::add (0, 0, $self->{vp});
950 $self->add ($self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1079 $self->add ($child) if $child;
951 1080
952 $self 1081 $self
953} 1082}
954 1083
1084#TODO# update range on size_allocate depending on child
1085
1086sub add {
1087 my ($self, $widget) = @_;
1088
1089 $self->{vp}->add ($self->{child} = $widget);
1090}
1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1112}
1113
955sub update { 1114sub update {
956 my ($self) = @_; 1115 my ($self) = @_;
957 1116
958 $self->SUPER::update; 1117 $self->SUPER::update;
959 1118 $self->update_slider;
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1119}
964 1120
965sub size_allocate { 1121sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
967 1123
1124 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1125 $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} 1126}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1127
977############################################################################# 1128#############################################################################
978 1129
979package CFClient::UI::Frame; 1130package CFPlus::UI::Frame;
980 1131
981our @ISA = CFClient::UI::Bin::; 1132our @ISA = CFPlus::UI::Bin::;
982 1133
983use CFClient::OpenGL; 1134use CFPlus::OpenGL;
984 1135
985sub new { 1136sub new {
986 my $class = shift; 1137 my $class = shift;
987 1138
988 $class->SUPER::new ( 1139 $class->SUPER::new (
… …
996 1147
997 if ($self->{bg}) { 1148 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1149 my ($w, $h) = @$self{qw(w h)};
999 1150
1000 glEnable GL_BLEND; 1151 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1152 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1153 glColor_premultiply @{ $self->{bg} };
1003 1154
1004 glBegin GL_QUADS; 1155 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1156 glVertex 0 , 0;
1006 glVertex 0 , $h; 1157 glVertex 0 , $h;
1007 glVertex $w, $h; 1158 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1165 $self->SUPER::_draw;
1015} 1166}
1016 1167
1017############################################################################# 1168#############################################################################
1018 1169
1019package CFClient::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1020 1171
1021our @ISA = CFClient::UI::Bin::; 1172our @ISA = CFPlus::UI::Bin::;
1022 1173
1023use CFClient::OpenGL; 1174use CFPlus::OpenGL;
1175
1176sub new {
1177 my ($class, %arg) = @_;
1178
1179 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label
1181 align => 1,
1182 valign => 0,
1183 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75;
1185 }
1186
1187 my $self = $class->SUPER::new (
1188 # label => "",
1189 fg => [0.6, 0.3, 0.1],
1190 border => 0.8,
1191 style => 'single',
1192 %arg,
1193 );
1194
1195 $self
1196}
1197
1198sub add {
1199 my ($self, @widgets) = @_;
1200
1201 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1203}
1204
1205sub border {
1206 int $_[0]{border} * $::FONTSIZE
1207}
1208
1209sub size_request {
1210 my ($self) = @_;
1211
1212 ($self->{label_w}, undef) = $self->{label}->size_request
1213 if $self->{label};
1214
1215 my ($w, $h) = $self->SUPER::size_request;
1216
1217 (
1218 $w + $self->border * 2,
1219 $h + $self->border * 2,
1220 )
1221}
1222
1223sub invoke_size_allocate {
1224 my ($self, $w, $h) = @_;
1225
1226 my $border = $self->border;
1227
1228 $w -= List::Util::max 0, $border * 2;
1229 $h -= List::Util::max 0, $border * 2;
1230
1231 if (my $label = $self->{label}) {
1232 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1233 $label->{h} = List::Util::min $h, $border;
1234 $label->invoke_size_allocate ($label->{w}, $label->{h});
1235 }
1236
1237 $self->child->configure ($border, $border, $w, $h);
1238
1239 1
1240}
1241
1242sub _draw {
1243 my ($self) = @_;
1244
1245 my $child = $self->{children}[0];
1246
1247 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h});
1249
1250 $child->draw;
1251
1252 glColor @{$self->{fg}};
1253 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1258 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1259 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1260 glEnd;
1261
1262 if ($self->{label}) {
1263 glTranslate $border * 2, 0;
1264 $self->{label}->_draw;
1265 }
1266}
1267
1268#############################################################################
1269
1270package CFPlus::UI::Toplevel;
1271
1272our @ISA = CFPlus::UI::Bin::;
1273
1274use CFPlus::OpenGL;
1024 1275
1025my $bg = 1276my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1278 mipmap => 1, wrap => 1;
1028 1279
1029my @border = 1280my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1281 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); 1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1283
1033sub new { 1284sub new {
1034 my $class = shift; 1285 my ($class, %arg) = @_;
1035 1286
1036 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1288 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1289 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1290 border => 0.6,
1040 can_events => 1, 1291 can_events => 1,
1041 min_w => 16, 1292 min_w => 64,
1042 min_h => 16, 1293 min_h => 32,
1043 @_ 1294 %arg,
1044 ); 1295 );
1045 1296
1046 $self->{title} &&= new CFClient::UI::Label 1297 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1298 align => 0,
1048 valign => 1, 1299 valign => 1,
1049 text => $self->{title}, 1300 text => $self->{title},
1050 fontsize => $self->{border}; 1301 fontsize => $self->{border},
1302 if exists $self->{title};
1303
1304 if ($self->{has_close_button}) {
1305 $self->{close_button} =
1306 new CFPlus::UI::ImageButton
1307 path => 'x1_close.png',
1308 on_activate => sub { $self->emit ("delete") };
1309
1310 $self->CFPlus::UI::Container::add ($self->{close_button});
1311 }
1051 1312
1052 $self 1313 $self
1314}
1315
1316sub add {
1317 my ($self, @widgets) = @_;
1318
1319 $self->SUPER::add (@widgets);
1320 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1322}
1054 1323
1055sub border { 1324sub border {
1056 int $_[0]{border} * $::FONTSIZE 1325 int $_[0]{border} * $::FONTSIZE
1057} 1326}
1058 1327
1059sub size_request { 1328sub size_request {
1060 my ($self) = @_; 1329 my ($self) = @_;
1330
1331 $self->{title_widget}->size_request
1332 if $self->{title_widget};
1333
1334 $self->{close_button}->size_request
1335 if $self->{close_button};
1061 1336
1062 my ($w, $h) = $self->SUPER::size_request; 1337 my ($w, $h) = $self->SUPER::size_request;
1063 1338
1064 ( 1339 (
1065 $w + $self->border * 2, 1340 $w + $self->border * 2,
1066 $h + $self->border * 2, 1341 $h + $self->border * 2,
1067 ) 1342 )
1068} 1343}
1069 1344
1070sub size_allocate { 1345sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1346 my ($self, $w, $h) = @_;
1072 1347
1348 if ($self->{title_widget}) {
1349 $self->{title_widget}{w} = $w;
1350 $self->{title_widget}{h} = $h;
1351 $self->{title_widget}->invoke_size_allocate ($w, $h);
1352 }
1353
1354 my $border = $self->border;
1355
1073 $h -= List::Util::max 0, $self->border * 2; 1356 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1357 $w -= List::Util::max 0, $border * 2;
1075 1358
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); 1359 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1360
1361 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1362 if $self->{close_button};
1363
1364 1
1365}
1366
1367sub invoke_delete {
1368 my ($self) = @_;
1369
1370 $self->hide;
1371
1372 1
1373}
1374
1082sub button_down { 1375sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1376 my ($self, $ev, $x, $y) = @_;
1084 1377
1085 my ($w, $h) = @$self{qw(w h)}; 1378 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1379 my $border = $self->border;
1087 1380
… …
1103 my $dy = $ev->{y} - $oy; 1396 my $dy = $ev->{y} - $oy;
1104 1397
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1398 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1399 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1400
1401 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1402 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1403 };
1111 1404
1112 } elsif ($lr ^ $td) { 1405 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1406 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1407 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1410 my ($ev, $x, $y) = @_;
1118 1411
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1412 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1413
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1414 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1415 # HACK: the next line is required to enforce placement
1416 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1417 };
1418 } else {
1419 return 0;
1420 }
1421
1123 } 1422 1
1124} 1423}
1125 1424
1126sub button_up { 1425sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1426 my ($self, $ev, $x, $y) = @_;
1128 1427
1129 delete $self->{motion}; 1428 ! ! delete $self->{motion}
1130} 1429}
1131 1430
1132sub mouse_motion { 1431sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1432 my ($self, $ev, $x, $y) = @_;
1134 1433
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1434 $self->{motion}->($ev, $x, $y) if $self->{motion};
1435
1436 ! ! $self->{motion}
1437}
1438
1439sub invoke_visibility_change {
1440 my ($self, $visible) = @_;
1441
1442 delete $self->{motion} unless $visible;
1443
1444 0
1136} 1445}
1137 1446
1138sub _draw { 1447sub _draw {
1139 my ($self) = @_; 1448 my ($self) = @_;
1140 1449
1450 my $child = $self->{children}[0];
1451
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1452 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1453 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1454
1144 glEnable GL_TEXTURE_2D; 1455 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1457
1147 my $border = $self->border; 1458 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1473 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1474 }
1164 1475
1165 glDisable GL_TEXTURE_2D; 1476 glDisable GL_TEXTURE_2D;
1166 1477
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1478 $child->draw;
1479
1480 if ($self->{title_widget}) {
1481 glTranslate 0, $border - $self->{h};
1482 $self->{title_widget}->_draw;
1483
1484 glTranslate 0, - ($border - $self->{h});
1485 }
1486
1487 $self->{close_button}->draw
1488 if $self->{close_button};
1170} 1489}
1171 1490
1172############################################################################# 1491#############################################################################
1173 1492
1174package CFClient::UI::Table; 1493package CFPlus::UI::Table;
1175 1494
1176our @ISA = CFClient::UI::Base::; 1495our @ISA = CFPlus::UI::Base::;
1177 1496
1178use List::Util qw(max sum); 1497use List::Util qw(max sum);
1179 1498
1180use CFClient::OpenGL; 1499use CFPlus::OpenGL;
1181 1500
1182sub new { 1501sub new {
1183 my $class = shift; 1502 my $class = shift;
1184 1503
1185 $class->SUPER::new ( 1504 $class->SUPER::new (
1186 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1187 @_, 1507 @_,
1188 ) 1508 )
1189} 1509}
1190 1510
1191sub children { 1511sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193} 1513}
1194 1514
1195sub add { 1515sub add {
1196 my ($self, $x, $y, $child) = @_; 1516 my ($self) = shift;
1197 1517
1518 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, ();
1198 $child->set_parent ($self); 1520 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1521 $self->{children}[$y][$x] = $child;
1522 }
1200 1523
1524 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1;
1201 $self->realloc; 1526 $self->realloc;
1527}
1528
1529sub remove {
1530 my ($self, $child) = @_;
1531
1532 # TODO: not yet implemented
1202} 1533}
1203 1534
1204# TODO: move to container class maybe? send children a signal on removal? 1535# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1536sub clear {
1206 my ($self) = @_; 1537 my ($self) = @_;
… …
1247 (sum @$ws), 1578 (sum @$ws),
1248 (sum @$hs), 1579 (sum @$hs),
1249 ) 1580 )
1250} 1581}
1251 1582
1252sub size_allocate { 1583sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1254 1585
1255 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1256 1587
1257 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1259 1590
1260 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1261 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1264 1595
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1597
1269 CFClient::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1270 CFClient::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1271 1607
1272 my $y; 1608 my $y;
1273 1609
1274 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
1275 my $row = $self->{children}[$r] 1611 my $row = $self->{children}[$r]
… …
1289 } 1625 }
1290 1626
1291 $y += $row_h; 1627 $y += $row_h;
1292 } 1628 }
1293 1629
1630 1
1294} 1631}
1295 1632
1296sub find_widget { 1633sub find_widget {
1297 my ($self, $x, $y) = @_; 1634 my ($self, $x, $y) = @_;
1298 1635
… …
1317 } 1654 }
1318} 1655}
1319 1656
1320############################################################################# 1657#############################################################################
1321 1658
1322package CFClient::UI::Box; 1659package CFPlus::UI::Box;
1323 1660
1324our @ISA = CFClient::UI::Container::; 1661our @ISA = CFPlus::UI::Container::;
1325 1662
1326sub size_request { 1663sub size_request {
1327 my ($self) = @_; 1664 my ($self) = @_;
1328 1665
1329 $self->{vertical} 1666 $self->{vertical}
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1672 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1673 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1674 )
1338} 1675}
1339 1676
1340sub size_allocate { 1677sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1678 my ($self, $w, $h) = @_;
1342 1679
1343 my $space = $self->{vertical} ? $h : $w; 1680 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1681 my @children = $self->visible_children;
1345 1682
1346 my @req; 1683 my @req;
1347 1684
1348 if ($self->{homogeneous}) { 1685 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1686 @req = ($space / (@children || 1)) x @children;
1350 } else { 1687 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1688 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1689 my $req = List::Util::sum @req;
1353 1690
1354 if ($req > $space) { 1691 if ($req > $space) {
1355 # ah well, not enough space 1692 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1693 $_ *= $space / $req for @req;
1357 } else { 1694 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1695 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1696
1360 $space = ($space - $req) / $expand; # remaining space to give away 1697 $space = ($space - $req) / $expand; # remaining space to give away
1361 1698
1362 $req[$_] += $space * $children->[$_]{expand} 1699 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1700 for 0 .. $#children;
1364 } 1701 }
1365 } 1702 }
1366 1703
1367 CFClient::UI::harmonize \@req; 1704 CFPlus::UI::harmonize \@req;
1368 1705
1369 my $pos = 0; 1706 my $pos = 0;
1370 for (0 .. $#$children) { 1707 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1708 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1710
1374 $pos += $alloc; 1711 $pos += $alloc;
1375 } 1712 }
1376 1713
1377 1 1714 1
1378} 1715}
1379 1716
1380############################################################################# 1717#############################################################################
1381 1718
1382package CFClient::UI::HBox; 1719package CFPlus::UI::HBox;
1383 1720
1384our @ISA = CFClient::UI::Box::; 1721our @ISA = CFPlus::UI::Box::;
1385 1722
1386sub new { 1723sub new {
1387 my $class = shift; 1724 my $class = shift;
1388 1725
1389 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1392 ) 1729 )
1393} 1730}
1394 1731
1395############################################################################# 1732#############################################################################
1396 1733
1397package CFClient::UI::VBox; 1734package CFPlus::UI::VBox;
1398 1735
1399our @ISA = CFClient::UI::Box::; 1736our @ISA = CFPlus::UI::Box::;
1400 1737
1401sub new { 1738sub new {
1402 my $class = shift; 1739 my $class = shift;
1403 1740
1404 $class->SUPER::new ( 1741 $class->SUPER::new (
… …
1407 ) 1744 )
1408} 1745}
1409 1746
1410############################################################################# 1747#############################################################################
1411 1748
1412package CFClient::UI::Label; 1749package CFPlus::UI::Label;
1413 1750
1414our @ISA = CFClient::UI::DrawBG::; 1751our @ISA = CFPlus::UI::DrawBG::;
1415 1752
1416use CFClient::OpenGL; 1753use CFPlus::OpenGL;
1417 1754
1418sub new { 1755sub new {
1419 my ($class, %arg) = @_; 1756 my ($class, %arg) = @_;
1420 1757
1421 my $self = $class->SUPER::new ( 1758 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1761 #active_bg => none
1425 #font => default_font 1762 #font => default_font
1426 #text => initial text 1763 #text => initial text
1427 #markup => initial narkup 1764 #markup => initial narkup
1428 #max_w => maximum pixel width 1765 #max_w => maximum pixel width
1766 #style => 0, # render flags
1429 ellipsise => 3, # end 1767 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1768 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1769 fontsize => 1,
1432 align => -1, 1770 align => -1,
1433 valign => -1, 1771 valign => -1,
1434 padding_x => 2, 1772 padding_x => 2,
1435 padding_y => 2, 1773 padding_y => 2,
1436 can_events => 0, 1774 can_events => 0,
1437 %arg 1775 %arg
1438 ); 1776 );
1439 1777
1440 if (exists $self->{template}) { 1778 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1779 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1780 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1781 $self->{template} = $layout;
1444 } 1782 }
1445 1783
1446 if (exists $self->{markup}) { 1784 if (exists $self->{markup}) {
… …
1450 } 1788 }
1451 1789
1452 $self 1790 $self
1453} 1791}
1454 1792
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1793sub update {
1466 my ($self) = @_; 1794 my ($self) = @_;
1467 1795
1468 delete $self->{texture}; 1796 delete $self->{texture};
1469 $self->SUPER::update; 1797 $self->SUPER::update;
1470} 1798}
1471 1799
1800sub realloc {
1801 my ($self) = @_;
1802
1803 delete $self->{ox};
1804 $self->SUPER::realloc;
1805}
1806
1472sub set_text { 1807sub set_text {
1473 my ($self, $text) = @_; 1808 my ($self, $text) = @_;
1474 1809
1475 return if $self->{text} eq "T$text"; 1810 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1811 $self->{text} = "T$text";
1477 1812
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1813 $self->{layout}->set_text ($text);
1480 1814
1815 delete $self->{size_req};
1481 $self->realloc; 1816 $self->realloc;
1482 $self->update; 1817 $self->update;
1483} 1818}
1484 1819
1485sub set_markup { 1820sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1823 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1824 $self->{text} = "M$markup";
1490 1825
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1826 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1827
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1828 $self->{layout}->set_markup ($markup);
1495 1829
1830 delete $self->{size_req};
1496 $self->realloc; 1831 $self->realloc;
1497 $self->update; 1832 $self->update;
1498} 1833}
1499 1834
1500sub size_request { 1835sub size_request {
1501 my ($self) = @_; 1836 my ($self) = @_;
1502 1837
1838 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1839 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1840 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1841 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1842 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1843 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1844
1509 my ($w, $h) = $self->{layout}->size; 1845 my ($w, $h) = $self->{layout}->size;
1510 1846
1511 if (exists $self->{template}) { 1847 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1848 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1851
1515 my ($w2, $h2) = $self->{template}->size; 1852 my ($w2, $h2) = $self->{template}->size;
1516 1853
1517 $w = List::Util::max $w, $w2; 1854 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1855 $h = List::Util::max $h, $h2;
1856 }
1857
1858 [$w, $h]
1519 } 1859 };
1520 1860
1521 ($w, $h) 1861 @{ $self->{size_req} }
1522} 1862}
1523 1863
1864sub baseline_shift {
1865 $_[0]{layout}->descent
1866}
1867
1524sub size_allocate { 1868sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1869 my ($self, $w, $h) = @_;
1526 1870
1871 delete $self->{ox};
1872
1527 delete $self->{texture}; 1873 delete $self->{texture}
1874 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1875
1876 1
1528} 1877}
1529 1878
1530sub set_fontsize { 1879sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1880 my ($self, $fontsize) = @_;
1532 1881
1533 $self->{fontsize} = $fontsize; 1882 $self->{fontsize} = $fontsize;
1883 delete $self->{size_req};
1534 delete $self->{texture}; 1884 delete $self->{texture};
1535 1885
1536 $self->realloc; 1886 $self->realloc;
1537} 1887}
1538 1888
1889sub reconfigure {
1890 my ($self) = @_;
1891
1892 delete $self->{size_req};
1893 delete $self->{texture};
1894
1895 $self->SUPER::reconfigure;
1896}
1897
1539sub _draw { 1898sub _draw {
1540 my ($self) = @_; 1899 my ($self) = @_;
1541 1900
1542 $self->SUPER::_draw; # draw background, if applicable 1901 $self->SUPER::_draw; # draw background, if applicable
1543 1902
1544 my $tex = $self->{texture} ||= do { 1903 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1904 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1905 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1906 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1907 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1908 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1910
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1911 [$self->{layout}->size]
1912 };
1553 1913
1914 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1917 : ($self->{w} - $size->[0]) * 0.5);
1557 1918
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1921 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1922 };
1564 1923
1565 glEnable GL_TEXTURE_2D; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1926
1568 if ($tex->{format} == GL_ALPHA) { 1927 $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} 1928}
1577 1929
1578############################################################################# 1930#############################################################################
1579 1931
1580package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1581 1933
1582our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1583 1935
1584use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1585 1937
1586sub new { 1938sub new {
1587 my $class = shift; 1939 my $class = shift;
1588 1940
1589 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1593 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1594 can_hover => 1, 1946 can_hover => 1,
1595 can_focus => 1, 1947 can_focus => 1,
1596 valign => 0, 1948 valign => 0,
1597 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1598 #text => ... 1951 #text => ...
1952 #hidden => "*",
1599 @_ 1953 @_
1600 ) 1954 )
1601} 1955}
1602 1956
1603sub _set_text { 1957sub _set_text {
… …
1605 1959
1606 delete $self->{cur_h}; 1960 delete $self->{cur_h};
1607 1961
1608 return if $self->{text} eq $text; 1962 return if $self->{text} eq $text;
1609 1963
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1964 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1965 $self->{text} = $text;
1614 1966
1615 $text =~ s/./*/g if $self->{hidden}; 1967 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1968 $self->{layout}->set_text ("$text ");
1969 delete $self->{size_req};
1617 1970
1618 $self->_emit (changed => $self->{text}); 1971 $self->emit (changed => $self->{text});
1972
1973 $self->realloc;
1974 $self->update;
1619} 1975}
1620 1976
1621sub set_text { 1977sub set_text {
1622 my ($self, $text) = @_; 1978 my ($self, $text) = @_;
1623 1979
1624 $self->{cursor} = length $text; 1980 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1981 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1982}
1629 1983
1630sub get_text { 1984sub get_text {
1631 $_[0]{text} 1985 $_[0]{text}
1632} 1986}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1991 my ($w, $h) = $self->SUPER::size_request;
1638 1992
1639 ($w + 1, $h) # add 1 for cursor 1993 ($w + 1, $h) # add 1 for cursor
1640} 1994}
1641 1995
1642sub key_down { 1996sub invoke_key_down {
1643 my ($self, $ev) = @_; 1997 my ($self, $ev) = @_;
1644 1998
1645 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1648 2002
1649 my $text = $self->get_text; 2003 my $text = $self->get_text;
2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1650 2006
1651 if ($uni == 8) { 2007 if ($uni == 8) {
1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1653 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1654 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1655 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1656 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1657 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1658 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1659 } elsif ($sym == CFClient::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
2027 } elsif ($uni == 21) { # ctrl-u
2028 $text = "";
1660 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 2031 $self->emit ('escape');
1665 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
2036 } else {
2037 return 0;
1667 } 2038 }
1668 2039
1669 $self->_set_text ($text); 2040 $self->_set_text ($text);
1670 2041
1671 $self->realloc; 2042 $self->realloc;
1672} 2043 $self->update;
1673 2044
2045 1
2046}
2047
1674sub focus_in { 2048sub invoke_focus_in {
1675 my ($self) = @_; 2049 my ($self) = @_;
1676 2050
1677 $self->{last_activity} = $::NOW; 2051 $self->{last_activity} = $::NOW;
1678 2052
1679 $self->SUPER::focus_in; 2053 $self->SUPER::invoke_focus_in
1680} 2054}
1681 2055
1682sub button_down { 2056sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1684 2058
1685 $self->SUPER::button_down ($ev, $x, $y); 2059 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 2060
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 2062
1689 # byte-index to char-index 2063 # byte-index to char-index
1690 my $text = $self->{text}; 2064 my $text = $self->{text};
1691 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1693 2067
1694 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1695 $self->update; 2069 $self->update;
2070
2071 1
1696} 2072}
1697 2073
1698sub mouse_motion { 2074sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 2075 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2076# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2077
2078 1
1701} 2079}
1702 2080
1703sub _draw { 2081sub _draw {
1704 my ($self) = @_; 2082 my ($self) = @_;
1705 2083
1706 local $self->{fg} = $self->{fg}; 2084 local $self->{fg} = $self->{fg};
1707 2085
1708 if ($FOCUS == $self) { 2086 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 2087 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 2088 $self->{fg} = $self->{active_fg};
1711 } else { 2089 } else {
1712 glColor @{$self->{bg}}; 2090 glColor_premultiply @{$self->{bg}};
1713 } 2091 }
1714 2092
1715 glEnable GL_BLEND; 2093 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2094 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 2095 glBegin GL_QUADS;
1718 glVertex 0 , 0; 2096 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 2097 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 2098 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 2099 glVertex $self->{w}, 0;
… …
1732 utf8::encode $text; 2110 utf8::encode $text;
1733 2111
1734 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1735 } 2113 }
1736 2114
1737 glColor @{$self->{fg}};
1738 glBegin GL_LINES; 2115 glBegin GL_LINES;
1739 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2116 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1740 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1741 glEnd; 2118 glEnd;
1742 } 2119 }
1743} 2120}
1744 2121
2122#############################################################################
2123
1745package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1746 2125
1747our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1748 2127
1749use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1750 2129
1751sub key_down { 2130sub invoke_key_down {
1752 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1753 2132
1754 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1755 2134
1756 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1757 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
2138
1759 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 2141 $self->emit (activate => $txt);
1762 $self->update; 2142 $self->update;
1763 2143
1764 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1767 } 2147 }
1768 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1771 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 } 2152 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } 2154 }
1775 2155
1776 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1777 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779 2159
1780 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else { 2162 } else {
1783 $self->set_text ($self->{history_saveback}); 2163 $self->set_text ($self->{history_saveback});
1784 } 2164 }
1785 2165
1786 } else { 2166 } else {
1787 $self->SUPER::key_down ($ev); 2167 return $self->SUPER::invoke_key_down ($ev)
2168 }
2169
1788 } 2170 1
1789
1790} 2171}
1791 2172
1792############################################################################# 2173#############################################################################
1793 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
1794package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1795 2215
1796our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1797 2217
1798use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1799 2219
1800my @tex = 2220my @tex =
1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1802 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1803 2223
1804sub new { 2224sub new {
1805 my $class = shift; 2225 my $class = shift;
1806 2226
… …
1815 can_events => 1, 2235 can_events => 1,
1816 @_ 2236 @_
1817 ) 2237 )
1818} 2238}
1819 2239
1820sub activate { }
1821
1822sub button_up { 2240sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1824 2242
1825 $self->emit ("activate") 2243 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2244 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2245 && $y >= 0 && $y < $self->{h};
2246
2247 1
1828} 2248}
1829 2249
1830sub _draw { 2250sub _draw {
1831 my ($self) = @_; 2251 my ($self) = @_;
1832 2252
1833 local $self->{fg} = $self->{fg}; 2253 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2254
1839 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2257 glColor 0, 0, 0, 1;
1842 2258
… …
1847 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1848} 2264}
1849 2265
1850############################################################################# 2266#############################################################################
1851 2267
1852package CFClient::UI::CheckBox; 2268package CFPlus::UI::CheckBox;
1853 2269
1854our @ISA = CFClient::UI::DrawBG::; 2270our @ISA = CFPlus::UI::DrawBG::;
1855 2271
1856my @tex = 2272my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859 2275
1860use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1861 2277
1862sub new { 2278sub new {
1863 my $class = shift; 2279 my $class = shift;
1864 2280
1865 $class->SUPER::new ( 2281 $class->SUPER::new (
… …
1879 my ($self) = @_; 2295 my ($self) = @_;
1880 2296
1881 (6) x 2 2297 (6) x 2
1882} 2298}
1883 2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
1884sub button_down { 2308sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2309 my ($self, $ev, $x, $y) = @_;
1886 2310
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2313 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2314 } else {
2315 return 0
2316 }
2317
1891 } 2318 1
1892} 2319}
1893 2320
1894sub _draw { 2321sub _draw {
1895 my ($self) = @_; 2322 my ($self) = @_;
1896 2323
… …
1911 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
1912} 2339}
1913 2340
1914############################################################################# 2341#############################################################################
1915 2342
1916package CFClient::UI::Image; 2343package CFPlus::UI::Image;
1917 2344
1918our @ISA = CFClient::UI::Base::; 2345our @ISA = CFPlus::UI::Base::;
1919 2346
1920use CFClient::OpenGL; 2347use CFPlus::OpenGL;
1921use Carp qw/confess/;
1922 2348
1923our %loaded_images; 2349our %texture_cache;
1924 2350
1925sub new { 2351sub new {
1926 my $class = shift; 2352 my $class = shift;
1927 2353
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
1929 2358
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2359 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required";
1931 2361
1932 $loaded_images{$self->{image}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1934 2364
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
1936 2366
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2368
1941 $self 2369 $self
1942} 2370}
1943 2371
2372sub STORABLE_freeze {
2373 my ($self, $cloning) = @_;
2374
2375 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2377
2378 $self->{path}
2379}
2380
2381sub STORABLE_attach {
2382 my ($self, $cloning, $path) = @_;
2383
2384 $self->new (path => $path)
2385}
2386
1944sub size_request { 2387sub size_request {
1945 my ($self) = @_; 2388 my ($self) = @_;
1946 2389
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2390 ($self->{tex}{w}, $self->{tex}{h})
1948} 2391}
1949 2392
1950sub _draw { 2393sub _draw {
1951 my ($self) = @_; 2394 my ($self) = @_;
1952 2395
… …
1962 } 2405 }
1963 2406
1964 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2409
1967 $tex->draw_quad_alpha (0, 0, $w, $h); 2410 $tex->draw_quad (0, 0, $w, $h);
1968 2411
1969 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
1970} 2413}
1971 2414
1972############################################################################# 2415#############################################################################
1973 2416
2417package CFPlus::UI::ImageButton;
2418
2419our @ISA = CFPlus::UI::Image::;
2420
2421use CFPlus::OpenGL;
2422
2423my %textures;
2424
2425sub new {
2426 my $class = shift;
2427
2428 my $self = $class->SUPER::new (
2429 padding_x => 4,
2430 padding_y => 4,
2431 fg => [1, 1, 1],
2432 active_fg => [0, 0, 1],
2433 can_hover => 1,
2434 align => 0,
2435 valign => 0,
2436 can_events => 1,
2437 @_
2438 );
2439}
2440
2441sub invoke_button_up {
2442 my ($self, $ev, $x, $y) = @_;
2443
2444 $self->emit ("activate")
2445 if $x >= 0 && $x < $self->{w}
2446 && $y >= 0 && $y < $self->{h};
2447
2448 1
2449}
2450
2451#############################################################################
2452
1974package CFClient::UI::VGauge; 2453package CFPlus::UI::VGauge;
1975 2454
1976our @ISA = CFClient::UI::Base::; 2455our @ISA = CFPlus::UI::Base::;
1977 2456
1978use List::Util qw(min max); 2457use List::Util qw(min max);
1979 2458
1980use CFClient::OpenGL; 2459use CFPlus::OpenGL;
1981 2460
1982my %tex = ( 2461my %tex = (
1983 food => [ 2462 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ], 2465 ],
1987 grace => [ 2466 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 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/ 2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ], 2469 ],
1991 hp => [ 2470 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ], 2473 ],
1995 mana => [ 2474 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 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/ 2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ], 2477 ],
1999); 2478);
2000 2479
2001# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2542
2064 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2544 my $h2 = $self->{h} * (1 - $ycut2);
2545 my $h3 = $self->{h};
2546
2547 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2548
2067 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2554
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2555 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2556 glBegin GL_QUADS;
… …
2088 2571
2089 if ($t3) { 2572 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2579 glEnd;
2097 } 2580 }
2098 2581
2099 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2100 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2101} 2584}
2102 2585
2103############################################################################# 2586#############################################################################
2104 2587
2105package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2106 2589
2107our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2108 2591
2109sub new { 2592sub new {
2110 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2111 2594
2112 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2114 can_hover => 1, 2597 can_hover => 1,
2115 can_events => 1, 2598 can_events => 1,
2116 %arg, 2599 %arg,
2117 ); 2600 );
2118 2601
2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2602 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2603 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2122 2605
2123 $self 2606 $self
2124} 2607}
2125 2608
2126sub set_fontsize { 2609sub set_fontsize {
… …
2147 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2148} 2631}
2149 2632
2150############################################################################# 2633#############################################################################
2151 2634
2152package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2153 2636
2154use strict; 2637use strict;
2155 2638
2156use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2157 2640
2158our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2159 2642
2160my @tex = 2643my @tex =
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2162 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2163 2646
2164sub new { 2647sub new {
2165 my $class = shift; 2648 my $class = shift;
2166 2649
… …
2187 $self->update; 2670 $self->update;
2188 2671
2189 $self 2672 $self
2190} 2673}
2191 2674
2192sub changed { }
2193
2194sub set_range { 2675sub set_range {
2195 my ($self, $range) = @_; 2676 my ($self, $range) = @_;
2196 2677
2197 ($range, $self->{range}) = ($self->{range}, $range); 2678 ($range, $self->{range}) = ($self->{range}, $range);
2198 2679
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2680 if ("@$range" ne "@{$self->{range}}") {
2681 $self->update;
2682 $self->set_value ($self->{range}[0]);
2683 }
2201} 2684}
2202 2685
2203sub set_value { 2686sub set_value {
2204 my ($self, $value) = @_; 2687 my ($self, $value) = @_;
2205 2688
… …
2216 if $unit; 2699 if $unit;
2217 2700
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2701 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2702
2220 if ($value != $old_value) { 2703 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2704 $self->emit (changed => $value);
2222 $self->update; 2705 $self->update;
2223 } 2706 }
2224} 2707}
2225 2708
2226sub size_request { 2709sub size_request {
2227 my ($self) = @_; 2710 my ($self) = @_;
2228 2711
2229 ($self->{req_w}, $self->{req_h}) 2712 ($self->{req_w}, $self->{req_h})
2230} 2713}
2231 2714
2232sub button_down { 2715sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2716 my ($self, $ev, $x, $y) = @_;
2234 2717
2235 $self->SUPER::button_down ($ev, $x, $y); 2718 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2719
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2721
2239 $self->mouse_motion ($ev, $x, $y); 2722 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2723}
2241 2724
2242sub mouse_motion { 2725sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2726 my ($self, $ev, $x, $y) = @_;
2244 2727
2245 if ($GRAB == $self) { 2728 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2729 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2730
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2731 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2732
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2733 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2734
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2735 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2736 } else {
2737 return 0;
2738 }
2739
2253 } 2740 1
2741}
2742
2743sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_;
2745
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751
2752 ! ! $delta
2254} 2753}
2255 2754
2256sub update { 2755sub update {
2257 my ($self) = @_; 2756 my ($self) = @_;
2258 2757
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2758 delete $self->{knob_w};
2759 $self->SUPER::update;
2760}
2761
2762sub _draw {
2763 my ($self) = @_;
2764
2765 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2766 $self->set_value ($self->{range}[0]);
2261 2767
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2768 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2769 my $range = ($hi - $page - $lo) || 1e-100;
2264 2770
… …
2270 $value = ($value - $lo) / $range; 2776 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2777 $value = $value * $self->{scale} + $self->{offset};
2272 2778
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2779 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2780 $self->{knob_w} = $knob_w;
2275 }); 2781 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2782
2283 $self->SUPER::_draw (); 2783 $self->SUPER::_draw ();
2284 2784
2285 glScale $self->{w}, $self->{h}; 2785 glScale $self->{w}, $self->{h};
2286 2786
… …
2306 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2307} 2807}
2308 2808
2309############################################################################# 2809#############################################################################
2310 2810
2311package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2312 2812
2313our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2314 2814
2315sub new { 2815sub new {
2316 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2317 2817
2318 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2319 2819
2320 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift }, 2823 to_value => sub { shift },
2324 from_value => sub { shift }, 2824 from_value => sub { shift },
2325 %arg, 2825 %arg,
2326 ); 2826 );
2327 2827
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2349 2849
2350############################################################################# 2850#############################################################################
2351 2851
2352package CFClient::UI::TextView; 2852package CFPlus::UI::TextScroller;
2353 2853
2354our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2355 2855
2356use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2357 2857
2358sub new { 2858sub new {
2359 my $class = shift; 2859 my $class = shift;
2360 2860
2361 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2362 fontsize => 1, 2862 fontsize => 1,
2363 can_events => 0, 2863 can_events => 1,
2864 indent => 0,
2364 #font => default_font 2865 #font => default_font
2365 @_, 2866 @_,
2366 2867
2367 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2368 par => [], 2869 par => [],
2870 max_par => 0,
2369 height => 0, 2871 height => 0,
2370 children => [ 2872 children => [
2371 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2373 ], 2875 ],
2374 ); 2876 );
2375 2877
2376 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2377 2879
… …
2383 2885
2384 $self->{fontsize} = $fontsize; 2886 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2887 $self->reflow;
2386} 2888}
2387 2889
2890sub size_request {
2891 my ($self) = @_;
2892
2893 my ($empty, $slider) = @{ $self->{children} };
2894
2895 local $self->{children} = [$empty, $slider];
2896 $self->SUPER::size_request
2897}
2898
2388sub size_allocate { 2899sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2900 my ($self, $w, $h) = @_;
2390 2901
2391 $self->SUPER::size_allocate ($w, $h); 2902 my ($empty, $slider, @other) = @{ $self->{children} };
2903 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2904
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2905 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2906 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2907 $self->{layout}->set_width ($empty->{w});
2908 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2909
2397 $self->reflow; 2910 $self->reflow;
2398}
2399 2911
2400sub text_size { 2912 local $self->{children} = [$empty, $slider];
2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 2917 my ($self, $ev) = @_;
2918
2919 return 0 unless $ev->{dy}; # only vertical movements
2920
2921 $self->{children}[1]->emit (mouse_wheel => $ev);
2922
2923 1
2924}
2925
2926sub get_layout {
2927 my ($self, $para) = @_;
2402 2928
2403 my $layout = $self->{layout}; 2929 my $layout = $self->{layout};
2404 2930
2931 $layout->set_font ($self->{font}) if $self->{font};
2932 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2933 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2934 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2935 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2936 $layout->set_markup ($para->{markup});
2937
2938 $layout->set_shapes (
2939 map
2940 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2941 @{$para->{widget}}
2408 2942 );
2943
2409 $layout->size 2944 $layout
2410} 2945}
2411 2946
2412sub reflow { 2947sub reflow {
2413 my ($self) = @_; 2948 my ($self) = @_;
2414 2949
… …
2421 2956
2422 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2424} 2959}
2425 2960
2961sub current_paragraph {
2962 my ($self) = @_;
2963
2964 $self->{top_paragraph} - 1
2965}
2966
2967sub scroll_to {
2968 my ($self, $para) = @_;
2969
2970 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2971
2972 $self->{scroll_to} = $para;
2973 $self->update;
2974}
2975
2426sub clear { 2976sub clear {
2427 my ($self) = @_; 2977 my ($self) = @_;
2978
2979 my (undef, undef, @other) = @{ $self->{children} };
2980 $self->remove ($_) for @other;
2428 2981
2429 $self->{par} = []; 2982 $self->{par} = [];
2430 $self->{height} = 0; 2983 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2985}
2433 2986
2434sub add_paragraph { 2987sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2988 my $self = shift;
2436 2989
2437 for my $line (split /\n/, $text) { 2990 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 2991 $para = {
2992 fg => [1, 1, 1, 1],
2993 indent => 0,
2994 markup => "",
2995 widget => [],
2996 ref $para ? %$para : (markup => $para),
2997 w => 1e10,
2998 wrapped => 1,
2999 };
3000
3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3002 push @{$self->{par}}, $para;
3003 }
3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
3008
3009 $self->{need_reflow}++;
3010 $self->update;
3011}
3012
3013sub scroll_to_bottom {
3014 my ($self) = @_;
3015
3016 $self->{scroll_to} = $#{$self->{par}};
3017 $self->update;
3018}
3019
3020sub force_uptodate {
3021 my ($self) = @_;
3022
3023 if (delete $self->{need_reflow}) {
3024 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3025
3026 my $height = 0;
3027
3028 for my $para (@{$self->{par}}) {
3029 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3030 my $layout = $self->get_layout ($para);
3031 my ($w, $h) = $layout->size;
3032
3033 $para->{w} = $w + $para->{indent};
3034 $para->{h} = $h;
3035 $para->{wrapped} = $layout->has_wrapped;
3036 }
3037
3038 $para->{y} = $height;
3039 $height += $para->{h};
3040 }
3041
2439 $self->{height} += $h; 3042 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 3044
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3045 delete $self->{texture};
3046 }
3047
3048 if (my $paridx = delete $self->{scroll_to}) {
3049 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3050 }
2444} 3051}
2445 3052
2446sub update { 3053sub update {
2447 my ($self) = @_; 3054 my ($self) = @_;
2448 3055
… …
2450 3057
2451 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2452 3059
2453 delete $self->{texture}; 3060 delete $self->{texture};
2454 3061
2455 $ROOT->on_post_alloc ($self, sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 3066
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 { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 3068 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2487 3070
3071 package CFPlus::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h});
3074
3075 my $top = int $self->{children}[1]{range}[0];
3076
3077 my $paridx = 0;
3078 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2489 3080
2490 my $y0 = $top; 3081 my $y0 = $top;
2491 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2492 3083
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}}) { 3084 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2505 3087
2506 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 3089 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 3090
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3091 $layout->render ($para->{indent}, $y - $y0);
2512 3092
2513 glRasterPos $par->[3], $y - $y0; 3093 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3094 my @s = $layout->get_shapes;
3095
3096 for (@w) {
3097 my ($dx, $dy) = splice @s, 0, 2, ();
3098
3099 $_->{x} = $dx + $para->{indent};
3100 $_->{y} = $dy + $y - $y0;
3101
3102 $_->draw;
3103 }
3104 }
2515 } 3105 }
2516 3106
2517 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2518 } 3109 }
2519 3110
2520 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2521 }; 3112 };
2522 }); 3113 });
2523} 3114}
2524 3115
3116sub reconfigure {
3117 my ($self) = @_;
3118
3119 $self->SUPER::reconfigure;
3120
3121 $_->{w} = 1e10 for @{ $self->{par} };
3122 $self->reflow;
3123}
3124
2525sub _draw { 3125sub _draw {
2526 my ($self) = @_; 3126 my ($self) = @_;
2527 3127
2528 glEnable GL_TEXTURE_2D; 3128 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3129 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3130 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3131 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3132 glDisable GL_TEXTURE_2D;
2533 3133
2534 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2535
2536} 3135}
2537 3136
2538############################################################################# 3137#############################################################################
2539 3138
2540package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2541 3140
2542use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2543 3142
2544our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2545 3144
2546sub moveto { 3145sub moveto {
2547 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2548 3147
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3176 glPopMatrix;
2578} 3177}
2579 3178
2580############################################################################# 3179#############################################################################
2581 3180
2582package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2583 3182
2584our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2585 3184
2586sub new { 3185sub new {
2587 my $class = shift; 3186 my $class = shift;
2588 3187
2589 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2602} 3201}
2603 3202
2604############################################################################# 3203#############################################################################
2605 3204
2606package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2607 3206
2608our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2609 3208
2610use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2611 3210
2612sub new { 3211sub new {
2613 my $class = shift; 3212 my $class = shift;
2614 3213
2615 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2618 ) 3217 )
2619} 3218}
2620 3219
2621sub set_tooltip_from { 3220sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2623 3225
2624 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2625 3227
2626 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3230 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 3231 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 3232 . "visible $widget->{visible}";
2631 } 3233 }
2632 3234
3235 $tooltip =~ s/^\n+//;
3236 $tooltip =~ s/\n+$//;
3237
2633 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2634 markup => $tooltip, 3239 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 3241 fontsize => 0.8,
2637 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2638 ellipsise => 0, 3243 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 ); 3245 );
2641} 3246}
2642 3247
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3251 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 3252
2648 ($w + 4, $h + 4) 3253 ($w + 4, $h + 4)
2649} 3254}
2650 3255
2651sub size_allocate { 3256sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 3257 my ($self, $w, $h) = @_;
2653 3258
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 3259 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 3260}
2656 3261
2657sub visibility_change { 3262sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 3263 my ($self, $visible) = @_;
2659 3264
2660 return unless $visible; 3265 return unless $visible;
2661 3266
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2664 or return; 3269 or return;
2665 3270
3271 if ($widget->{visible}) {
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 3273
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 3275 if $x + $self->{w} > $self->{root}{w};
2670 3276
2671 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2672 }); 3281 });
2673} 3282}
2674 3283
2675sub _draw { 3284sub _draw {
2676 my ($self) = @_; 3285 my ($self) = @_;
… …
2700 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2701} 3310}
2702 3311
2703############################################################################# 3312#############################################################################
2704 3313
2705package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2706 3315
2707our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2708 3317
2709use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2710 3319
2711sub new { 3320sub new {
2712 my $class = shift; 3321 my $class = shift;
2713 3322
2714 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2716 can_events => 0, 3325 can_events => 0,
2717 @_, 3326 @_,
2718 ); 3327 );
2719 3328
2720 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2722 3331
2723 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1, 3334 hard => 1,
2726 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
2749sub _draw { 3358sub _draw {
2750 my ($self) = @_; 3359 my ($self) = @_;
2751 3360
2752 return unless $::CONN; 3361 return unless $::CONN;
2753 3362
3363 $self->SUPER::_draw;
3364
2754 my $face; 3365 my $face;
2755 3366
2756 if ($self->{frame}) { 3367 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
2758 3369
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3374 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3375
2765 if ($tex) { 3376 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3377 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3379 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3380 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3381 glDisable GL_TEXTURE_2D;
2771 } 3382 }
2772} 3383}
2773 3384
2774sub DESTROY { 3385sub destroy {
2775 my ($self) = @_; 3386 my ($self) = @_;
2776 3387
2777 $self->{timer}->cancel 3388 $self->{timer}->cancel
2778 if $self->{timer}; 3389 if $self->{timer};
2779 3390
2780 $self->SUPER::DESTROY; 3391 $self->SUPER::destroy;
2781} 3392}
2782 3393
2783############################################################################# 3394#############################################################################
2784 3395
2785package CFClient::UI::Inventory; 3396package CFPlus::UI::Buttonbar;
2786 3397
2787our @ISA = CFClient::UI::ScrolledWindow::; 3398our @ISA = CFPlus::UI::HBox::;
2788 3399
2789sub new { 3400# 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 3401
2825############################################################################# 3402#############################################################################
2826 3403
2827package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
2828 3405
2829our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
2830 3407
2831use CFClient::OpenGL; 3408use CFPlus::OpenGL;
2832 3409
2833sub new { 3410sub new {
2834 my $class = shift; 3411 my $class = shift;
2835 3412
2836 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
2837 items => [], 3414 items => [],
2838 z => 100, 3415 z => 100,
2839 @_, 3416 @_,
2840 ); 3417 );
2841 3418
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2843 3420
2844 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
2846 3423
2847 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
2848 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
2849 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
2850 can_hover => 1, 3430 can_hover => 1,
2851 can_events => 1, 3431 can_events => 1,
3432 tooltip => $tooltip,
3433 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1),
3436 ],
3437 ;
3438
3439 } else {
3440 $widget = new CFPlus::UI::Label
3441 can_hover => 1,
3442 can_events => 1,
2852 text => $widget; 3443 markup => $widget,
3444 tooltip => $tooltip;
3445 }
2853 } 3446 }
2854 3447
2855 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
2856 3449
2857 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
2862 3455
2863# popup given the event (must be a mouse button down event currently) 3456# popup given the event (must be a mouse button down event currently)
2864sub popup { 3457sub popup {
2865 my ($self, $ev) = @_; 3458 my ($self, $ev) = @_;
2866 3459
2867 $self->_emit ("popdown"); 3460 $self->emit ("popdown");
2868 3461
2869 # maybe save $GRAB? must be careful about events... 3462 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3463 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3464 $self->{button} = $ev->{button};
2872 3465
2873 $self->show; 3466 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3467 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3468}
2876 3469
2877sub mouse_motion { 3470sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3471 my ($self, $ev, $x, $y) = @_;
2879 3472
2880 # TODO: should use vbox->find_widget or so 3473 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3474 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3475 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3476
3477 0
3478}
3479
2885sub button_up { 3480sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2887 3482
2888 if ($ev->{button} == $self->{button}) { 3483 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3484 undef $GRAB;
2890 $self->hide; 3485 $self->hide;
2891 3486
2892 $self->_emit ("popdown"); 3487 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3488 $self->{hover}[1]->() if $self->{hover};
3489 } else {
3490 return 0
3491 }
3492
2894 } 3493 1
2895} 3494}
2896 3495
2897############################################################################# 3496#############################################################################
2898 3497
2899package CFClient::UI::Statusbox; 3498package CFPlus::UI::Multiplexer;
2900 3499
2901our @ISA = CFClient::UI::VBox::; 3500our @ISA = CFPlus::UI::Container::;
2902 3501
2903sub new { 3502sub new {
2904 my $class = shift; 3503 my $class = shift;
2905 3504
2906 $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 @_,
3507 );
3508
3509 $self->{current} = $self->{children}[0]
3510 if @{ $self->{children} };
3511
3512 $self
3513}
3514
3515sub add {
3516 my ($self, @widgets) = @_;
3517
3518 $self->SUPER::add (@widgets);
3519
3520 $self->{current} = $self->{children}[0]
3521 if @{ $self->{children} };
3522}
3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
3530sub set_current_page {
3531 my ($self, $page_or_widget) = @_;
3532
3533 my $widget = ref $page_or_widget
3534 ? $page_or_widget
3535 : $self->{children}[$page_or_widget];
3536
3537 $self->{current} = $widget;
3538 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3539
3540 $self->emit (page_changed => $self->{current});
3541
3542 $self->realloc;
3543}
3544
3545sub visible_children {
3546 $_[0]{current}
3547}
3548
3549sub size_request {
3550 my ($self) = @_;
3551
3552 $self->{current}->size_request
3553}
3554
3555sub invoke_size_allocate {
3556 my ($self, $w, $h) = @_;
3557
3558 $self->{current}->configure (0, 0, $w, $h);
3559
3560 1
3561}
3562
3563sub _draw {
3564 my ($self) = @_;
3565
3566 $self->{current}->draw;
3567}
3568
3569#############################################################################
3570
3571package CFPlus::UI::Notebook;
3572
3573our @ISA = CFPlus::UI::VBox::;
3574
3575sub new {
3576 my $class = shift;
3577
3578 my $self = $class->SUPER::new (
3579 buttonbar => (new CFPlus::UI::Buttonbar),
3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3581 # filter => # will be put between multiplexer and $self
3582 @_,
3583 );
3584
3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3586 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3587
3588 $self
3589}
3590
3591sub add {
3592 my ($self, $title, $widget, $tooltip) = @_;
3593
3594 CFPlus::weaken $self;
3595
3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3597 markup => $title,
3598 tooltip => $tooltip,
3599 on_activate => sub { $self->set_current_page ($widget) },
3600 );
3601
3602 $self->{multiplexer}->add ($widget);
3603}
3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3611sub set_current_page {
3612 my ($self, $page) = @_;
3613
3614 $self->{multiplexer}->set_current_page ($page);
3615 $self->emit (page_changed => $self->{multiplexer}{current});
3616}
3617
3618#############################################################################
3619
3620package CFPlus::UI::Selector;
3621
3622use utf8;
3623
3624our @ISA = CFPlus::UI::Button::;
3625
3626sub new {
3627 my $class = shift;
3628
3629 my $self = $class->SUPER::new (
3630 options => [], # [value, title, longdesc], ...
3631 value => undef,
3632 @_,
3633 );
3634
3635 $self->_set_value ($self->{value});
3636
3637 $self
3638}
3639
3640sub invoke_button_down {
3641 my ($self, $ev) = @_;
3642
3643 my @menu_items;
3644
3645 for (@{ $self->{options} }) {
3646 my ($value, $title, $tooltip) = @$_;
3647
3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3649 }
3650
3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3652}
3653
3654sub _set_value {
3655 my ($self, $value) = @_;
3656
3657 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3658 or return;
3659
3660 $self->{value} = $item->[0];
3661 $self->set_markup ("$item->[1] ⇓");
3662 $self->set_tooltip ($item->[2]);
3663}
3664
3665sub set_value {
3666 my ($self, $value) = @_;
3667
3668 return unless $self->{value} ne $value;
3669
3670 $self->_set_value ($value);
3671 $self->emit (changed => $value);
3672}
3673
3674#############################################################################
3675
3676package CFPlus::UI::Statusbox;
3677
3678our @ISA = CFPlus::UI::VBox::;
3679
3680sub new {
3681 my $class = shift;
3682
3683 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3684 fontsize => 0.8,
2908 @_, 3685 @_,
2909 ) 3686 );
3687
3688 CFPlus::weaken (my $this = $self);
3689
3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3691
3692 $self
2910} 3693}
2911 3694
2912sub reorder { 3695sub reorder {
2913 my ($self) = @_; 3696 my ($self) = @_;
2914 my $NOW = time; 3697 my $NOW = Time::HiRes::time;
3698
3699 # freeze display when hovering over any label
3700 return if $CFPlus::UI::TOOLTIP->{owner}
3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3702 values %{ $self->{item} };
2915 3703
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3706 }
2919 3707
… …
2922 my @items = sort { 3710 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3711 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3712 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3713 } values %{ $self->{item} };
2926 3714
3715 $self->{timer}->interval (1);
3716
2927 my $count = 10 + 1; 3717 my $count = 10 + 1;
2928 for my $item (@items) { 3718 for my $item (@items) {
2929 last unless --$count; 3719 last unless --$count;
2930 3720
2931 push @widgets, $item->{label} ||= do { 3721 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3722 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3723 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3724 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3725 : $item->{text};
2936 3726
2937 for ($short) { 3727 for ($short) {
2938 s/^\s+//; 3728 s/^\s+//;
2939 s/\s+/ /g; 3729 s/\s+/ /g;
2940 } 3730 }
2941 3731
2942 new CFClient::UI::Label 3732 new CFPlus::UI::Label
2943 markup => $short, 3733 markup => $short,
2944 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3738 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3739 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3740 can_events => 1,
2951 can_hover => 1 3741 can_hover => 1
2952 }; 3742 };
3743
3744 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3745 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3746 $label->update;
3747 $label->set_max_size (undef, $label->{req_h} * $diff)
3748 if $diff < 1;
3749 $self->{timer}->interval (1/30);
3750 } else {
3751 $label->{fg}[3] = $item->{fg}[3] || 1;
3752 }
3753
3754 push @widgets, $label;
2953 } 3755 }
2954 3756
2955 $self->clear; 3757 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3758 $self->SUPER::add (reverse @widgets);
2957} 3759}
… …
2962 $text =~ s/^\s+//; 3764 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3765 $text =~ s/\s+$//;
2964 3766
2965 return unless $text; 3767 return unless $text;
2966 3768
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3769 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3770
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3771 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3772
2971 if (my $item = $self->{item}{$group}) { 3773 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3774 if ($item->{text} eq $text) {
2973 $item->{count}++; 3775 $item->{count}++;
2974 } else { 3776 } else {
2975 $item->{count} = 1; 3777 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3778 $item->{text} = $item->{tooltip} = $text;
2977 } 3779 }
2978 $item->{id} = ++$self->{id}; 3780 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3781 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3782 delete $item->{label};
2981 } else { 3783 } else {
2982 $self->{item}{$group} = { 3784 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3785 id => ++$self->{id},
… …
2989 count => 1, 3791 count => 1,
2990 %arg, 3792 %arg,
2991 }; 3793 };
2992 } 3794 }
2993 3795
3796 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3797 $self->reorder;
3798 });
2995} 3799}
2996 3800
2997sub reconfigure { 3801sub reconfigure {
2998 my ($self) = @_; 3802 my ($self) = @_;
2999 3803
… …
3002 3806
3003 $self->reorder; 3807 $self->reorder;
3004 $self->SUPER::reconfigure; 3808 $self->SUPER::reconfigure;
3005} 3809}
3006 3810
3811sub destroy {
3812 my ($self) = @_;
3813
3814 $self->{timer}->cancel;
3815
3816 $self->SUPER::destroy;
3817}
3818
3007############################################################################# 3819#############################################################################
3008 3820
3009package CFClient::UI::Root; 3821package CFPlus::UI::Root;
3010 3822
3011our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3012 3824
3825use List::Util qw(min max);
3826
3013use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3014 3828
3015sub new { 3829sub new {
3016 my $class = shift; 3830 my $class = shift;
3017 3831
3018 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3019 visible => 1, 3833 visible => 1,
3020 @_, 3834 @_,
3021 ); 3835 );
3022 3836
3023 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3024 3838
3025 $self 3839 $self
3026} 3840}
3027 3841
3028sub size_request { 3842sub size_request {
… …
3043 $coord = $max - $size if $coord > $max - $size; 3857 $coord = $max - $size if $coord > $max - $size;
3044 3858
3045 int $coord + 0.5 3859 int $coord + 0.5
3046} 3860}
3047 3861
3048sub size_allocate { 3862sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3863 my ($self, $w, $h) = @_;
3050 3864
3051 for my $child ($self->children) { 3865 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3866 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3867
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3871 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3872 $Y = _to_pixel $Y, $H, $self->{h};
3059 3873
3060 $child->configure ($X, $Y, $W, $H); 3874 $child->configure ($X, $Y, $W, $H);
3061 } 3875 }
3876
3877 1
3062} 3878}
3063 3879
3064sub coord2local { 3880sub coord2local {
3065 my ($self, $x, $y) = @_; 3881 my ($self, $x, $y) = @_;
3066 3882
… …
3122 $_->() 3938 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3939 for values %{delete $self->{refresh_hook}};
3124 } 3940 }
3125 3941
3126 if ($self->{realloc}) { 3942 if ($self->{realloc}) {
3943 my %queue;
3127 my @queue; 3944 my @queue;
3945 my $widget;
3128 3946
3947 outer:
3129 while () { 3948 while () {
3130 if ($self->{realloc}) { 3949 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3950 for $widget (values %$realloc) {
3951 $widget->{visible} or next; # do not resize invisible widgets
3132 3952
3133 use sort 'stable'; 3953 $queue{$widget+0}++ and next; # duplicates are common
3134 3954
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3955 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3956 }
3137 } 3957 }
3138 3958
3959 while () {
3960 @queue or last outer;
3961
3139 my $widget = pop @queue || last; 3962 $widget = pop @{ $queue[-1] || [] }
3963 and last;
3964
3965 pop @queue;
3966 }
3140 3967
3141 $widget->{visible} or last; # do not resize invisible widgets 3968 delete $queue{$widget+0};
3142 3969
3143 my ($w, $h) = $widget->size_request; 3970 my ($w, $h) = $widget->size_request;
3144 3971
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3972 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3973 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3974
3975 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3976 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3977
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3978 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3979 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3980
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3981 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3984 $widget->{req_h} = $h;
3155 3985
3156 $self->{size_alloc}{$widget+0} = $widget; 3986 $self->{size_alloc}{$widget+0} = $widget;
3157 3987
3158 if (my $parent = $widget->{parent}) { 3988 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3989 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3990 unless $queue{$parent+0};
3991
3161 $parent->{force_size_alloc} = 1; 3992 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3993 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3994 }
3164 } 3995 }
3165 3996
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 4009
3179 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
3181 4012
4013 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h;
4015
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021
3182 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3184 4024
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4026 $widget->{old_w} = $widget->{w};
4027 $widget->{old_h} = $widget->{h};
4028
3186 $widget->{w} = $w; 4029 $widget->{w} = $w;
3187 $widget->{h} = $h; 4030 $widget->{h} = $h;
3188 4031
3189 $widget->emit (size_allocate => $w, $h); 4032 $widget->emit (size_allocate => $w, $h);
3190 } 4033 }
… …
3205 glLoadIdentity; 4048 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4051 glLoadIdentity;
3209 4052
4053 {
4054 package CFPlus::UI::Base;
4055
4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4057 (0, 0, $self->{w}, $self->{h});
4058
3210 $self->_draw; 4059 $self->_draw;
4060 }
3211} 4061}
3212 4062
3213############################################################################# 4063#############################################################################
3214 4064
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
3392package CFClient::UI; 4065package CFPlus::UI;
3393 4066
3394$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
3395$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3396 4069
33971 40701
3398 4071

Diff Legend

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