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

Diff Legend

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