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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52
53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56 if $x + $TOOLTIP->{w} > $::WIDTH;
57
58 $TOOLTIP->move ($x, $y);
59 $TOOLTIP->show; 38 $TOOLTIP->show;
60 } 39 }
61 40
62 return; 41 return;
63 } 42 }
64 } 43 }
65 } 44 }
66 45
67 $TOOLTIP->hide; 46 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
69} 71}
70 72
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
181 } 190 }
182 } 191 }
183 192
184 reconfigure_widgets; 193 reconfigure_widgets;
185} 194}
… …
194 203
195sub new { 204sub new {
196 my $class = shift; 205 my $class = shift;
197 206
198 my $self = bless { 207 my $self = bless {
199 x => 0, 208 x => "center",
200 y => 0, 209 y => "center",
201 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
202 can_events => 1, 213 can_events => 1,
203 @_ 214 @_
204 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205 218
206 for (keys %$self) { 219 for (keys %$self) {
207 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
208 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
209 } 222 }
210 } 223 }
211 224
212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
216 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
217 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
218 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
219 } 235 }
220 236
221 $self 237 $self
222} 238}
223 239
… …
234 return if $self->{parent}; 250 return if $self->{parent};
235 251
236 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
237} 253}
238 254
239sub center {
240 my ($self) = @_;
241
242 $CFClient::UI::ROOT->on_post_alloc (
243 "center_$self" => sub {
244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245 },
246 );
247
248 $self->update;
249}
250
251sub set_visible { 255sub set_visible {
252 my ($self) = @_; 256 my ($self) = @_;
253 257
254 return if $self->{visible}; 258 return if $self->{visible};
255 259
… …
268 272
269 return unless $self->{visible}; 273 return unless $self->{visible};
270 274
271 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
272 276
277 delete $self->{visible};
273 delete $self->{root}; 278 delete $self->{root};
274 delete $self->{visible};
275 279
276 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
277 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
278 282
279 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
280 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
281 285
282 $self->focus_out; 286 $self->emit ("focus_out");
283
284 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
285} 288}
286 289
287sub set_visibility { 290sub set_visibility {
288 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
308 311
309 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
310 if $self->{parent}; 313 if $self->{parent};
311} 314}
312 315
313sub move { 316sub move_abs {
314 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
315 318
316 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
317 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
318 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
319 322
320 $self->update; 323 $self->update;
321} 324}
322 325
323sub set_size { 326sub set_size {
324 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
325 328
326 $self->{def_w} = $w; 329 $self->{force_w} = $w;
327 $self->{def_h} = $h; 330 $self->{force_h} = $h;
328 331
329 $self->realloc; 332 $self->realloc;
330} 333}
331 334
332sub size_request { 335sub size_request {
… …
336 339
337sub configure { 340sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
339 342
340 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
343 348
344 # use alignment to adjust x, y 349 # use alignment to adjust x, y
345 350
346 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 353 }
351 354
352 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 356 $self->{x} = $x;
354 $self->{y} = $y; 357 $self->{y} = $y;
355 $self->update; 358 $self->update;
356 } 359 }
357 360
358 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359 return unless $self->{visible}; 362 return unless $self->{visible};
360 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
362 } 368 }
363}
364
365sub size_allocate {
366 # nothing to be done
367} 369}
368 370
369sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
370} 377}
371 378
372sub set_max_size { 379sub set_max_size {
373 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
374 381
375 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
376 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
377} 386}
378 387
379sub set_tooltip { 388sub set_tooltip {
380 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
381 390
… …
386 395
387 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
388 397
389 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
390 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
391 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
392 } 401 }
393} 402}
394 403
395# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
396sub coord2local { 405sub coord2local {
… …
404 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
405 414
406 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
407} 416}
408 417
409sub focus_in { 418sub invoke_focus_in {
410 my ($self) = @_; 419 my ($self) = @_;
411 420
412 return if $FOCUS == $self; 421 return if $FOCUS == $self;
413 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
414 423
415 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
416 425
417 $self->_emit (focus_in => $focus);
418
419 $focus->update if $focus; 426 $focus->update if $focus;
420 $FOCUS->update; 427 $FOCUS->update;
421}
422 428
429 0
430}
431
423sub focus_out { 432sub invoke_focus_out {
424 my ($self) = @_; 433 my ($self) = @_;
425 434
426 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
427 436
428 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
429 438
430 $self->_emit (focus_out => $focus);
431
432 $focus->update if $focus; #? 439 $focus->update if $focus; #?
433 440
434 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
435 unless $FOCUS; 442 unless $FOCUS;
436}
437 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
438sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
439sub button_up { } 454sub invoke_button_up { 1 }
440sub key_down { } 455sub invoke_key_down { 1 }
441sub key_up { } 456sub invoke_key_up { 1 }
442 457
443sub button_down { 458sub invoke_button_down {
444 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
445 460
446 $self->focus_in; 461 $self->grab_focus;
447}
448 462
449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
453sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
454 480
455sub find_widget { 481sub find_widget {
456 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
457 483
458 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
466 492
467sub set_parent { 493sub set_parent {
468 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
469 495
470 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
473} 498}
474 499
475sub connect {
476 my ($self, $signal, $cb) = @_;
477
478 push @{ $self->{signal_cb}{$signal} }, $cb;
479}
480
481sub _emit {
482 my ($self, $signal, @args) = @_;
483
484 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
485}
486
487sub emit {
488 my ($self, $signal, @args) = @_;
489
490 $self->_emit ($signal, @args)
491 || $self->$signal (@args);
492}
493
494sub visibility_change {
495 #my ($self, $visible) = @_;
496}
497
498sub realloc { 500sub realloc {
499 my ($self) = @_; 501 my ($self) = @_;
500 502
501 if ($self->{visible}) { 503 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self}; 504 return if $self->{root}{realloc}{$self+0};
503 505
504 $self->{root}{realloc}{$self} = $self; 506 $self->{root}{realloc}{$self+0} = $self;
505 $self->{root}->update; 507 $self->{root}->update;
506 } else { 508 } else {
507 delete $self->{req_w}; 509 delete $self->{req_w};
510 delete $self->{req_h};
508 } 511 }
509} 512}
510 513
511sub update { 514sub update {
512 my ($self) = @_; 515 my ($self) = @_;
513 516
514 $self->{parent}->update 517 $self->{parent}->update
515 if $self->{parent}; 518 if $self->{parent};
516} 519}
517 520
521sub reconfigure {
522 my ($self) = @_;
523
524 $self->realloc;
525 $self->update;
526}
527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
518sub draw { 532sub draw {
519 my ($self) = @_; 533 my ($self) = @_;
520 534
521 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
522 546
523 glPushMatrix; 547 glPushMatrix;
524 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
525 $self->_draw;
526 glPopMatrix;
527 549
528 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
529 my ($x, $y) = @$self{qw(x y)};
530
531 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
532 glEnable GL_BLEND; 552 glEnable GL_BLEND;
533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
534 glBegin GL_QUADS; 554 glBegin GL_QUADS;
535 glVertex $x , $y; 555 glVertex 0 , 0;
536 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
537 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
538 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
539 glEnd; 559 glEnd;
540 glDisable GL_BLEND; 560 glDisable GL_BLEND;
541 } 561 }
542 562
543 if ($ENV{PCLIENT_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
544 glPushMatrix; 564 glPushMatrix;
545 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
547 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 568 glVertex 0 , 0;
549 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
550 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
551 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
552 glEnd; 572 glEnd;
553 glPopMatrix; 573 glPopMatrix;
554 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
555 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
556} 579}
557 580
558sub _draw { 581sub _draw {
559 my ($self) = @_; 582 my ($self) = @_;
560 583
… …
563 586
564sub DESTROY { 587sub DESTROY {
565 my ($self) = @_; 588 my ($self) = @_;
566 589
567 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
568 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
569} 594}
570 595
571############################################################################# 596#############################################################################
572 597
573package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
598 623
599 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
600 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
601 626
602 glEnable GL_BLEND; 627 glEnable GL_BLEND;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glColor @$color; 629 glColor_premultiply @$color;
605 630
606 glBegin GL_QUADS; 631 glBegin GL_QUADS;
607 glVertex 0 , 0; 632 glVertex 0 , 0;
608 glVertex 0 , $h; 633 glVertex 0 , $h;
609 glVertex $w, $h; 634 glVertex $w, $h;
… …
624 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
626} 651}
627 652
628sub size_request { 653sub size_request {
629 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
630} 657}
631 658
632sub draw { } 659sub draw { }
633 660
634############################################################################# 661#############################################################################
… …
638our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
639 666
640sub new { 667sub new {
641 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
642 669
643 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
644 671
645 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
646 children => [], 673 children => [],
647 can_events => 0, 674 can_events => 0,
648 %arg, 675 %arg,
649 ); 676 );
677
650 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
651 680
652 $self 681 $self
653} 682}
654 683
655sub add { 684sub add {
… …
703 $x -= $self->{x}; 732 $x -= $self->{x};
704 $y -= $self->{y}; 733 $y -= $self->{y};
705 734
706 my $res; 735 my $res;
707 736
708 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
709 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
710 and return $res; 739 and return $res;
711 } 740 }
712 741
713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
734} 763}
735 764
736sub add { 765sub add {
737 my ($self, $child) = @_; 766 my ($self, $child) = @_;
738 767
739 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
740
741 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
742} 770}
743 771
744sub remove { 772sub remove {
745 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
754 782
755sub size_request { 783sub size_request {
756 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
757} 785}
758 786
759sub size_allocate { 787sub invoke_size_allocate {
760 my ($self, $w, $h, $changed) = @_; 788 my ($self, $w, $h) = @_;
761 789
762 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
763} 793}
764 794
765############################################################################# 795#############################################################################
796
797# back-buffered drawing area
766 798
767package CFClient::UI::Window; 799package CFClient::UI::Window;
768 800
769our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
770 802
… …
781 813
782 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
783 $self->SUPER::update; 815 $self->SUPER::update;
784} 816}
785 817
786sub size_allocate { 818sub invoke_size_allocate {
787 my ($self, $w, $h, $changed) = @_; 819 my ($self, $w, $h) = @_;
788 820
789 $self->SUPER::size_allocate ($w, $h, $changed);
790 $self->update 821 $self->update;
791 if $changed; 822
823 $self->SUPER::invoke_size_allocate ($w, $h)
792} 824}
793 825
794sub _render { 826sub _render {
827 my ($self) = @_;
828
795 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
796} 830}
797 831
798sub render_child { 832sub render_child {
799 my ($self) = @_; 833 my ($self) = @_;
800 834
801 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
802 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
803 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
804 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
805 $self->_render; 846 $self->_render;
806 }; 847 };
807} 848}
808 849
809sub _draw { 850sub _draw {
810 my ($self) = @_; 851 my ($self) = @_;
811 852
812 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
813 854
814 my $tex = $self->{texture} 855 my $tex = $self->{texture}
815 or return; 856 or return;
816 857
817 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
819 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
820 861
821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
822 863
823 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
824} 865}
… …
840} 881}
841 882
842sub size_request { 883sub size_request {
843 my ($self) = @_; 884 my ($self) = @_;
844 885
845 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
846 887
847 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
849 890
850 ($w, $h) 891 ($w, $h)
851} 892}
852 893
853sub size_allocate { 894sub invoke_size_allocate {
854 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
855 896
897 my $child = $self->child;
898
856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858 901
859 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
860 $self->update; 903 $self->update;
904
905 1
861} 906}
862 907
863sub set_offset { 908sub set_offset {
864 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
865 910
… …
898} 943}
899 944
900sub _render { 945sub _render {
901 my ($self) = @_; 946 my ($self) = @_;
902 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
903 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904 952
905 $self->SUPER::_render; 953 $self->SUPER::_render;
906} 954}
907 955
… …
910package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
911 959
912our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
913 961
914sub new { 962sub new {
915 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
916 966
917 my $self; 967 my $self;
918 968
919 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
920 vertical => 1, 970 vertical => 1,
… …
925 ; 975 ;
926 976
927 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
928 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
929 slider => $slider, 979 slider => $slider,
930 @_, 980 %arg,
931 ); 981 );
932 982
933 $self->{vp}->add ($self->{scrolled});
934 $self->add ($self->{vp});
935 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
936 985
937 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
938} 993}
939 994
940sub update { 995sub update {
941 my ($self) = @_; 996 my ($self) = @_;
942 997
… …
945 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
946 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
947 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
948} 1003}
949 1004
950sub size_allocate { 1005sub invoke_size_allocate {
951 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
952
953 $self->SUPER::size_allocate ($w, $h, $changed);
954 1007
955 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
956 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
957} 1012}
958 1013
959#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
960# update viewport offset on scroll 1015# update viewport offset on scroll
961 1016
… …
981 1036
982 if ($self->{bg}) { 1037 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
984 1039
985 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
987 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
988 1043
989 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
990 glVertex 0 , 0; 1045 glVertex 0 , 0;
991 glVertex 0 , $h; 1046 glVertex 0 , $h;
992 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1005 1060
1006our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
1007 1062
1008use CFClient::OpenGL; 1063use CFClient::OpenGL;
1009 1064
1010my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013 1072
1014sub new { 1073sub new {
1015 my $class = shift; 1074 my ($class, %arg) = @_;
1016 1075
1017 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1079 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1080 can_events => 1,
1023 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1024 ); 1084 );
1025 1085
1026 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1027 align => 0, 1087 align => 0,
1028 valign => 1, 1088 valign => 1,
1029 text => $self->{title}, 1089 text => $self->{title},
1030 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1031 1101
1032 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1033} 1111}
1034 1112
1035sub border { 1113sub border {
1036 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1037} 1115}
1038 1116
1039sub size_request { 1117sub size_request {
1040 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1041 1125
1042 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1043 1127
1044 ( 1128 (
1045 $w + $self->border * 2, 1129 $w + $self->border * 2,
1046 $h + $self->border * 2, 1130 $h + $self->border * 2,
1047 ) 1131 )
1048} 1132}
1049 1133
1050sub size_allocate { 1134sub invoke_size_allocate {
1051 my ($self, $w, $h, $changed) = @_; 1135 my ($self, $w, $h) = @_;
1052 1136
1053 return unless $changed; 1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1054 1142
1143 my $border = $self->border;
1144
1055 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1056 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1057 1147
1058 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1059 if $self->{title};
1060
1061 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1062}
1063 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1064sub button_down { 1156sub invoke_button_down {
1065 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1066 1158
1067 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1068 my $border = $self->border; 1160 my $border = $self->border;
1069 1161
… …
1082 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1083 1175
1084 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1086 1178
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 $self->realloc; 1183 $self->realloc;
1093 }; 1184 };
1094 1185
1095 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1099 $self->{motion} = sub { 1190 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1101 1192
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1194
1104 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1106 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1110 } 1203 1
1111} 1204}
1112 1205
1113sub button_up { 1206sub invoke_button_up {
1114 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1115 1208
1116 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1117} 1210}
1118 1211
1119sub mouse_motion { 1212sub invoke_mouse_motion {
1120 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1121 1214
1122 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1123} 1218}
1124 1219
1125sub _draw { 1220sub _draw {
1126 my ($self) = @_; 1221 my ($self) = @_;
1127 1222
1223 my $child = $self->{children}[0];
1224
1128 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1130 1227
1131 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1230
1134 my $border = $self->border; 1231 my $border = $self->border;
1135 1232
1136 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1238
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1144 1241
1145 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1148
1149 glColor @{ $self->{bg} };
1150
1151 $bg->{s} = $rep_x;
1152 $bg->{t} = $rep_y;
1153 $bg->{wrap_mode} = 1;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1247 }
1156 1248
1157 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1158 1250
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1162} 1262}
1163 1263
1164############################################################################# 1264#############################################################################
1165 1265
1166package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1189 1289
1190 $child->set_parent ($self); 1290 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1192 1292
1193 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1194} 1300}
1195 1301
1196# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1303sub clear {
1198 my ($self) = @_; 1304 my ($self) = @_;
… …
1239 (sum @$ws), 1345 (sum @$ws),
1240 (sum @$hs), 1346 (sum @$hs),
1241 ) 1347 )
1242} 1348}
1243 1349
1244sub size_allocate { 1350sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1351 my ($self, $w, $h) = @_;
1246 1352
1247 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1248 1354
1249 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1356 my $req_h = (sum @$hs) || 1;
… …
1281 } 1387 }
1282 1388
1283 $y += $row_h; 1389 $y += $row_h;
1284 } 1390 }
1285 1391
1392 1
1286} 1393}
1287 1394
1288sub find_widget { 1395sub find_widget {
1289 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1290 1397
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1436 )
1330} 1437}
1331 1438
1332sub size_allocate { 1439sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1440 my ($self, $w, $h) = @_;
1334 1441
1335 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1337 1444
1338 my @req; 1445 my @req;
1339 1446
1340 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1342 } else { 1449 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1345 1452
1346 if ($req > $space) { 1453 if ($req > $space) {
1347 # ah well, not enough space 1454 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1349 } else { 1456 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1458
1352 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1353 1460
1354 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1462 for 0 .. $#children;
1356 } 1463 }
1357 } 1464 }
1358 1465
1359 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1360 1467
1361 my $pos = 0; 1468 my $pos = 0;
1362 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1472
1366 $pos += $alloc; 1473 $pos += $alloc;
1367 } 1474 }
1368 1475
1369 1 1476 1
… …
1421 ellipsise => 3, # end 1528 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1423 fontsize => 1, 1530 fontsize => 1,
1424 align => -1, 1531 align => -1,
1425 valign => -1, 1532 valign => -1,
1426 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1427 can_events => 0, 1535 can_events => 0,
1428 %arg 1536 %arg
1429 ); 1537 );
1430 1538
1431 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1458 1566
1459 delete $self->{texture}; 1567 delete $self->{texture};
1460 $self->SUPER::update; 1568 $self->SUPER::update;
1461} 1569}
1462 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1463sub set_text { 1578sub set_text {
1464 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1465 1580
1466 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1468 1583
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1471 1586
1587 delete $self->{size_req};
1472 $self->realloc; 1588 $self->realloc;
1473 $self->update; 1589 $self->update;
1474} 1590}
1475 1591
1476sub set_markup { 1592sub set_markup {
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1599
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1486 1602
1603 delete $self->{size_req};
1487 $self->realloc; 1604 $self->realloc;
1488 $self->update; 1605 $self->update;
1489} 1606}
1490 1607
1491sub size_request { 1608sub size_request {
1492 my ($self) = @_; 1609 my ($self) = @_;
1493 1610
1611 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1617
1500 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1501 1619
1502 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1623
1506 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1507 1625
1508 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1510 } 1631 };
1511 1632
1512 ( 1633 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1634}
1517 1635
1518sub size_allocate { 1636sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1520 1640
1521 delete $self->{texture} 1641 delete $self->{texture}
1522 if $changed; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1523} 1645}
1524 1646
1525sub set_fontsize { 1647sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1527 1649
1528 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1529 delete $self->{texture}; 1651 delete $self->{texture};
1530 1652
1531 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1532} 1662}
1533 1663
1534sub _draw { 1664sub _draw {
1535 my ($self) = @_; 1665 my ($self) = @_;
1536 1666
… …
1542 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1676
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1548 1679
1680 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1552 1684
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1688 };
1559 1689
1560 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1562 1694
1563 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1702 }
1569 1703
1570 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1571} 1705}
1572 1706
… …
1589 can_hover => 1, 1723 can_hover => 1,
1590 can_focus => 1, 1724 can_focus => 1,
1591 valign => 0, 1725 valign => 0,
1592 can_events => 1, 1726 can_events => 1,
1593 #text => ... 1727 #text => ...
1728 #hidden => "*",
1594 @_ 1729 @_
1595 ) 1730 )
1596} 1731}
1597 1732
1598sub _set_text { 1733sub _set_text {
… …
1600 1735
1601 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1602 1737
1603 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1604 1739
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1741 $self->{text} = $text;
1609 1742
1610 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1612 1746
1613 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1614} 1751}
1615 1752
1616sub set_text { 1753sub set_text {
1617 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1618 1755
1619 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1757 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1758}
1624 1759
1625sub get_text { 1760sub get_text {
1626 $_[0]{text} 1761 $_[0]{text}
1627} 1762}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1633 1768
1634 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1635} 1770}
1636 1771
1637sub key_down { 1772sub invoke_key_down {
1638 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1639 1774
1640 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1794 $self->emit ('escape');
1660 } elsif ($uni) { 1795 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1662 } 1799 }
1663 1800
1664 $self->_set_text ($text); 1801 $self->_set_text ($text);
1665 1802
1666 $self->realloc; 1803 $self->realloc;
1667}
1668 1804
1805 1
1806}
1807
1669sub focus_in { 1808sub invoke_focus_in {
1670 my ($self) = @_; 1809 my ($self) = @_;
1671 1810
1672 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1673 1812
1674 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1675} 1814}
1676 1815
1677sub button_down { 1816sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1679 1818
1680 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1820
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1822
1684 # byte-index to char-index 1823 # byte-index to char-index
1685 my $text = $self->{text}; 1824 my $text = $self->{text};
1686 utf8::encode $text; 1825 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1688 1827
1689 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1690 $self->update; 1829 $self->update;
1830
1831 1
1691} 1832}
1692 1833
1693sub mouse_motion { 1834sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1696} 1839}
1697 1840
1698sub _draw { 1841sub _draw {
1699 my ($self) = @_; 1842 my ($self) = @_;
1700 1843
1701 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1702 1845
1703 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1706 } else { 1849 } else {
1707 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1708 } 1851 }
1709 1852
1710 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1856 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1741 1884
1742our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1743 1886
1744use CFClient::OpenGL; 1887use CFClient::OpenGL;
1745 1888
1746sub key_down { 1889sub invoke_key_down {
1747 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1748 1891
1749 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1750 1893
1751 if ($sym == 13) { 1894 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1754 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1757 $self->update; 1901 $self->update;
1758 1902
1759 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1921 } else {
1778 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1779 } 1923 }
1780 1924
1781 } else { 1925 } else {
1782 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1783 } 1929 1
1784
1785} 1930}
1786 1931
1787############################################################################# 1932#############################################################################
1788 1933
1789package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1798 1943
1799sub new { 1944sub new {
1800 my $class = shift; 1945 my $class = shift;
1801 1946
1802 $class->SUPER::new ( 1947 $class->SUPER::new (
1803 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1804 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1806 can_hover => 1, 1952 can_hover => 1,
1807 align => 0, 1953 align => 0,
1808 valign => 0, 1954 valign => 0,
1809 can_events => 1, 1955 can_events => 1,
1810 @_ 1956 @_
1811 ) 1957 )
1812} 1958}
1813 1959
1814sub activate { }
1815
1816sub button_up { 1960sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1818 1962
1819 $self->emit ("activate") 1963 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1822} 1968}
1823 1969
1824sub _draw { 1970sub _draw {
1825 my ($self) = @_; 1971 my ($self) = @_;
1826 1972
1827 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1974
1833 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1836 1978
… …
1841 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1842} 1984}
1843 1985
1844############################################################################# 1986#############################################################################
1845 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1846package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1847 2025
1848our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1849 2027
1850my @tex = 2028my @tex =
… …
1855 2033
1856sub new { 2034sub new {
1857 my $class = shift; 2035 my $class = shift;
1858 2036
1859 $class->SUPER::new ( 2037 $class->SUPER::new (
1860 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1861 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2044 state => 0,
… …
1869} 2048}
1870 2049
1871sub size_request { 2050sub size_request {
1872 my ($self) = @_; 2051 my ($self) = @_;
1873 2052
1874 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1875} 2054}
1876 2055
1877sub button_down { 2056sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1879 2058
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1884 } 2067 1
1885} 2068}
1886 2069
1887sub _draw { 2070sub _draw {
1888 my ($self) = @_; 2071 my ($self) = @_;
1889 2072
1890 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1891 2074
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2076
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2080
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2082
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2084
… …
1907package CFClient::UI::Image; 2092package CFClient::UI::Image;
1908 2093
1909our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1910 2095
1911use CFClient::OpenGL; 2096use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2097
1914our %loaded_images; 2098our %texture_cache;
1915 2099
1916sub new { 2100sub new {
1917 my $class = shift; 2101 my $class = shift;
1918 2102
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1920 2107
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
1922 2110
1923 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1925 2113
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2115
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2117
1932 $self 2118 $self
1933} 2119}
1934 2120
1935sub size_request { 2121sub size_request {
1936 my ($self) = @_; 2122 my ($self) = @_;
1937 2123
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1939} 2125}
1940 2126
1941sub _draw { 2127sub _draw {
1942 my ($self) = @_; 2128 my ($self) = @_;
1943 2129
… …
2054 2240
2055 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2057 2243
2058 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2249
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2351 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2352 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2353 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2354 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2355 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2356 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2357 min_h => $::WIDTH / 80,
2171 vertical => 0, 2358 vertical => 0,
2172 can_hover => 1, 2359 can_hover => 1,
2173 inner_pad => 0.02, 2360 inner_pad => 0.02,
2174 @_ 2361 @_
2175 ); 2362 );
… …
2178 $self->update; 2365 $self->update;
2179 2366
2180 $self 2367 $self
2181} 2368}
2182 2369
2183sub changed { }
2184
2185sub set_range { 2370sub set_range {
2186 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2187 2372
2188 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2189 2374
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2192} 2379}
2193 2380
2194sub set_value { 2381sub set_value {
2195 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2196 2383
… …
2207 if $unit; 2394 if $unit;
2208 2395
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2397
2211 if ($value != $old_value) { 2398 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2213 $self->update; 2400 $self->update;
2214 } 2401 }
2215} 2402}
2216 2403
2217sub size_request { 2404sub size_request {
2218 my ($self) = @_; 2405 my ($self) = @_;
2219 2406
2220 my $w = $self->{req_w}; 2407 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2408}
2225 2409
2226sub button_down { 2410sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2228 2412
2229 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2414
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2416
2233 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2418}
2235 2419
2236sub mouse_motion { 2420sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2238 2422
2239 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2425
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2426 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2427
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2428 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2429
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2430 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431 } else {
2432 return 0;
2433 }
2434
2247 } 2435 1
2248} 2436}
2249 2437
2250sub update { 2438sub update {
2251 my ($self) = @_; 2439 my ($self) = @_;
2252 2440
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2255 2450
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2258 2453
… …
2264 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2266 2461
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2269 }); 2464 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2465
2277 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2278 2467
2279 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2280 2469
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2343 2532
2344############################################################################# 2533#############################################################################
2345 2534
2346package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2347 2536
2348our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2349 2538
2350use CFClient::OpenGL; 2539use CFClient::OpenGL;
2351 2540
… …
2353 my $class = shift; 2542 my $class = shift;
2354 2543
2355 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2356 fontsize => 1, 2545 fontsize => 1,
2357 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2358 #font => default_font 2548 #font => default_font
2359 @_, 2549 @_,
2360 2550
2361 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2362 par => [], 2552 par => [],
… …
2377 2567
2378 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2569 $self->reflow;
2380} 2570}
2381 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2382sub size_allocate { 2578sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2579 my ($self, $w, $h) = @_;
2384 2580
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2581 my (undef, undef, @other) = @{ $self->{children} };
2386 2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2583
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2588
2393 $self->reflow; 2589 $self->reflow;
2394}
2395 2590
2396sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2397 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2398 2596
2399 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2400 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2404 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2405 $layout->size 2606 $layout
2406} 2607}
2407 2608
2408sub reflow { 2609sub reflow {
2409 my ($self) = @_; 2610 my ($self) = @_;
2410 2611
… …
2419 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2420} 2621}
2421 2622
2422sub clear { 2623sub clear {
2423 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2424 2628
2425 $self->{par} = []; 2629 $self->{par} = [];
2426 $self->{height} = 0; 2630 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2632}
2429 2633
2430sub add_paragraph { 2634sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2432 2636
2433 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2434 my ($w, $h) = $self->text_size ($line); 2638
2435 $self->{height} += $h; 2639 $para = {
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2437 } 2646 };
2438 2647
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2440} 2660}
2441 2661
2442sub update { 2662sub update {
2443 my ($self) = @_; 2663 my ($self) = @_;
2444 2664
… …
2446 2666
2447 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2448 2668
2449 delete $self->{texture}; 2669 delete $self->{texture};
2450 2670
2451 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2673
2454 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2675 my $height = 0;
2456 2676
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2467 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2468 } 2685 }
2469 2686
2470 $height += $_->[1]; 2687 $height += $para->{h};
2471 } 2688 }
2472 2689
2473 $self->{height} = $height; 2690 $self->{height} = $height;
2474 2691
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2693
2477 delete $self->{texture}; 2694 delete $self->{texture};
2478 } 2695 }
2479 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2483 2704
2484 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2485 2706
2486 my $y0 = $top; 2707 my $y0 = $top;
2487 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2488 2709
2489 my $y = 0; 2710 my $y = 0;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494 2711
2495 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498 2715
2499 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2717 my $h = $para->{h};
2501 2718
2502 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] }); 2720
2504 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2505 $layout->set_markup ($par->[4]);
2506 2722
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2508 2724
2509 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2511 } 2740 }
2512 2741
2513 $y += $h; 2742 $y += $h;
2514 } 2743 }
2515 2744
2516 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2517 }; 2746 };
2518 }); 2747 });
2519} 2748}
2520 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2521sub _draw { 2759sub _draw {
2522 my ($self) = @_; 2760 my ($self) = @_;
2523 2761
2524 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2529 2767
2530 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2531
2532} 2769}
2533 2770
2534############################################################################# 2771#############################################################################
2535 2772
2536package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2615} 2852}
2616 2853
2617sub set_tooltip_from { 2854sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2855 my ($self, $widget) = @_;
2619 2856
2857 my $tooltip = $widget->{tooltip};
2858
2859 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862 . "req $widget->{req_w} $widget->{req_h}\n"
2863 . "visible $widget->{visible}";
2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2868
2620 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2870 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2872 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2873 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2874 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2883
2635 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2636} 2885}
2637 2886
2638sub size_allocate { 2887sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2888 my ($self, $w, $h) = @_;
2640 2889
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2891}
2892
2893sub invoke_visibility_change {
2894 my ($self, $visible) = @_;
2895
2896 return unless $visible;
2897
2898 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner}
2900 or return;
2901
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w};
2906
2907 $self->move_abs ($x, $y);
2908 });
2644} 2909}
2645 2910
2646sub _draw { 2911sub _draw {
2647 my ($self) = @_; 2912 my ($self) = @_;
2648 2913
… …
2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2735 3000
2736 if ($tex) { 3001 if ($tex) {
2737 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2739 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2741 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2742 } 3007 }
2743} 3008}
2744 3009
2745sub DESTROY { 3010sub destroy {
2746 my ($self) = @_; 3011 my ($self) = @_;
2747 3012
2748 $self->{timer}->cancel 3013 $self->{timer}->cancel
2749 if $self->{timer}; 3014 if $self->{timer};
2750 3015
2751 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2752} 3017}
2753 3018
2754############################################################################# 3019#############################################################################
2755 3020
2756package CFClient::UI::Inventory; 3021package CFClient::UI::Buttonbar;
2757 3022
2758our @ISA = CFClient::UI::ScrolledWindow::; 3023our @ISA = CFClient::UI::HBox::;
2759 3024
2760sub new { 3025# TODO: should actualyl wrap buttons and other goodies.
2761 my $class = shift;
2762
2763 my $self = $class->SUPER::new (
2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_,
2766 );
2767
2768 $self
2769}
2770
2771sub set_items {
2772 my ($self, $items) = @_;
2773
2774 $self->{scrolled}->clear;
2775 return unless $items;
2776
2777 my @items = sort {
2778 ($a->{type} <=> $b->{type})
2779 or ($a->{name} cmp $b->{name})
2780 } @$items;
2781
2782 $self->{real_items} = \@items;
2783
2784 my $row = 0;
2785 for my $item (@items) {
2786 CFClient::Item::update_widgets $item;
2787
2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2791
2792 $row++;
2793 }
2794}
2795 3026
2796############################################################################# 3027#############################################################################
2797 3028
2798package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2799 3030
… …
2811 ); 3042 );
2812 3043
2813 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2814 3045
2815 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2816 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2817 3048
2818 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2819 if (!ref $widget) { 3050 if (!ref $widget) {
2820 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2821 can_hover => 1, 3052 can_hover => 1,
2822 can_events => 1, 3053 can_events => 1,
2823 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2824 } 3056 }
2825 3057
2826 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2827 3059
2828 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2833 3065
2834# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2835sub popup { 3067sub popup {
2836 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2837 3069
2838 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2839 3071
2840 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2841 $GRAB = $self; 3073 $GRAB = $self;
2842 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2843 3075
2844 $self->show; 3076 $self->show;
2845 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2846} 3078}
2847 3079
2848sub mouse_motion { 3080sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2850 3082
2851 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2852 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2854}
2855 3086
3087 0
3088}
3089
2856sub button_up { 3090sub invoke_button_up {
2857 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2858 3092
2859 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2860 undef $GRAB; 3094 undef $GRAB;
2861 $self->hide; 3095 $self->hide;
2862 3096
2863 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2864 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2865 } 3103 1
2866} 3104}
2867 3105
2868############################################################################# 3106#############################################################################
2869 3107
2870package CFClient::UI::Statusbox; 3108package CFClient::UI::Multiplexer;
2871 3109
2872our @ISA = CFClient::UI::VBox::; 3110our @ISA = CFClient::UI::Container::;
2873 3111
2874sub new { 3112sub new {
2875 my $class = shift; 3113 my $class = shift;
2876 3114
2877 $class->SUPER::new ( 3115 my $self = $class->SUPER::new (
3116 @_,
3117 );
3118
3119 $self->{current} = $self->{children}[0]
3120 if @{ $self->{children} };
3121
3122 $self
3123}
3124
3125sub add {
3126 my ($self, @widgets) = @_;
3127
3128 $self->SUPER::add (@widgets);
3129
3130 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} };
3132}
3133
3134sub set_current_page {
3135 my ($self, $page_or_widget) = @_;
3136
3137 my $widget = ref $page_or_widget
3138 ? $page_or_widget
3139 : $self->{children}[$page_or_widget];
3140
3141 $self->{current} = $widget;
3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3143
3144 $self->emit (page_changed => $self->{current});
3145
3146 $self->realloc;
3147}
3148
3149sub visible_children {
3150 $_[0]{current}
3151}
3152
3153sub size_request {
3154 my ($self) = @_;
3155
3156 $self->{current}->size_request
3157}
3158
3159sub invoke_size_allocate {
3160 my ($self, $w, $h) = @_;
3161
3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3165}
3166
3167sub _draw {
3168 my ($self) = @_;
3169
3170 $self->{current}->draw;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Notebook;
3176
3177our @ISA = CFClient::UI::VBox::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self
3186 @_,
3187 );
3188
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191
3192 $self
3193}
3194
3195sub add {
3196 my ($self, $title, $widget, $tooltip) = @_;
3197
3198 Scalar::Util::weaken $self;
3199
3200 $self->{buttonbar}->add (new CFClient::UI::Button
3201 markup => $title,
3202 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) },
3204 );
3205
3206 $self->{multiplexer}->add ($widget);
3207}
3208
3209sub set_current_page {
3210 my ($self, $page) = @_;
3211
3212 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
2878 fontsize => 0.8, 3282 fontsize => 0.8,
2879 @_, 3283 @_,
2880 ) 3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
2881} 3291}
2882 3292
2883sub reorder { 3293sub reorder {
2884 my ($self) = @_; 3294 my ($self) = @_;
2885 my $NOW = time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
2886 3301
2887 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
2888 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2889 } 3304 }
2890 3305
… …
2893 my @items = sort { 3308 my @items = sort {
2894 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
2895 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
2896 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
2897 3312
3313 $self->{timer}->interval (1);
3314
2898 my $count = 10 + 1; 3315 my $count = 10 + 1;
2899 for my $item (@items) { 3316 for my $item (@items) {
2900 last unless --$count; 3317 last unless --$count;
2901 3318
2902 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
2903 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
2904 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
2905 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
2906 : $item->{text}; 3323 : $item->{text};
2907 3324
… …
2915 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
2916 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
2917 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
2918 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
2920 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
2921 can_events => 1, 3338 can_events => 1,
2922 can_hover => 1 3339 can_hover => 1
2923 }; 3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
2924 } 3353 }
2925 3354
2926 $self->clear; 3355 $self->clear;
2927 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
2928} 3357}
… …
2933 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
2934 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
2935 3364
2936 return unless $text; 3365 return unless $text;
2937 3366
2938 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2939 3368
2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2941 3370
2942 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
2943 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
2944 $item->{count}++; 3373 $item->{count}++;
2945 } else { 3374 } else {
2946 $item->{count} = 1; 3375 $item->{count} = 1;
2947 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
2948 } 3377 }
2949 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
2950 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
2951 delete $item->{label}; 3380 delete $item->{label};
2952 } else { 3381 } else {
2953 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
2954 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
2973 3402
2974 $self->reorder; 3403 $self->reorder;
2975 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
2976} 3405}
2977 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
2978############################################################################# 3415#############################################################################
2979 3416
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
2980package CFClient::UI::Root; 3789package CFClient::UI::Root;
2981 3790
2982our @ISA = CFClient::UI::Container::; 3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
2983 3794
2984use CFClient::OpenGL; 3795use CFClient::OpenGL;
2985 3796
2986sub new { 3797sub new {
2987 my $class = shift; 3798 my $class = shift;
… …
2994 Scalar::Util::weaken ($self->{root} = $self); 3805 Scalar::Util::weaken ($self->{root} = $self);
2995 3806
2996 $self 3807 $self
2997} 3808}
2998 3809
2999sub configure {
3000 my ($self, $x, $y, $w, $h) = @_;
3001
3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
3005
3006sub reconfigure {
3007 my ($self) = @_;
3008
3009 $self->SUPER::reconfigure;
3010
3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3012 if $self->{w};
3013}
3014
3015sub size_request { 3810sub size_request {
3016 my ($self) = @_; 3811 my ($self) = @_;
3017 3812
3018 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
3019} 3814}
3020 3815
3816sub _to_pixel {
3817 my ($coord, $size, $max) = @_;
3818
3819 $coord =
3820 $coord eq "center" ? ($max - $size) * 0.5
3821 : $coord eq "max" ? $max
3822 : $coord;
3823
3824 $coord = 0 if $coord < 0;
3825 $coord = $max - $size if $coord > $max - $size;
3826
3827 int $coord + 0.5
3828}
3829
3021sub size_allocate { 3830sub invoke_size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3831 my ($self, $w, $h) = @_;
3023 3832
3024 for my $child ($self->children) { 3833 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3835
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3836 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3837 $Y = $child->{force_y} if exists $child->{force_y};
3029 3838
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3839 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037 3841
3038 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3039 } 3843 }
3844
3845 1
3040} 3846}
3041 3847
3042sub coord2local { 3848sub coord2local {
3043 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3044 3850
… …
3058} 3864}
3059 3865
3060sub add { 3866sub add {
3061 my ($self, @children) = @_; 3867 my ($self, @children) = @_;
3062 3868
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3869 $_->{is_toplevel} = 1
3065 3870 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3871
3071 $self->SUPER::add (@children); 3872 $self->SUPER::add (@children);
3072} 3873}
3073 3874
3074sub remove { 3875sub remove {
3075 my ($self, @children) = @_; 3876 my ($self, @children) = @_;
3076 3877
3077 $self->SUPER::remove (@children); 3878 $self->SUPER::remove (@children);
3879
3880 delete $self->{is_toplevel}
3881 for @children;
3078 3882
3079 while (@children) { 3883 while (@children) {
3080 my $w = pop @children; 3884 my $w = pop @children;
3081 push @children, $w->children; 3885 push @children, $w->children;
3082 $w->set_invisible; 3886 $w->set_invisible;
… …
3102 $_->() 3906 $_->()
3103 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
3104 } 3908 }
3105 3909
3106 if ($self->{realloc}) { 3910 if ($self->{realloc}) {
3911 my %queue;
3107 my @queue; 3912 my @queue;
3913 my $widget;
3108 3914
3915 outer:
3109 while () { 3916 while () {
3110 if ($self->{realloc}) { 3917 if (my $realloc = delete $self->{realloc}) {
3111 #TODO use array-of-depth approach 3918 for $widget (values %$realloc) {
3919 $widget->{visible} or next; # do not resize invisible widgets
3112 3920
3113 @queue = sort { $a->{visible} <=> $b->{visible} } 3921 $queue{$widget+0}++ and next; # duplicates are common
3114 @queue, values %{delete $self->{realloc}}; 3922
3923 push @{ $queue[$widget->{visible}] }, $widget;
3924 }
3115 } 3925 }
3116 3926
3927 while () {
3928 @queue or last outer;
3929
3930 $widget = pop @{ $queue[-1] || [] }
3931 and last;
3932
3933 pop @queue;
3934 }
3935
3936 delete $queue{$widget+0};
3937
3938 my ($w, $h) = $widget->size_request;
3939
3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3942
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3945
3946 $w = $widget->{force_w} if exists $widget->{force_w};
3947 $h = $widget->{force_h} if exists $widget->{force_h};
3948
3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3950 || delete $widget->{force_realloc}) {
3951 $widget->{req_w} = $w;
3952 $widget->{req_h} = $h;
3953
3954 $self->{size_alloc}{$widget+0} = $widget;
3955
3956 if (my $parent = $widget->{parent}) {
3957 $self->{realloc}{$parent+0} = $parent
3958 unless $queue{$parent+0};
3959
3960 $parent->{force_size_alloc} = 1;
3961 $self->{size_alloc}{$parent+0} = $parent;
3962 }
3963 }
3964
3965 delete $self->{realloc}{$widget+0};
3966 }
3967 }
3968
3969 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
3971 values %$size_alloc;
3972
3973 while () {
3117 my $widget = pop @queue || last; 3974 my $widget = pop @queue || last;
3118 3975
3119 $widget->{visible} or last; # do not resize invisible widgets 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120
3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122 ? @$widget{qw(def_w def_h)}
3123 : $widget->size_request;
3124
3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3126
3127 $widget->{req_w} = $w;
3128 $widget->{req_h} = $h;
3129
3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3131
3132 push @queue, $widget->{parent}
3133 if $widget->{parent};
3134 }
3135 }
3136
3137 while (my $size_alloc = delete $self->{size_alloc}) {
3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3143 3977
3144 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3146 3980
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3981 $w = int $w + 0.5;
3982 $h = int $h + 0.5;
3148 3983
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w};
3986 $widget->{old_h} = $widget->{h};
3987
3149 $widget->{w} = $w; 3988 $widget->{w} = $w;
3150 $widget->{h} = $h; 3989 $widget->{h} = $h;
3151 3990
3152 $widget->emit (size_allocate => $w, $h, $changed); 3991 $widget->emit (size_allocate => $w, $h);
3992 }
3153 } 3993 }
3154 } 3994 }
3155 3995
3156 while ($self->{post_alloc_hook}) { 3996 while ($self->{post_alloc_hook}) {
3157 $_->() 3997 $_->()
3158 for values %{delete $self->{post_alloc_hook}}; 3998 for values %{delete $self->{post_alloc_hook}};
3159 } 3999 }
4000
3160 4001
3161 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
3164 4005
… …
3166 glLoadIdentity; 4007 glLoadIdentity;
3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
3169 glLoadIdentity; 4010 glLoadIdentity;
3170 4011
4012 {
4013 package CFClient::UI::Base;
4014
4015 ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h});
4017 }
4018
3171 $self->_draw; 4019 $self->_draw;
3172} 4020}
3173 4021
3174############################################################################# 4022#############################################################################
3175 4023

Diff Legend

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