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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 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}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub show_centered {
251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261} 253}
262 254
263sub set_visible { 255sub set_visible {
264 my ($self) = @_; 256 my ($self) = @_;
265 257
266 return if $self->{visible}; 258 return if $self->{visible};
267 259
268 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
270 262
271 $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;
272} 268}
273 269
274sub set_invisible { 270sub set_invisible {
275 my ($self) = @_; 271 my ($self) = @_;
276 272
277 return unless $self->{visible}; 273 return unless $self->{visible};
278 274
279 # broken show/hide model 275 $_->set_invisible for $self->children;
280 276
277 delete $self->{visible};
281 delete $self->{root}; 278 delete $self->{root};
282 delete $self->{visible};
283 279
284 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
286 282
287 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
289 285
290 $self->focus_out; 286 $self->emit ("focus_out");
291
292 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
293} 305}
294 306
295sub hide { 307sub hide {
296 my ($self) = @_; 308 my ($self) = @_;
297 309
… …
299 311
300 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
301 if $self->{parent}; 313 if $self->{parent};
302} 314}
303 315
304sub move { 316sub move_abs {
305 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
306 318
307 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
308 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
309 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
310 322
311 $self->update; 323 $self->update;
312} 324}
313 325
314sub set_size { 326sub set_size {
315 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
316 328
317 $self->{def_w} = $w; 329 $self->{force_w} = $w;
318 $self->{def_h} = $h; 330 $self->{force_h} = $h;
319 331
320 $self->check_size; 332 $self->realloc;
321} 333}
322 334
323sub size_request { 335sub size_request {
324 require Carp; 336 require Carp;
325 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
326} 338}
327 339
340sub baseline_shift {
341 0
342}
343
328sub configure { 344sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
330 346
331 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
334 352
335 # use alignment to adjust x, y 353 # use alignment to adjust x, y
336 354
337 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 357 }
342 358
343 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 360 $self->{x} = $x;
345 $self->{y} = $y; 361 $self->{y} = $y;
346 $self->update; 362 $self->update;
347 } 363 }
348 364
349 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
351 }
352}
353 367
354sub size_allocate { 368 $self->{alloc_w} = $w;
355 # nothing to be done 369 $self->{alloc_h} = $h;
356}
357 370
358sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
359 my ($self) = @_; 372 }
360
361 $self->check_size (1);
362 $self->update;
363} 373}
364 374
365sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
366} 381}
367 382
368sub set_max_size { 383sub set_max_size {
369 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
370 385
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
373} 390}
374 391
375sub set_tooltip { 392sub set_tooltip {
376 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
377 394
… …
382 399
383 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
384 401
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
388 } 405 }
389} 406}
390 407
391# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
392sub coord2local { 409sub coord2local {
… …
400 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
401 418
402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
403} 420}
404 421
405sub focus_in { 422sub invoke_focus_in {
406 my ($self) = @_; 423 my ($self) = @_;
407 424
408 return if $FOCUS == $self; 425 return if $FOCUS == $self;
409 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
410 427
411 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
412 429
413 $self->_emit (focus_in => $focus); 430 $self->update;
414 431
415 $focus->update if $focus; 432 0
416 $FOCUS->update;
417} 433}
418 434
419sub focus_out { 435sub invoke_focus_out {
420 my ($self) = @_; 436 my ($self) = @_;
421 437
422 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
423 439
424 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
425 441
426 $self->_emit (focus_out => $focus); 442 $self->update;
427 443
428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
431 unless $FOCUS; 445 unless $FOCUS;
432}
433 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
434sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
435sub button_up { } 458sub invoke_button_up { 1 }
436sub key_down { } 459sub invoke_key_down { 1 }
437sub key_up { } 460sub invoke_key_up { 1 }
438 461
439sub button_down { 462sub invoke_button_down {
440 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
441 464
442 $self->focus_in; 465 $self->grab_focus;
443}
444 466
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 535
451sub draw { 536sub draw {
452 my ($self) = @_; 537 my ($self) = @_;
453 538
454 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 548
456 glPushMatrix; 549 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 551
461 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 554 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 556 glBegin GL_QUADS;
468 glVertex $x , $y; 557 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
472 glEnd; 561 glEnd;
473 glDisable GL_BLEND; 562 glDisable GL_BLEND;
474 } 563 }
475 564
476 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 566 glPushMatrix;
478 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 570 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
485 glEnd; 574 glEnd;
486 glPopMatrix; 575 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
489} 581}
490 582
491sub _draw { 583sub _draw {
492 my ($self) = @_; 584 my ($self) = @_;
493 585
494 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
495} 587}
496 588
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 589sub DESTROY {
558 my ($self) = @_; 590 my ($self) = @_;
559 591
560 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
561 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 596}
563 597
564############################################################################# 598#############################################################################
565 599
566package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
591 625
592 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
594 628
595 glEnable GL_BLEND; 629 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 631 glColor_premultiply @$color;
598 632
599 glBegin GL_QUADS; 633 glBegin GL_QUADS;
600 glVertex 0 , 0; 634 glVertex 0 , 0;
601 glVertex 0 , $h; 635 glVertex 0 , $h;
602 glVertex $w, $h; 636 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
619} 653}
620 654
621sub size_request { 655sub size_request {
622 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
623} 659}
624 660
625sub draw { } 661sub draw { }
626 662
627############################################################################# 663#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
632 668
633sub new { 669sub new {
634 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
635 671
636 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
637 673
638 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
639 children => [], 675 children => [],
640 can_events => 0, 676 can_events => 0,
641 %arg, 677 %arg,
642 ); 678 );
679
643 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
644 682
645 $self 683 $self
646} 684}
647 685
648sub add { 686sub add {
… …
656 $self->{children} = [ 694 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
659 ]; 697 ];
660 698
661 $self->check_size (1); 699 $self->realloc;
662 $self->update;
663} 700}
664 701
665sub children { 702sub children {
666 @{ $_[0]{children} } 703 @{ $_[0]{children} }
667} 704}
… …
672 delete $child->{parent}; 709 delete $child->{parent};
673 $child->hide; 710 $child->hide;
674 711
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 713
677 $self->check_size (1); 714 $self->realloc;
678 $self->update;
679} 715}
680 716
681sub clear { 717sub clear {
682 my ($self) = @_; 718 my ($self) = @_;
683 719
… …
687 for (@$children) { 723 for (@$children) {
688 delete $_->{parent}; 724 delete $_->{parent};
689 $_->hide; 725 $_->hide;
690 } 726 }
691 727
692 $self->check_size; 728 $self->realloc;
693 $self->update;
694} 729}
695 730
696sub find_widget { 731sub find_widget {
697 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
698 733
699 $x -= $self->{x}; 734 $x -= $self->{x};
700 $y -= $self->{y}; 735 $y -= $self->{y};
701 736
702 my $res; 737 my $res;
703 738
704 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
706 and return $res; 741 and return $res;
707 } 742 }
708 743
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 765}
731 766
732sub add { 767sub add {
733 my ($self, $child) = @_; 768 my ($self, $child) = @_;
734 769
735 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
738} 772}
739 773
740sub remove { 774sub remove {
741 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
750 784
751sub size_request { 785sub size_request {
752 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
753} 787}
754 788
755sub size_allocate { 789sub invoke_size_allocate {
756 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
757 791
758 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
759} 795}
760 796
761############################################################################# 797#############################################################################
798
799# back-buffered drawing area
762 800
763package CFClient::UI::Window; 801package CFClient::UI::Window;
764 802
765our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
766 804
… …
777 815
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 817 $self->SUPER::update;
780} 818}
781 819
782sub size_allocate { 820sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
784 822
785 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
787} 826}
788 827
789sub _render { 828sub _render {
829 my ($self) = @_;
830
790 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
791} 832}
792 833
793sub render_child { 834sub render_child {
794 my ($self) = @_; 835 my ($self) = @_;
795 836
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
799 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
800 $self->_render; 848 $self->_render;
801 }; 849 };
802} 850}
803 851
804sub _draw { 852sub _draw {
805 my ($self) = @_; 853 my ($self) = @_;
806 854
807 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
808 856
809 my $tex = $self->{texture} 857 my $tex = $self->{texture}
810 or return; 858 or return;
811 859
812 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
815 863
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 865
818 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
819} 867}
… …
835} 883}
836 884
837sub size_request { 885sub size_request {
838 my ($self) = @_; 886 my ($self) = @_;
839 887
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 889
842 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
843} 891 $h = 10 if $self->{scroll_y};
844 892
893 ($w, $h)
894}
895
845sub size_allocate { 896sub invoke_size_allocate {
846 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
847 898
899 my $child = $self->child;
900
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 903
851 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
852 $self->update; 905 $self->update;
906
907 1
853} 908}
854 909
855sub set_offset { 910sub set_offset {
856 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
857 912
… …
890} 945}
891 946
892sub _render { 947sub _render {
893 my ($self) = @_; 948 my ($self) = @_;
894 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 954
897 $self->SUPER::_render; 955 $self->SUPER::_render;
898} 956}
899 957
… …
902package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
903 961
904our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
905 963
906sub new { 964sub new {
907 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
908 968
909 my $self; 969 my $self;
910 970
911 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
912 vertical => 1, 972 vertical => 1,
… …
917 ; 977 ;
918 978
919 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 981 slider => $slider,
922 @_, 982 %arg,
923 ); 983 );
924 984
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
928 987
929 $self 988 $self
930} 989}
931 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
932sub update { 1005sub update {
933 my ($self) = @_; 1006 my ($self) = @_;
934 1007
935 $self->SUPER::update; 1008 $self->SUPER::update;
936 1009
937 # todo: overwrite size_allocate of child 1010 $self->update_slider;
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940} 1011}
941 1012
942sub size_allocate { 1013sub invoke_size_allocate {
943 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
944 1015
1016 $self->update_slider;
1017
945 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1019}
950
951#TODO# update range on size_allocate depending on child
952# update viewport offset on scroll
953 1020
954############################################################################# 1021#############################################################################
955 1022
956package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
957 1024
… …
973 1040
974 if ($self->{bg}) { 1041 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
976 1043
977 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
980 1047
981 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
982 glVertex 0 , 0; 1049 glVertex 0 , 0;
983 glVertex 0 , $h; 1050 glVertex 0 , $h;
984 glVertex $w, $h; 1051 glVertex $w, $h;
… …
997 1064
998our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
999 1066
1000use CFClient::OpenGL; 1067use CFClient::OpenGL;
1001 1068
1002my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1076
1006sub new { 1077sub new {
1007 my $class = shift; 1078 my ($class, %arg) = @_;
1008 1079
1009 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1083 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1084 can_events => 1,
1015 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1016 ); 1088 );
1017 1089
1018 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1019 align => 0, 1091 align => 0,
1020 valign => 1, 1092 valign => 1,
1021 text => $self->{title}, 1093 text => $self->{title},
1022 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1023 1105
1024 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1025} 1115}
1026 1116
1027sub border { 1117sub border {
1028 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1029} 1119}
1030 1120
1031sub size_request { 1121sub size_request {
1032 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1033 1129
1034 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1035 1131
1036 ( 1132 (
1037 $w + $self->border * 2, 1133 $w + $self->border * 2,
1038 $h + $self->border * 2, 1134 $h + $self->border * 2,
1039 ) 1135 )
1040} 1136}
1041 1137
1042sub size_allocate { 1138sub invoke_size_allocate {
1043 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1044 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
1045 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1047 1151
1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049 if $self->{title};
1050
1051 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1052}
1053 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1054sub button_down { 1168sub invoke_button_down {
1055 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1056 1170
1057 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1058 my $border = $self->border; 1172 my $border = $self->border;
1059 1173
… …
1072 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
1073 1187
1074 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1076 1190
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1193
1082 $self->check_size; 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1195 $self->realloc;
1083 }; 1196 };
1084 1197
1085 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1202 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1091 1204
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1206
1094 $self->{user_x} = $bx + $x - $ox; 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy; 1208 # HACK: the next line is required to enforce placement
1096 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1100 } 1215 1
1101} 1216}
1102 1217
1103sub button_up { 1218sub invoke_button_up {
1104 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1105 1220
1106 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1107} 1222}
1108 1223
1109sub mouse_motion { 1224sub invoke_mouse_motion {
1110 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1111 1226
1112 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1113} 1230}
1114 1231
1115sub _draw { 1232sub _draw {
1116 my ($self) = @_; 1233 my ($self) = @_;
1117 1234
1235 my $child = $self->{children}[0];
1236
1118 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1120 1239
1121 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1242
1124 my $border = $self->border; 1243 my $border = $self->border;
1125 1244
1126 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1250
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1134 1253
1135 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
1138
1139 glColor @{ $self->{bg} };
1140
1141 $bg->{s} = $rep_x;
1142 $bg->{t} = $rep_y;
1143 $bg->{wrap_mode} = 1;
1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1259 }
1146 1260
1147 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1148 1262
1149 $self->{title}->draw if $self->{title};
1150
1151 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1152} 1274}
1153 1275
1154############################################################################# 1276#############################################################################
1155 1277
1156package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1178 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1179 1301
1180 $child->set_parent ($self); 1302 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1182 1304
1183 $self->check_size (1); 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1184} 1312}
1185 1313
1186# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1187sub clear { 1315sub clear {
1188 my ($self) = @_; 1316 my ($self) = @_;
… …
1193 for (@children) { 1321 for (@children) {
1194 delete $_->{parent}; 1322 delete $_->{parent};
1195 $_->hide; 1323 $_->hide;
1196 } 1324 }
1197 1325
1198 $self->check_size (1); 1326 $self->realloc;
1199 $self->update;
1200} 1327}
1201 1328
1202sub get_wh { 1329sub get_wh {
1203 my ($self) = @_; 1330 my ($self) = @_;
1204 1331
… …
1230 (sum @$ws), 1357 (sum @$ws),
1231 (sum @$hs), 1358 (sum @$hs),
1232 ) 1359 )
1233} 1360}
1234 1361
1235sub size_allocate { 1362sub invoke_size_allocate {
1236 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1237 1364
1238 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1239 1366
1240 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1272 } 1399 }
1273 1400
1274 $y += $row_h; 1401 $y += $row_h;
1275 } 1402 }
1276 1403
1404 1
1277} 1405}
1278 1406
1279sub find_widget { 1407sub find_widget {
1280 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1281 1409
… …
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 ) 1448 )
1321} 1449}
1322 1450
1323sub size_allocate { 1451sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1325 1453
1326 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1328 1456
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1457 my @req;
1330 my $req = List::Util::sum @req;
1331 1458
1332 if ($req > $space) { 1459 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1460 @req = ($space / (@children || 1)) x @children;
1334 $_ *= $space / $req for @req;
1335 } else { 1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1337 1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1473 $req[$_] += $space * $children[$_]{expand}
1339 for 0 .. $#$children; 1474 for 0 .. $#children;
1475 }
1340 } 1476 }
1341 1477
1342 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1343 1479
1344 my $pos = 0; 1480 my $pos = 0;
1345 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1346 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1348 1484
1349 $pos += $alloc; 1485 $pos += $alloc;
1350 } 1486 }
1351 1487
1352 1 1488 1
… …
1404 ellipsise => 3, # end 1540 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1406 fontsize => 1, 1542 fontsize => 1,
1407 align => -1, 1543 align => -1,
1408 valign => -1, 1544 valign => -1,
1409 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1410 can_events => 0, 1547 can_events => 0,
1411 %arg 1548 %arg
1412 ); 1549 );
1413 1550
1414 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
… …
1441 1578
1442 delete $self->{texture}; 1579 delete $self->{texture};
1443 $self->SUPER::update; 1580 $self->SUPER::update;
1444} 1581}
1445 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1446sub set_text { 1590sub set_text {
1447 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1448 1592
1449 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1450 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1451 1595
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1454 1598
1599 delete $self->{size_req};
1600 $self->realloc;
1455 $self->update; 1601 $self->update;
1456 $self->check_size;
1457} 1602}
1458 1603
1459sub set_markup { 1604sub set_markup {
1460 my ($self, $markup) = @_; 1605 my ($self, $markup) = @_;
1461 1606
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1611
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1469 1614
1615 delete $self->{size_req};
1616 $self->realloc;
1470 $self->update; 1617 $self->update;
1471 $self->check_size;
1472} 1618}
1473 1619
1474sub size_request { 1620sub size_request {
1475 my ($self) = @_; 1621 my ($self) = @_;
1476 1622
1623 $self->{size_req} ||= do {
1477 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1478 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482 1629
1483 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1484 1631
1485 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1486 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1487 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488 1635
1489 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1490 1637
1491 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1493 } 1643 };
1494 1644
1495 ( 1645 @{ $self->{size_req} }
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1646}
1500 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1501sub size_allocate { 1652sub invoke_size_allocate {
1502 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1503 1654
1655 delete $self->{ox};
1656
1504 delete $self->{texture}; 1657 delete $self->{texture}
1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1505} 1661}
1506 1662
1507sub set_fontsize { 1663sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1509 1665
1510 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1511 delete $self->{texture}; 1668 delete $self->{texture};
1512 1669
1513 $self->update; 1670 $self->realloc;
1514 $self->check_size; 1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1515} 1679}
1516 1680
1517sub _draw { 1681sub _draw {
1518 my ($self) = @_; 1682 my ($self) = @_;
1519 1683
… …
1525 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1693
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1531 1696
1697 unless (exists $self->{ox}) {
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1535 1701
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1541 }; 1705 };
1542 1706
1543 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1545 1711
1546 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1547 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1549 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1551 } 1719 }
1552 1720
1553 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1554} 1722}
1555 1723
… …
1572 can_hover => 1, 1740 can_hover => 1,
1573 can_focus => 1, 1741 can_focus => 1,
1574 valign => 0, 1742 valign => 0,
1575 can_events => 1, 1743 can_events => 1,
1576 #text => ... 1744 #text => ...
1745 #hidden => "*",
1577 @_ 1746 @_
1578 ) 1747 )
1579} 1748}
1580 1749
1581sub _set_text { 1750sub _set_text {
… …
1583 1752
1584 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1585 1754
1586 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1587 1756
1588 delete $self->{texture};
1589
1590 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1591 $self->{text} = $text; 1758 $self->{text} = $text;
1592 1759
1593 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1594 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1595 1763
1596 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1597} 1768}
1598 1769
1599sub set_text { 1770sub set_text {
1600 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1601 1772
1602 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1774 $self->_set_text ($text);
1604 $self->update;
1605 $self->check_size;
1606} 1775}
1607 1776
1608sub get_text { 1777sub get_text {
1609 $_[0]{text} 1778 $_[0]{text}
1610} 1779}
… …
1615 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1616 1785
1617 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1618} 1787}
1619 1788
1620sub key_down { 1789sub invoke_key_down {
1621 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1622 1791
1623 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1624 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1625 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1637 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1638 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1639 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1640 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1641 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1642 $self->_emit ('escape'); 1811 $self->emit ('escape');
1643 } elsif ($uni) { 1812 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1645 } 1816 }
1646 1817
1647 $self->_set_text ($text); 1818 $self->_set_text ($text);
1648 $self->update;
1649 $self->check_size;
1650}
1651 1819
1820 $self->realloc;
1821
1822 1
1823}
1824
1652sub focus_in { 1825sub invoke_focus_in {
1653 my ($self) = @_; 1826 my ($self) = @_;
1654 1827
1655 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1656 1829
1657 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1658} 1831}
1659 1832
1660sub button_down { 1833sub invoke_button_down {
1661 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1662 1835
1663 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1664 1837
1665 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1666 1839
1667 # byte-index to char-index 1840 # byte-index to char-index
1668 my $text = $self->{text}; 1841 my $text = $self->{text};
1669 utf8::encode $text; 1842 utf8::encode $text;
1670 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1671 1844
1672 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1673 $self->update; 1846 $self->update;
1847
1848 1
1674} 1849}
1675 1850
1676sub mouse_motion { 1851sub invoke_mouse_motion {
1677 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1678# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1679} 1856}
1680 1857
1681sub _draw { 1858sub _draw {
1682 my ($self) = @_; 1859 my ($self) = @_;
1683 1860
1684 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1685 1862
1686 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1687 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1688 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1689 } else { 1866 } else {
1690 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1691 } 1868 }
1692 1869
1693 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1696 glVertex 0 , 0; 1873 glVertex 0 , 0;
1697 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1698 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1699 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1724 1901
1725our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1726 1903
1727use CFClient::OpenGL; 1904use CFClient::OpenGL;
1728 1905
1729sub key_down { 1906sub invoke_key_down {
1730 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1731 1908
1732 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1733 1910
1734 if ($sym == 13) { 1911 if ($sym == 13) {
1735 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1736 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1737 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1738 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1739 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1740 $self->update; 1918 $self->update;
1741 1919
1742 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1743 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1744 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1760 } else { 1938 } else {
1761 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1762 } 1940 }
1763 1941
1764 } else { 1942 } else {
1765 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1766 } 1946 1
1767
1768} 1947}
1769 1948
1770############################################################################# 1949#############################################################################
1771 1950
1772package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1781 1960
1782sub new { 1961sub new {
1783 my $class = shift; 1962 my $class = shift;
1784 1963
1785 $class->SUPER::new ( 1964 $class->SUPER::new (
1786 padding => 4, 1965 padding_x => 4,
1966 padding_y => 4,
1787 fg => [1, 1, 1], 1967 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 1968 active_fg => [0, 0, 1],
1789 can_hover => 1, 1969 can_hover => 1,
1790 align => 0, 1970 align => 0,
1791 valign => 0, 1971 valign => 0,
1792 can_events => 1, 1972 can_events => 1,
1793 @_ 1973 @_
1794 ) 1974 )
1795} 1975}
1796 1976
1797sub activate { }
1798
1799sub button_up { 1977sub invoke_button_up {
1800 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1801 1979
1802 $self->emit ("activate") 1980 $self->emit ("activate")
1803 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1804 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1805} 1985}
1806 1986
1807sub _draw { 1987sub _draw {
1808 my ($self) = @_; 1988 my ($self) = @_;
1809 1989
1810 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812 if ($GRAB == $self) {
1813 $self->{fg} = $self->{active_fg};
1814 }
1815 1991
1816 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1819 1995
… …
1824 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
1825} 2001}
1826 2002
1827############################################################################# 2003#############################################################################
1828 2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
2037}
2038
2039#############################################################################
2040
1829package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1830 2042
1831our @ISA = CFClient::UI::DrawBG::; 2043our @ISA = CFClient::UI::DrawBG::;
1832 2044
1833my @tex = 2045my @tex =
… …
1838 2050
1839sub new { 2051sub new {
1840 my $class = shift; 2052 my $class = shift;
1841 2053
1842 $class->SUPER::new ( 2054 $class->SUPER::new (
1843 padding => 2, 2055 padding_x => 2,
2056 padding_y => 2,
1844 fg => [1, 1, 1], 2057 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 2058 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 2059 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 2060 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 2061 state => 0,
… …
1852} 2065}
1853 2066
1854sub size_request { 2067sub size_request {
1855 my ($self) = @_; 2068 my ($self) = @_;
1856 2069
1857 ($self->{padding} * 2 + 6) x 2 2070 (6) x 2
1858} 2071}
1859 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1860sub button_down { 2081sub invoke_button_down {
1861 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1862 2083
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 2086 $self->toggle;
1866 $self->_emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1867 } 2091 1
1868} 2092}
1869 2093
1870sub _draw { 2094sub _draw {
1871 my ($self) = @_; 2095 my ($self) = @_;
1872 2096
1873 $self->SUPER::_draw; 2097 $self->SUPER::_draw;
1874 2098
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 2100
1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878 2104
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 2106
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 2108
… …
1890package CFClient::UI::Image; 2116package CFClient::UI::Image;
1891 2117
1892our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1893 2119
1894use CFClient::OpenGL; 2120use CFClient::OpenGL;
1895use Carp qw/confess/;
1896 2121
1897our %loaded_images; 2122our %texture_cache;
1898 2123
1899sub new { 2124sub new {
1900 my $class = shift; 2125 my $class = shift;
1901 2126
1902 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1903 2131
1904 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1905 2134
1906 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1907 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1908 2137
1909 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1910 2139
1911 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1912
1913 $self->{aspect} = $tex->{w} / $tex->{h};
1914 2141
1915 $self 2142 $self
1916} 2143}
1917 2144
1918sub size_request { 2145sub size_request {
1919 my ($self) = @_; 2146 my ($self) = @_;
1920 2147
1921 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1922} 2149}
1923 2150
1924sub _draw { 2151sub _draw {
1925 my ($self) = @_; 2152 my ($self) = @_;
1926 2153
… …
2035 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2036 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2037 2264
2038 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2039 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2040 2270
2041 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045 2276
2046 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2047 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
2062 2293
2063 if ($t3) { 2294 if ($t3) {
2064 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2065 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2066 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2067 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2068 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2069 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2070 glEnd; 2301 glEnd;
2071 } 2302 }
2072 2303
2073 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2147 fg => [1, 1, 1], 2378 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2379 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2380 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2381 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2382 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2383 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2384 min_h => $::WIDTH / 80,
2154 vertical => 0, 2385 vertical => 0,
2155 can_hover => 1, 2386 can_hover => 1,
2156 inner_pad => 0.02, 2387 inner_pad => 0.02,
2157 @_ 2388 @_
2158 ); 2389 );
… …
2166sub set_range { 2397sub set_range {
2167 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2168 2399
2169 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2170 2401
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2173} 2406}
2174 2407
2175sub set_value { 2408sub set_value {
2176 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2177 2410
… …
2188 if $unit; 2421 if $unit;
2189 2422
2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191 2424
2192 if ($value != $old_value) { 2425 if ($value != $old_value) {
2193 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2194 $self->update; 2427 $self->update;
2195 } 2428 }
2196} 2429}
2197 2430
2198sub size_request { 2431sub size_request {
2199 my ($self) = @_; 2432 my ($self) = @_;
2200 2433
2201 my $w = $self->{req_w}; 2434 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2435}
2206 2436
2207sub button_down { 2437sub invoke_button_down {
2208 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2209 2439
2210 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2211 2441
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213 2443
2214 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2215} 2445}
2216 2446
2217sub mouse_motion { 2447sub invoke_mouse_motion {
2218 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2219 2449
2220 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2221 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222 2452
2223 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224 2454
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226 2456
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2228 } 2462 1
2229} 2463}
2230 2464
2231sub update { 2465sub update {
2232 my ($self) = @_; 2466 my ($self) = @_;
2233 2467
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2235 $self->set_value ($self->{range}[0]); 2476 $self->set_value ($self->{range}[0]);
2236 2477
2237 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100; 2479 my $range = ($hi - $page - $lo) || 1e-100;
2239 2480
… …
2245 $value = ($value - $lo) / $range; 2486 $value = ($value - $lo) / $range;
2246 $value = $value * $self->{scale} + $self->{offset}; 2487 $value = $value * $self->{scale} + $self->{offset};
2247 2488
2248 $self->{knob_x} = $value - $knob_w * 0.5; 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2249 $self->{knob_w} = $knob_w; 2490 $self->{knob_w} = $knob_w;
2250 }); 2491 }
2251
2252 $self->SUPER::update;
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257 2492
2258 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2259 2494
2260 glScale $self->{w}, $self->{h}; 2495 glScale $self->{w}, $self->{h};
2261 2496
… …
2322sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2324 2559
2325############################################################################# 2560#############################################################################
2326 2561
2327package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2328 2563
2329our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2330 2565
2331use CFClient::OpenGL; 2566use CFClient::OpenGL;
2332 2567
… …
2334 my $class = shift; 2569 my $class = shift;
2335 2570
2336 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2337 fontsize => 1, 2572 fontsize => 1,
2338 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2339 #font => default_font 2575 #font => default_font
2340 @_, 2576 @_,
2341 2577
2342 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2343 par => [], 2579 par => [],
… …
2358 2594
2359 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2360 $self->reflow; 2596 $self->reflow;
2361} 2597}
2362 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2363sub size_allocate { 2608sub invoke_size_allocate {
2364 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2365 2610
2366 $self->SUPER::size_allocate ($w, $h); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2367 2613
2368 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2369 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2370 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2371 2618
2372 $self->reflow; 2619 $self->reflow;
2373}
2374 2620
2375sub text_size { 2621 local $self->{children} = [$empty, $slider];
2376 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2377 2627
2378 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2379 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2382 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2383 2641 );
2642
2384 $layout->size 2643 $layout
2385} 2644}
2386 2645
2387sub reflow { 2646sub reflow {
2388 my ($self) = @_; 2647 my ($self) = @_;
2389 2648
… …
2398 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2399} 2658}
2400 2659
2401sub clear { 2660sub clear {
2402 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2403 2665
2404 $self->{par} = []; 2666 $self->{par} = [];
2405 $self->{height} = 0; 2667 $self->{height} = 0;
2406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2407} 2669}
2408 2670
2409sub add_paragraph { 2671sub add_paragraph {
2410 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2411 2673
2412 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2413 my ($w, $h) = $self->text_size ($line); 2675
2414 $self->{height} += $h; 2676 $para = {
2415 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2416 } 2683 };
2417 2684
2418 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2419} 2697}
2420 2698
2421sub update { 2699sub update {
2422 my ($self) = @_; 2700 my ($self) = @_;
2423 2701
… …
2425 2703
2426 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2427 2705
2428 delete $self->{texture}; 2706 delete $self->{texture};
2429 2707
2430 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432 2710
2433 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2434 my $height = 0; 2712 my $height = 0;
2435 2713
2436 my $layout = $self->{layout};
2437
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2440 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2442 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2443 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3]; 2718
2446 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2447 } 2722 }
2448 2723
2449 $height += $_->[1]; 2724 $height += $para->{h};
2450 } 2725 }
2451 2726
2452 $self->{height} = $height; 2727 $self->{height} = $height;
2453 2728
2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2455 2730
2456 delete $self->{texture}; 2731 delete $self->{texture};
2457 } 2732 }
2458 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2460 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2461 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2462 2741
2463 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2464 2743
2465 my $y0 = $top; 2744 my $y0 = $top;
2466 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2467 2746
2468 my $y = 0; 2747 my $y = 0;
2469
2470 my $layout = $self->{layout};
2471
2472 $layout->set_font ($self->{font}) if $self->{font};
2473 2748
2474 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2475 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2476 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2477 2752
2478 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2479 my $h = $par->[1]; 2754 my $h = $para->{h};
2480 2755
2481 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] }); 2757
2483 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2484 $layout->set_markup ($par->[4]);
2485 2759
2486 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2487 2761
2488 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2489 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2490 } 2780 }
2491 2781
2492 $y += $h; 2782 $y += $h;
2493 } 2783 }
2494 2784
2495 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2496 }; 2786 };
2497 }); 2787 });
2498} 2788}
2499 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2500sub _draw { 2799sub _draw {
2501 my ($self) = @_; 2800 my ($self) = @_;
2502 2801
2503 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2507 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2508 2807
2509 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2510
2511} 2809}
2512 2810
2513############################################################################# 2811#############################################################################
2514 2812
2515package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2594} 2892}
2595 2893
2596sub set_tooltip_from { 2894sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2895 my ($self, $widget) = @_;
2598 2896
2897 my $tooltip = $widget->{tooltip};
2898
2899 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}";
2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2908
2599 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2910 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2912 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2913 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2914 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2915 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2613 2923
2614 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2615} 2925}
2616 2926
2617sub size_allocate { 2927sub invoke_size_allocate {
2618 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2619 2929
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2931}
2932
2933sub invoke_visibility_change {
2934 my ($self, $visible) = @_;
2935
2936 return unless $visible;
2937
2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner}
2940 or return;
2941
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w};
2946
2947 $self->move_abs ($x, $y);
2948 });
2621} 2949}
2622 2950
2623sub _draw { 2951sub _draw {
2624 my ($self) = @_; 2952 my ($self) = @_;
2625 2953
… …
2642 glVertex $w, $h; 2970 glVertex $w, $h;
2643 glVertex $w, 0; 2971 glVertex $w, 0;
2644 glEnd; 2972 glEnd;
2645 2973
2646 glTranslate 2 - 0.375, 2 - 0.375; 2974 glTranslate 2 - 0.375, 2 - 0.375;
2975
2647 $self->SUPER::_draw; 2976 $self->SUPER::_draw;
2648} 2977}
2649 2978
2650############################################################################# 2979#############################################################################
2651 2980
… …
2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711 3040
2712 if ($tex) { 3041 if ($tex) {
2713 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2718 } 3047 }
2719} 3048}
2720 3049
2721sub DESTROY { 3050sub destroy {
2722 my ($self) = @_; 3051 my ($self) = @_;
2723 3052
2724 $self->{timer}->cancel 3053 $self->{timer}->cancel
2725 if $self->{timer}; 3054 if $self->{timer};
2726 3055
2727 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2728} 3057}
2729 3058
2730############################################################################# 3059#############################################################################
2731 3060
2732package CFClient::UI::Inventory; 3061package CFClient::UI::Buttonbar;
2733 3062
2734our @ISA = CFClient::UI::ScrolledWindow::; 3063our @ISA = CFClient::UI::HBox::;
2735 3064
2736sub new { 3065# TODO: should actualyl wrap buttons and other goodies.
2737 my $class = shift;
2738
2739 my $self = $class->SUPER::new (
2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741 @_,
2742 );
2743
2744 $self
2745}
2746
2747sub set_items {
2748 my ($self, $items) = @_;
2749
2750 $self->{scrolled}->clear;
2751 return unless $items;
2752
2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2757
2758 $self->{real_items} = \@items;
2759
2760 my $row = 0;
2761 for my $item (@items) {
2762 CFClient::Item::update_widgets $item;
2763
2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768 $row++;
2769 }
2770}
2771 3066
2772############################################################################# 3067#############################################################################
2773 3068
2774package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2775 3070
… …
2787 ); 3082 );
2788 3083
2789 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2790 3085
2791 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2792 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2793 3088
2794 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2795 if (!ref $widget) { 3090 if (!ref $widget) {
2796 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2797 can_hover => 1, 3092 can_hover => 1,
2798 can_events => 1, 3093 can_events => 1,
2799 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2800 } 3096 }
2801 3097
2802 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2803 3099
2804 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2809 3105
2810# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2811sub popup { 3107sub popup {
2812 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2813 3109
2814 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2815 3111
2816 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 3113 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2819 3115
2820 $self->show; 3116 $self->show;
2821 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822} 3118}
2823 3119
2824sub mouse_motion { 3120sub invoke_mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2826 3122
2827 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2828 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2830}
2831 3126
3127 0
3128}
3129
2832sub button_up { 3130sub invoke_button_up {
2833 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2834 3132
2835 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2836 undef $GRAB; 3134 undef $GRAB;
2837 $self->hide; 3135 $self->hide;
2838 3136
2839 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2840 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2841 } 3143 1
2842} 3144}
2843 3145
2844############################################################################# 3146#############################################################################
2845 3147
2846package CFClient::UI::Statusbox; 3148package CFClient::UI::Multiplexer;
2847 3149
2848our @ISA = CFClient::UI::VBox::; 3150our @ISA = CFClient::UI::Container::;
2849 3151
2850sub new { 3152sub new {
2851 my $class = shift; 3153 my $class = shift;
2852 3154
2853 $class->SUPER::new ( 3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
2854 fontsize => 0.8, 3334 fontsize => 0.8,
2855 @_, 3335 @_,
2856 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
2857} 3343}
2858 3344
2859sub reorder { 3345sub reorder {
2860 my ($self) = @_; 3346 my ($self) = @_;
2861 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2862 3353
2863 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 } 3356 }
2866 3357
… …
2869 my @items = sort { 3360 my @items = sort {
2870 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2873 3364
3365 $self->{timer}->interval (1);
3366
2874 my $count = 10 + 1; 3367 my $count = 10 + 1;
2875 for my $item (@items) { 3368 for my $item (@items) {
2876 last unless --$count; 3369 last unless --$count;
2877 3370
2878 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text}; 3375 : $item->{text};
2883 3376
… …
2891 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
2897 can_events => 1, 3390 can_events => 1,
2898 can_hover => 1 3391 can_hover => 1
2899 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2900 } 3405 }
2901 3406
2902 $self->clear; 3407 $self->clear;
2903 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2904} 3409}
… …
2909 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2911 3416
2912 return unless $text; 3417 return unless $text;
2913 3418
2914 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915 3420
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917 3422
2918 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2920 $item->{count}++; 3425 $item->{count}++;
2921 } else { 3426 } else {
2922 $item->{count} = 1; 3427 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2924 } 3429 }
2925 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2926 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2927 delete $item->{label}; 3432 delete $item->{label};
2928 } else { 3433 } else {
2929 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2930 id => ++$self->{id}, 3435 id => ++$self->{id},
… …
2936 count => 1, 3441 count => 1,
2937 %arg, 3442 %arg,
2938 }; 3443 };
2939 } 3444 }
2940 3445
3446 $ROOT->on_refresh (reorder => sub {
2941 $self->reorder; 3447 $self->reorder;
3448 });
2942} 3449}
2943 3450
2944sub reconfigure { 3451sub reconfigure {
2945 my ($self) = @_; 3452 my ($self) = @_;
2946 3453
… …
2949 3456
2950 $self->reorder; 3457 $self->reorder;
2951 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
2952} 3459}
2953 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
2954############################################################################# 3469#############################################################################
2955 3470
2956package CFClient::UI::Root; 3471package CFClient::UI::Inventory;
2957 3472
2958our @ISA = CFClient::UI::Container::; 3473our @ISA = CFClient::UI::Table::;
2959
2960use CFClient::OpenGL;
2961 3474
2962sub new { 3475sub new {
2963 my $class = shift; 3476 my $class = shift;
2964 3477
2965 $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root;
3636
3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
3640
3641use CFClient::OpenGL;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
2966 visible => 1, 3647 visible => 1,
2967 @_, 3648 @_,
2968 ) 3649 );
2969}
2970 3650
2971sub configure { 3651 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3652
2974 $self->{w} = $w; 3653 $self
2975 $self->{h} = $h;
2976}
2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983} 3654}
2984 3655
2985sub size_request { 3656sub size_request {
2986 my ($self) = @_; 3657 my ($self) = @_;
2987 3658
2988 ($self->{w}, $self->{h}) 3659 ($self->{w}, $self->{h})
2989} 3660}
2990 3661
3662sub _to_pixel {
3663 my ($coord, $size, $max) = @_;
3664
3665 $coord =
3666 $coord eq "center" ? ($max - $size) * 0.5
3667 : $coord eq "max" ? $max
3668 : $coord;
3669
3670 $coord = 0 if $coord < 0;
3671 $coord = $max - $size if $coord > $max - $size;
3672
3673 int $coord + 0.5
3674}
3675
2991sub size_allocate { 3676sub invoke_size_allocate {
2992 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
2993 3678
2994 for my $child ($self->children) { 3679 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3681
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3682 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3683 $Y = $child->{force_y} if exists $child->{force_y};
2999 3684
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3685 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3002
3003 delete @$child{qw(req_x req_y)};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3687
3008 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3009 } 3689 }
3690
3691 1
3010} 3692}
3011 3693
3012sub coord2local { 3694sub coord2local {
3013 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3014 3696
… …
3022} 3704}
3023 3705
3024sub update { 3706sub update {
3025 my ($self) = @_; 3707 my ($self) = @_;
3026 3708
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3709 $::WANT_REFRESH++;
3029} 3710}
3030 3711
3031sub add { 3712sub add {
3032 my ($self, @children) = @_; 3713 my ($self, @children) = @_;
3033 3714
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3715 $_->{is_toplevel} = 1
3036 3716 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3717
3042 $self->SUPER::add (@children); 3718 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3719}
3050 3720
3051sub remove { 3721sub remove {
3052 my ($self, @children) = @_; 3722 my ($self, @children) = @_;
3053 3723
3054 $self->SUPER::remove (@children); 3724 $self->SUPER::remove (@children);
3725
3726 delete $self->{is_toplevel}
3727 for @children;
3055 3728
3056 while (@children) { 3729 while (@children) {
3057 my $w = pop @children; 3730 my $w = pop @children;
3058 push @children, $w->children; 3731 push @children, $w->children;
3059 $w->set_invisible; 3732 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3751 while ($self->{refresh_hook}) {
3079 $_->() 3752 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3753 for values %{delete $self->{refresh_hook}};
3081 } 3754 }
3082 3755
3083 if ($self->{check_size}) { 3756 if ($self->{realloc}) {
3757 my %queue;
3084 my @queue; 3758 my @queue;
3759 my $widget;
3085 3760
3086 for (;;) { 3761 outer:
3087 if ($self->{check_size}) { 3762 while () {
3088 #TODO use array-of-depth approach 3763 if (my $realloc = delete $self->{realloc}) {
3764 for $widget (values %$realloc) {
3765 $widget->{visible} or next; # do not resize invisible widgets
3089 3766
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3767 $queue{$widget+0}++ and next; # duplicates are common
3091 @queue, values %{delete $self->{check_size}}; 3768
3769 push @{ $queue[$widget->{visible}] }, $widget;
3770 }
3092 } 3771 }
3093 3772
3773 while () {
3774 @queue or last outer;
3775
3094 my $widget = pop @queue || last; 3776 $widget = pop @{ $queue[-1] || [] }
3095 3777 and last;
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105 3778
3779 pop @queue;
3780 }
3781
3782 delete $queue{$widget+0};
3783
3784 my ($w, $h) = $widget->size_request;
3785
3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3791
3792 $w = $widget->{force_w} if exists $widget->{force_w};
3793 $h = $widget->{force_h} if exists $widget->{force_h};
3794
3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3796 || delete $widget->{force_realloc}) {
3106 $widget->{req_w} = $w; 3797 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3798 $widget->{req_h} = $h;
3108 3799
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3800 $self->{size_alloc}{$widget+0} = $widget;
3110 3801
3111 $widget->{parent}->check_size
3112 if $widget->{parent}; 3802 if (my $parent = $widget->{parent}) {
3803 $self->{realloc}{$parent+0} = $parent
3804 unless $queue{$parent+0};
3805
3806 $parent->{force_size_alloc} = 1;
3807 $self->{size_alloc}{$parent+0} = $parent;
3808 }
3113 } 3809 }
3810
3811 delete $self->{realloc}{$widget+0};
3114 } 3812 }
3115 } 3813 }
3116 3814
3117 while ($self->{size_alloc}) { 3815 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3816 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 my ($widget, $w, $h) = @$_; 3817 values %$size_alloc;
3818
3819 while () {
3820 my $widget = pop @queue || last;
3821
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120 3823
3121 $w = 0 if $w < 0; 3824 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3825 $h = 0 if $h < 0;
3123 3826
3827 $w = int $w + 0.5;
3828 $h = int $h + 0.5;
3829
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3833
3124 $widget->{w} = $w; 3834 $widget->{w} = $w;
3125 $widget->{h} = $h; 3835 $widget->{h} = $h;
3836
3126 $widget->emit (size_allocate => $w, $h); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
3127 } 3839 }
3128 } 3840 }
3129 3841
3130 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
3131 $_->() 3843 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
3133 } 3845 }
3846
3134 3847
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
3138 3851
… …
3140 glLoadIdentity; 3853 glLoadIdentity;
3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
3143 glLoadIdentity; 3856 glLoadIdentity;
3144 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
3145 $self->_draw; 3865 $self->_draw;
3146} 3866}
3147 3867
3148############################################################################# 3868#############################################################################
3149 3869

Diff Legend

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