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

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

Diff Legend

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