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

Diff Legend

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