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.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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