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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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