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

Diff Legend

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