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

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

Diff Legend

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