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.247 by root, Sun May 28 01:16:04 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 center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 255}
261 256
262sub set_visible { 257sub set_visible {
263 my ($self) = @_; 258 my ($self) = @_;
264 259
265 return if $self->{visible}; 260 return if $self->{visible};
266 261
267 $self->{root} = $self->{parent}{root}; 262 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 263 $self->{visible} = $self->{parent}{visible} + 1;
269 264
270 $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;
271} 270}
272 271
273sub set_invisible { 272sub set_invisible {
274 my ($self) = @_; 273 my ($self) = @_;
275 274
276 return unless $self->{visible}; 275 return unless $self->{visible};
277 276
278 # broken show/hide model 277 $_->set_invisible for $self->children;
279 278
279 delete $self->{visible};
280 delete $self->{root}; 280 delete $self->{root};
281 delete $self->{visible};
282 281
283 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
285 284
286 CFClient::UI::check_tooltip 285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 286 if $TOOLTIP->{owner} == $self;
288 287
289 $self->focus_out; 288 $self->emit ("focus_out");
290
291 $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;
292} 307}
293 308
294sub hide { 309sub hide {
295 my ($self) = @_; 310 my ($self) = @_;
296 311
… …
298 313
299 $self->{parent}->remove ($self) 314 $self->{parent}->remove ($self)
300 if $self->{parent}; 315 if $self->{parent};
301} 316}
302 317
303sub move { 318sub move_abs {
304 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
305 320
306 $self->{x} = int $x; 321 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
307 $self->{y} = int $y; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
308 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
309 324
310 $self->update; 325 $self->update;
311} 326}
312 327
313sub set_size { 328sub set_size {
314 my ($self, $w, $h) = @_; 329 my ($self, $w, $h) = @_;
315 330
316 $self->{def_w} = $w; 331 $self->{force_w} = $w;
317 $self->{def_h} = $h; 332 $self->{force_h} = $h;
318 333
319 $self->check_size; 334 $self->realloc;
320} 335}
321 336
322sub size_request { 337sub size_request {
323 require Carp; 338 require Carp;
324 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
325} 340}
326 341
342sub baseline_shift {
343 0
344}
345
327sub configure { 346sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
329 348
330 if ($self->{aspect}) { 349 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h);
351
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 352 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 353 $h = List::Util::min $h, int $w / $self->{aspect};
333 354
334 # use alignment to adjust x, y 355 # use alignment to adjust x, y
335 356
336 $x += int +($w - $w2) * 0.5; 357 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 358 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 359 }
341 360
342 if ($self->{x} != $x || $self->{y} != $y) { 361 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 362 $self->{x} = $x;
344 $self->{y} = $y; 363 $self->{y} = $y;
345 $self->update; 364 $self->update;
346 } 365 }
347 366
348 if ($self->{w} != $w || $self->{h} != $h) { 367 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 368 return unless $self->{visible};
350 }
351}
352 369
353sub size_allocate { 370 $self->{alloc_w} = $w;
354 # nothing to be done 371 $self->{alloc_h} = $h;
355}
356 372
357sub reconfigure { 373 $self->{root}{size_alloc}{$self+0} = $self;
358 my ($self) = @_; 374 }
359
360 $self->check_size (1);
361 $self->update;
362} 375}
363 376
364sub children { 377sub children {
378 # nop
379}
380
381sub visible_children {
382 $_[0]->children
365} 383}
366 384
367sub set_max_size { 385sub set_max_size {
368 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
369 387
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
372} 392}
373 393
374sub set_tooltip { 394sub set_tooltip {
375 my ($self, $tooltip) = @_; 395 my ($self, $tooltip) = @_;
376 396
… …
381 401
382 $self->{tooltip} = $tooltip; 402 $self->{tooltip} = $tooltip;
383 403
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 404 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 405 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 406 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 407 }
388} 408}
389 409
390# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
391sub coord2local { 411sub coord2local {
… …
399 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
400 420
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 422}
403 423
404sub focus_in { 424sub invoke_focus_in {
405 my ($self) = @_; 425 my ($self) = @_;
406 426
407 return if $FOCUS == $self; 427 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
409 429
410 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
411 431
412 $self->_emit (focus_in => $focus); 432 $self->update;
413 433
414 $focus->update if $focus; 434 0
415 $FOCUS->update;
416} 435}
417 436
418sub focus_out { 437sub invoke_focus_out {
419 my ($self) = @_; 438 my ($self) = @_;
420 439
421 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
422 441
423 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
424 443
425 $self->_emit (focus_out => $focus); 444 $self->update;
426 445
427 $focus->update if $focus; #?
428
429 $::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
430 unless $FOCUS; 447 unless $FOCUS;
431}
432 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
433sub mouse_motion { } 459sub invoke_mouse_motion { 0 }
434sub button_up { } 460sub invoke_button_up { 0 }
435sub key_down { } 461sub invoke_key_down { 0 }
436sub key_up { } 462sub invoke_key_up { 0 }
437 463
438sub button_down { 464sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
440 466
441 $self->focus_in; 467 $self->grab_focus;
442}
443 468
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 469 warn "button down $ev->{button} $x $y\n";#d#
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 470
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 471 0
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 472}
448sub 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
449 539
450sub draw { 540sub draw {
451 my ($self) = @_; 541 my ($self) = @_;
452 542
453 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);
454 552
455 glPushMatrix; 553 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw;
458 glPopMatrix;
459 555
460 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
461 my ($x, $y) = @$self{qw(x y)};
462
463 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
464 glEnable GL_BLEND; 558 glEnable GL_BLEND;
465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
466 glBegin GL_QUADS; 560 glBegin GL_QUADS;
467 glVertex $x , $y; 561 glVertex 0 , 0;
468 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
469 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
470 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
471 glEnd; 565 glEnd;
472 glDisable GL_BLEND; 566 glDisable GL_BLEND;
473 } 567 }
474 568
475 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 570 glPushMatrix;
477 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
479 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 574 glVertex 0 , 0;
481 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
482 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
483 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
484 glEnd; 578 glEnd;
485 glPopMatrix; 579 glPopMatrix;
486 #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;
487 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
488} 585}
489 586
490sub _draw { 587sub _draw {
491 my ($self) = @_; 588 my ($self) = @_;
492 589
493 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
494} 591}
495 592
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 593sub DESTROY {
556 my ($self) = @_; 594 my ($self) = @_;
557 595
596 return if CFClient::in_destruct;
597
558 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
559 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
560} 602}
561 603
562############################################################################# 604#############################################################################
563 605
564package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
589 631
590 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
591 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
592 634
593 glEnable GL_BLEND; 635 glEnable GL_BLEND;
594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595 glColor @$color; 637 glColor_premultiply @$color;
596 638
597 glBegin GL_QUADS; 639 glBegin GL_QUADS;
598 glVertex 0 , 0; 640 glVertex 0 , 0;
599 glVertex 0 , $h; 641 glVertex 0 , $h;
600 glVertex $w, $h; 642 glVertex $w, $h;
… …
615 my ($class, %arg) = @_; 657 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 658 $class->SUPER::new (can_events => 0, %arg);
617} 659}
618 660
619sub size_request { 661sub size_request {
620 (0, 0) 662 my ($self) = @_;
663
664 ($self->{w} + 0, $self->{h} + 0)
621} 665}
622 666
623sub draw { } 667sub draw { }
624 668
625############################################################################# 669#############################################################################
… …
629our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
630 674
631sub new { 675sub new {
632 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
633 677
634 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
635 679
636 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
637 children => [], 681 children => [],
638 can_events => 0, 682 can_events => 0,
639 %arg, 683 %arg,
640 ); 684 );
685
641 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
642 688
643 $self 689 $self
644} 690}
645 691
646sub add { 692sub add {
… …
654 $self->{children} = [ 700 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 701 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 702 @{$self->{children}}, @widgets
657 ]; 703 ];
658 704
659 $self->check_size (1); 705 $self->realloc;
660 $self->update;
661} 706}
662 707
663sub children { 708sub children {
664 @{ $_[0]{children} } 709 @{ $_[0]{children} }
665} 710}
… …
670 delete $child->{parent}; 715 delete $child->{parent};
671 $child->hide; 716 $child->hide;
672 717
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 718 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 719
675 $self->check_size (1); 720 $self->realloc;
676 $self->update;
677} 721}
678 722
679sub clear { 723sub clear {
680 my ($self) = @_; 724 my ($self) = @_;
681 725
… …
685 for (@$children) { 729 for (@$children) {
686 delete $_->{parent}; 730 delete $_->{parent};
687 $_->hide; 731 $_->hide;
688 } 732 }
689 733
690 $self->check_size; 734 $self->realloc;
691 $self->update;
692} 735}
693 736
694sub find_widget { 737sub find_widget {
695 my ($self, $x, $y) = @_; 738 my ($self, $x, $y) = @_;
696 739
697 $x -= $self->{x}; 740 $x -= $self->{x};
698 $y -= $self->{y}; 741 $y -= $self->{y};
699 742
700 my $res; 743 my $res;
701 744
702 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
704 and return $res; 747 and return $res;
705 } 748 }
706 749
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
728} 771}
729 772
730sub add { 773sub add {
731 my ($self, $child) = @_; 774 my ($self, $child) = @_;
732 775
733 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
734
735 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
736} 778}
737 779
738sub remove { 780sub remove {
739 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
748 790
749sub size_request { 791sub size_request {
750 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
751} 793}
752 794
753sub size_allocate { 795sub invoke_size_allocate {
754 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
755 797
756 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
757} 801}
758 802
759############################################################################# 803#############################################################################
804
805# back-buffered drawing area
760 806
761package CFClient::UI::Window; 807package CFClient::UI::Window;
762 808
763our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
764 810
… …
775 821
776 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
777 $self->SUPER::update; 823 $self->SUPER::update;
778} 824}
779 825
780sub size_allocate { 826sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
782 828
783 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
785} 832}
786 833
787sub _render { 834sub _render {
835 my ($self) = @_;
836
788 $_[0]{children}[0]->draw; 837 $self->{children}[0]->draw;
789} 838}
790 839
791sub render_child { 840sub render_child {
792 my ($self) = @_; 841 my ($self) = @_;
793 842
794 $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 {
795 glClearColor 0, 0, 0, 0; 844 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 845 glClear GL_COLOR_BUFFER_BIT;
797 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
798 $self->_render; 854 $self->_render;
799 }; 855 };
800} 856}
801 857
802sub _draw { 858sub _draw {
803 my ($self) = @_; 859 my ($self) = @_;
804 860
805 my ($w, $h) = ($self->w, $self->h); 861 my ($w, $h) = @$self{qw(w h)};
806 862
807 my $tex = $self->{texture} 863 my $tex = $self->{texture}
808 or return; 864 or return;
809 865
810 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
813 869
814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
815 871
816 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
817} 873}
… …
833} 889}
834 890
835sub size_request { 891sub size_request {
836 my ($self) = @_; 892 my ($self) = @_;
837 893
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 894 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 895
840 $w = 10 if $self->{scroll_x}; 896 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
842 898
843 ($w, $h) 899 ($w, $h)
844} 900}
845 901
846sub size_allocate { 902sub invoke_size_allocate {
847 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
848 904
905 my $child = $self->child;
906
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 909
852 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
853 $self->update; 911 $self->update;
912
913 1
854} 914}
855 915
856sub set_offset { 916sub set_offset {
857 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
858 918
… …
891} 951}
892 952
893sub _render { 953sub _render {
894 my ($self) = @_; 954 my ($self) = @_;
895 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
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 960
898 $self->SUPER::_render; 961 $self->SUPER::_render;
899} 962}
900 963
… …
903package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
904 967
905our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
906 969
907sub new { 970sub new {
908 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
909 974
910 my $self; 975 my $self;
911 976
912 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
913 vertical => 1, 978 vertical => 1,
… …
918 ; 983 ;
919 984
920 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1), 986 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider, 987 slider => $slider,
923 @_, 988 %arg,
924 ); 989 );
925 990
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
929 993
930 $self 994 $self
931} 995}
932 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
933sub update { 1019sub update {
934 my ($self) = @_; 1020 my ($self) = @_;
935 1021
936 $self->SUPER::update; 1022 $self->SUPER::update;
937 1023
938 # todo: overwrite size_allocate of child 1024 $self->update_slider;
939 my $child = $self->{vp}->child;
940 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
941} 1025}
942 1026
943sub size_allocate { 1027sub invoke_size_allocate {
944 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
945 1029
1030 $self->update_slider;
1031
946 $self->SUPER::size_allocate ($w, $h); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
947
948 my $child = $self->{vp}->child;
949 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
950} 1033}
951
952#TODO# update range on size_allocate depending on child
953# update viewport offset on scroll
954 1034
955############################################################################# 1035#############################################################################
956 1036
957package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
958 1038
… …
974 1054
975 if ($self->{bg}) { 1055 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
977 1057
978 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
981 1061
982 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
983 glVertex 0 , 0; 1063 glVertex 0 , 0;
984 glVertex 0 , $h; 1064 glVertex 0 , $h;
985 glVertex $w, $h; 1065 glVertex $w, $h;
… …
998 1078
999our @ISA = CFClient::UI::Bin::; 1079our @ISA = CFClient::UI::Bin::;
1000 1080
1001use CFClient::OpenGL; 1081use CFClient::OpenGL;
1002 1082
1003my @tex = 1083my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1;
1086
1087my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 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);
1006 1090
1007sub new { 1091sub new {
1008 my $class = shift; 1092 my ($class, %arg) = @_;
1009 1093
1010 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1097 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1098 can_events => 1,
1016 @_ 1099 min_w => 64,
1100 min_h => 32,
1101 %arg,
1017 ); 1102 );
1018 1103
1019 $self->{title} &&= new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1020 align => 0, 1105 align => 0,
1021 valign => 1, 1106 valign => 1,
1022 text => $self->{title}, 1107 text => $self->{title},
1023 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 }
1024 1119
1025 $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};
1026} 1129}
1027 1130
1028sub border { 1131sub border {
1029 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
1030} 1133}
1031 1134
1032sub size_request { 1135sub size_request {
1033 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};
1034 1143
1035 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1036 1145
1037 ( 1146 (
1038 $w + $self->border * 2, 1147 $w + $self->border * 2,
1039 $h + $self->border * 2, 1148 $h + $self->border * 2,
1040 ) 1149 )
1041} 1150}
1042 1151
1043sub size_allocate { 1152sub invoke_size_allocate {
1044 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
1045 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
1046 $h -= List::Util::max 0, $self->border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1164 $w -= List::Util::max 0, $border * 2;
1048 1165
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050 if $self->{title};
1051
1052 $self->child->configure ($self->border, $self->border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1053}
1054 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
1055sub button_down { 1182sub invoke_button_down {
1056 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1057 1184
1058 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1059 my $border = $self->border; 1186 my $border = $self->border;
1060 1187
… …
1073 my ($ev, $x, $y) = @_; 1200 my ($ev, $x, $y) = @_;
1074 1201
1075 my $dx = $ev->{x} - $ox; 1202 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
1077 1204
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1207
1083 $self->check_size; 1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1209 $self->realloc;
1084 }; 1210 };
1085 1211
1086 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1216 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
1092 1218
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1220
1095 $self->{user_x} = $bx + $x - $ox; 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1222 # HACK: the next line is required to enforce placement
1097 1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1224 };
1225 } else {
1226 return 0;
1227 }
1228
1101 } 1229 1
1102} 1230}
1103 1231
1104sub button_up { 1232sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1106 1234
1107 delete $self->{motion}; 1235 ! ! delete $self->{motion}
1108} 1236}
1109 1237
1110sub mouse_motion { 1238sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1112 1240
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242
1243 ! ! $self->{motion}
1114} 1244}
1115 1245
1116sub _draw { 1246sub _draw {
1117 my ($self) = @_; 1247 my ($self) = @_;
1118 1248
1249 my $child = $self->{children}[0];
1250
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1251 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1252 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1253
1122 glEnable GL_TEXTURE_2D; 1254 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1256
1125 my $border = $self->border; 1257 my $border = $self->border;
1126 1258
1127 glColor @{ $self->{border_bg} }; 1259 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1260 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1261 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1262 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1263 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1264
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1265 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1266 glColor @{ $self->{bg} };
1135 1267
1136 # TODO: repeat texture not scale 1268 # TODO: repeat texture not scale
1269 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1270 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1271 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1272 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1273 }
1147 1274
1148 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1149 1276
1150 $self->{title}->draw if $self->{title};
1151
1152 $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};
1153} 1288}
1154 1289
1155############################################################################# 1290#############################################################################
1156 1291
1157package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1314 my ($self, $x, $y, $child) = @_;
1180 1315
1181 $child->set_parent ($self); 1316 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1183 1318
1184 $self->check_size (1); 1319 $self->realloc;
1320}
1321
1322sub remove {
1323 my ($self, $child) = @_;
1324
1325 # TODO: not yet implemented
1185} 1326}
1186 1327
1187# 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?
1188sub clear { 1329sub clear {
1189 my ($self) = @_; 1330 my ($self) = @_;
… …
1194 for (@children) { 1335 for (@children) {
1195 delete $_->{parent}; 1336 delete $_->{parent};
1196 $_->hide; 1337 $_->hide;
1197 } 1338 }
1198 1339
1199 $self->check_size (1); 1340 $self->realloc;
1200 $self->update;
1201} 1341}
1202 1342
1203sub get_wh { 1343sub get_wh {
1204 my ($self) = @_; 1344 my ($self) = @_;
1205 1345
… …
1231 (sum @$ws), 1371 (sum @$ws),
1232 (sum @$hs), 1372 (sum @$hs),
1233 ) 1373 )
1234} 1374}
1235 1375
1236sub size_allocate { 1376sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1238 1378
1239 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1240 1380
1241 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
… …
1273 } 1413 }
1274 1414
1275 $y += $row_h; 1415 $y += $row_h;
1276 } 1416 }
1277 1417
1418 1
1278} 1419}
1279 1420
1280sub find_widget { 1421sub find_widget {
1281 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1282 1423
… …
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 ) 1462 )
1322} 1463}
1323 1464
1324sub size_allocate { 1465sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1466 my ($self, $w, $h) = @_;
1326 1467
1327 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1328 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1329 1470
1330 my @req; 1471 my @req;
1331 1472
1332 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1333 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1334 } else { 1475 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1336 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1337 1478
1338 if ($req > $space) { 1479 if ($req > $space) {
1339 # ah well, not enough space 1480 # ah well, not enough space
1340 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1341 } else { 1482 } else {
1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1343 1484
1344 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1345 1486
1346 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1347 for 0 .. $#$children; 1488 for 0 .. $#children;
1348 } 1489 }
1349 } 1490 }
1350 1491
1351 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1352 1493
1353 my $pos = 0; 1494 my $pos = 0;
1354 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1355 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1356 $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));
1357 1498
1358 $pos += $alloc; 1499 $pos += $alloc;
1359 } 1500 }
1360 1501
1361 1 1502 1
… …
1413 ellipsise => 3, # end 1554 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1555 layout => (new CFClient::Layout),
1415 fontsize => 1, 1556 fontsize => 1,
1416 align => -1, 1557 align => -1,
1417 valign => -1, 1558 valign => -1,
1418 padding => 2, 1559 padding_x => 2,
1560 padding_y => 2,
1419 can_events => 0, 1561 can_events => 0,
1420 %arg 1562 %arg
1421 ); 1563 );
1422 1564
1423 if (exists $self->{template}) { 1565 if (exists $self->{template}) {
… …
1450 1592
1451 delete $self->{texture}; 1593 delete $self->{texture};
1452 $self->SUPER::update; 1594 $self->SUPER::update;
1453} 1595}
1454 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1455sub set_text { 1604sub set_text {
1456 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1457 1606
1458 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1460 1609
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1463 1611
1612 delete $self->{size_req};
1613 $self->realloc;
1464 $self->update; 1614 $self->update;
1465 $self->check_size;
1466} 1615}
1467 1616
1468sub set_markup { 1617sub set_markup {
1469 my ($self, $markup) = @_; 1618 my ($self, $markup) = @_;
1470 1619
1471 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1472 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1473 1622
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1624
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1478 1626
1627 delete $self->{size_req};
1628 $self->realloc;
1479 $self->update; 1629 $self->update;
1480 $self->check_size;
1481} 1630}
1482 1631
1483sub size_request { 1632sub size_request {
1484 my ($self) = @_; 1633 my ($self) = @_;
1485 1634
1635 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1641
1492 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1493 1643
1494 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1495 $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);
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1648
1498 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1499 1650
1500 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1502 } 1656 };
1503 1657
1504 ( 1658 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1659}
1509 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1510sub size_allocate { 1665sub invoke_size_allocate {
1511 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1512 1667
1668 delete $self->{ox};
1669
1513 delete $self->{texture}; 1670 delete $self->{texture}
1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1514} 1674}
1515 1675
1516sub set_fontsize { 1676sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1518 1678
1519 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1520 delete $self->{texture}; 1681 delete $self->{texture};
1521 1682
1522 $self->update; 1683 $self->realloc;
1523 $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;
1524} 1693}
1525 1694
1526sub _draw { 1695sub _draw {
1527 my ($self) = @_; 1696 my ($self) = @_;
1528 1697
1529 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1530 1699
1531 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1532 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1533 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1534 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1707
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1708 [$self->{layout}->size]
1540
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1543 : ($self->{w} - $tex->{w}) * 0.5);
1544
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1547 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1709 };
1551 1710
1552 glEnable GL_TEXTURE_2D; 1711 unless (exists $self->{ox}) {
1553 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);
1554 1715
1555 if ($tex->{format} == GL_ALPHA) { 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1556 glColor @{$self->{fg}}; 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1718 : ($self->{h} - $size->[1]) * 0.5);
1558 } else {
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1560 } 1719 };
1561 1720
1562 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});
1563} 1725}
1564 1726
1565############################################################################# 1727#############################################################################
1566 1728
1567package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1581 can_hover => 1, 1743 can_hover => 1,
1582 can_focus => 1, 1744 can_focus => 1,
1583 valign => 0, 1745 valign => 0,
1584 can_events => 1, 1746 can_events => 1,
1585 #text => ... 1747 #text => ...
1748 #hidden => "*",
1586 @_ 1749 @_
1587 ) 1750 )
1588} 1751}
1589 1752
1590sub _set_text { 1753sub _set_text {
… …
1592 1755
1593 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1594 1757
1595 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1596 1759
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1761 $self->{text} = $text;
1601 1762
1602 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1604 1766
1605 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1606} 1771}
1607 1772
1608sub set_text { 1773sub set_text {
1609 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1610 1775
1611 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1777 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1778}
1616 1779
1617sub get_text { 1780sub get_text {
1618 $_[0]{text} 1781 $_[0]{text}
1619} 1782}
… …
1624 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1625 1788
1626 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1627} 1790}
1628 1791
1629sub key_down { 1792sub invoke_key_down {
1630 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1631 1794
1632 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1633 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1634 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1646 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1647 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1648 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1649 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1814 $self->emit ('escape');
1652 } elsif ($uni) { 1815 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else {
1818 return 0;
1654 } 1819 }
1655 1820
1656 $self->_set_text ($text); 1821 $self->_set_text ($text);
1657 $self->update;
1658 $self->check_size;
1659}
1660 1822
1823 $self->realloc;
1824
1825 1
1826}
1827
1661sub focus_in { 1828sub invoke_focus_in {
1662 my ($self) = @_; 1829 my ($self) = @_;
1663 1830
1664 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1665 1832
1666 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1667} 1834}
1668 1835
1669sub button_down { 1836sub invoke_button_down {
1670 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1671 1838
1672 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1673 1840
1674 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1675 1842
1676 # byte-index to char-index 1843 # byte-index to char-index
1677 my $text = $self->{text}; 1844 my $text = $self->{text};
1678 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1680 1847
1681 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1682 $self->update; 1849 $self->update;
1850
1851 1
1683} 1852}
1684 1853
1685sub mouse_motion { 1854sub invoke_mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1687# 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
1688} 1859}
1689 1860
1690sub _draw { 1861sub _draw {
1691 my ($self) = @_; 1862 my ($self) = @_;
1692 1863
1693 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1694 1865
1695 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1698 } else { 1869 } else {
1699 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1700 } 1871 }
1701 1872
1702 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1876 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1733 1904
1734our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1735 1906
1736use CFClient::OpenGL; 1907use CFClient::OpenGL;
1737 1908
1738sub key_down { 1909sub invoke_key_down {
1739 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1740 1911
1741 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1742 1913
1743 if ($sym == 13) { 1914 if ($sym == 13) {
1744 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1745 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1746 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1747 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1748 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1749 $self->update; 1921 $self->update;
1750 1922
1751 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1752 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1753 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
… …
1769 } else { 1941 } else {
1770 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1771 } 1943 }
1772 1944
1773 } else { 1945 } else {
1774 $self->SUPER::key_down ($ev); 1946 return $self->SUPER::invoke_key_down ($ev)
1947 }
1948
1775 } 1949 1
1776
1777} 1950}
1778 1951
1779############################################################################# 1952#############################################################################
1780 1953
1781package CFClient::UI::Button; 1954package CFClient::UI::Button;
… …
1790 1963
1791sub new { 1964sub new {
1792 my $class = shift; 1965 my $class = shift;
1793 1966
1794 $class->SUPER::new ( 1967 $class->SUPER::new (
1795 padding => 4, 1968 padding_x => 4,
1969 padding_y => 4,
1796 fg => [1, 1, 1], 1970 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1971 active_fg => [0, 0, 1],
1798 can_hover => 1, 1972 can_hover => 1,
1799 align => 0, 1973 align => 0,
1800 valign => 0, 1974 valign => 0,
1801 can_events => 1, 1975 can_events => 1,
1802 @_ 1976 @_
1803 ) 1977 )
1804} 1978}
1805 1979
1806sub activate { }
1807
1808sub button_up { 1980sub invoke_button_up {
1809 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1810 1982
1811 $self->emit ("activate") 1983 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
1986
1987 1
1814} 1988}
1815 1989
1816sub _draw { 1990sub _draw {
1817 my ($self) = @_; 1991 my ($self) = @_;
1818 1992
1819 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1994
1825 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1828 1998
… …
1833 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
1834} 2004}
1835 2005
1836############################################################################# 2006#############################################################################
1837 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
1838package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
1839 2045
1840our @ISA = CFClient::UI::DrawBG::; 2046our @ISA = CFClient::UI::DrawBG::;
1841 2047
1842my @tex = 2048my @tex =
… …
1847 2053
1848sub new { 2054sub new {
1849 my $class = shift; 2055 my $class = shift;
1850 2056
1851 $class->SUPER::new ( 2057 $class->SUPER::new (
1852 padding => 2, 2058 padding_x => 2,
2059 padding_y => 2,
1853 fg => [1, 1, 1], 2060 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 2061 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 2062 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 2063 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 2064 state => 0,
… …
1861} 2068}
1862 2069
1863sub size_request { 2070sub size_request {
1864 my ($self) = @_; 2071 my ($self) = @_;
1865 2072
1866 ($self->{padding} * 2 + 6) x 2 2073 (6) x 2
1867} 2074}
1868 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1869sub button_down { 2084sub invoke_button_down {
1870 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1871 2086
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 2089 $self->toggle;
1875 $self->_emit (changed => $self->{state}); 2090 } else {
2091 return 0
2092 }
2093
1876 } 2094 1
1877} 2095}
1878 2096
1879sub _draw { 2097sub _draw {
1880 my ($self) = @_; 2098 my ($self) = @_;
1881 2099
1882 $self->SUPER::_draw; 2100 $self->SUPER::_draw;
1883 2101
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2103
1886 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;
1887 2107
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2109
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2111
… …
1899package CFClient::UI::Image; 2119package CFClient::UI::Image;
1900 2120
1901our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1902 2122
1903use CFClient::OpenGL; 2123use CFClient::OpenGL;
1904use Carp qw/confess/;
1905 2124
1906our %loaded_images; 2125our %texture_cache;
1907 2126
1908sub new { 2127sub new {
1909 my $class = shift; 2128 my $class = shift;
1910 2129
1911 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1912 2134
1913 $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";
1914 2137
1915 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1916 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;
1917 2140
1918 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
1919 2142
1920 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1921
1922 $self->{aspect} = $tex->{w} / $tex->{h};
1923 2144
1924 $self 2145 $self
1925} 2146}
1926 2147
1927sub size_request { 2148sub size_request {
1928 my ($self) = @_; 2149 my ($self) = @_;
1929 2150
1930 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
1931} 2152}
1932 2153
1933sub _draw { 2154sub _draw {
1934 my ($self) = @_; 2155 my ($self) = @_;
1935 2156
… …
2044 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2045 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2046 2267
2047 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2048 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);
2049 2273
2050 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2051 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;
2052 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2279
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
2071 2296
2072 if ($t3) { 2297 if ($t3) {
2073 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2074 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2075 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2076 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2077 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2078 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2079 glEnd; 2304 glEnd;
2080 } 2305 }
2081 2306
2082 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2156 fg => [1, 1, 1], 2381 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2382 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2383 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2384 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2385 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2386 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2387 min_h => $::WIDTH / 80,
2163 vertical => 0, 2388 vertical => 0,
2164 can_hover => 1, 2389 can_hover => 1,
2165 inner_pad => 0.02, 2390 inner_pad => 0.02,
2166 @_ 2391 @_
2167 ); 2392 );
… …
2175sub set_range { 2400sub set_range {
2176 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2177 2402
2178 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2179 2404
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2182} 2409}
2183 2410
2184sub set_value { 2411sub set_value {
2185 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2186 2413
… …
2197 if $unit; 2424 if $unit;
2198 2425
2199 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2200 2427
2201 if ($value != $old_value) { 2428 if ($value != $old_value) {
2202 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2203 $self->update; 2430 $self->update;
2204 } 2431 }
2205} 2432}
2206 2433
2207sub size_request { 2434sub size_request {
2208 my ($self) = @_; 2435 my ($self) = @_;
2209 2436
2210 my $w = $self->{req_w}; 2437 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2438}
2215 2439
2216sub button_down { 2440sub invoke_button_down {
2217 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2218 2442
2219 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2220 2444
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2446
2223 $self->mouse_motion ($ev, $x, $y); 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2224} 2448}
2225 2449
2226sub mouse_motion { 2450sub invoke_mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2228 2452
2229 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2230 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2231 2455
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2456 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2457
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2458 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2459
2236 $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
2237 } 2465 1
2238} 2466}
2239 2467
2240sub update { 2468sub update {
2241 my ($self) = @_; 2469 my ($self) = @_;
2242 2470
2243 $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}) {
2244 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2245 2480
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2482 my $range = ($hi - $page - $lo) || 1e-100;
2248 2483
… …
2254 $value = ($value - $lo) / $range; 2489 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2490 $value = $value * $self->{scale} + $self->{offset};
2256 2491
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2493 $self->{knob_w} = $knob_w;
2259 }); 2494 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2495
2267 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2268 2497
2269 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2270 2499
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2560sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2561sub set_value { shift->{slider}->set_value (@_) }
2333 2562
2334############################################################################# 2563#############################################################################
2335 2564
2336package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2337 2566
2338our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2339 2568
2340use CFClient::OpenGL; 2569use CFClient::OpenGL;
2341 2570
… …
2343 my $class = shift; 2572 my $class = shift;
2344 2573
2345 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2346 fontsize => 1, 2575 fontsize => 1,
2347 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2348 #font => default_font 2578 #font => default_font
2349 @_, 2579 @_,
2350 2580
2351 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2352 par => [], 2582 par => [],
2353 height => 0, 2583 height => 0,
2354 children => [ 2584 children => [
2355 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2356 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2367 2597
2368 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2369 $self->reflow; 2599 $self->reflow;
2370} 2600}
2371 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
2372sub size_allocate { 2611sub invoke_size_allocate {
2373 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2374 2613
2375 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2376 2616
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $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});
2380 2621
2381 $self->reflow; 2622 $self->reflow;
2382}
2383 2623
2384sub text_size { 2624 local $self->{children} = [$empty, $slider];
2385 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2386 2630
2387 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2388 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $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});
2391 $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}}
2392 2644 );
2645
2393 $layout->size 2646 $layout
2394} 2647}
2395 2648
2396sub reflow { 2649sub reflow {
2397 my ($self) = @_; 2650 my ($self) = @_;
2398 2651
… …
2407 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2408} 2661}
2409 2662
2410sub clear { 2663sub clear {
2411 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2412 2668
2413 $self->{par} = []; 2669 $self->{par} = [];
2414 $self->{height} = 0; 2670 $self->{height} = 0;
2415 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2416} 2672}
2417 2673
2418sub add_paragraph { 2674sub add_paragraph {
2419 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2420 2676
2421 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2422 my ($w, $h) = $self->text_size ($line); 2678
2423 $self->{height} += $h; 2679 $para = {
2424 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,
2425 } 2686 };
2426 2687
2427 $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;
2428} 2700}
2429 2701
2430sub update { 2702sub update {
2431 my ($self) = @_; 2703 my ($self) = @_;
2432 2704
… …
2434 2706
2435 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2436 2708
2437 delete $self->{texture}; 2709 delete $self->{texture};
2438 2710
2439 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 2713
2442 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2443 my $height = 0; 2715 my $height = 0;
2444 2716
2445 my $layout = $self->{layout};
2446
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448
2449 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2451 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2452 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3]; 2721
2455 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2456 } 2725 }
2457 2726
2458 $height += $_->[1]; 2727 $height += $para->{h};
2459 } 2728 }
2460 2729
2461 $self->{height} = $height; 2730 $self->{height} = $height;
2462 2731
2463 $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]);
2464 2733
2465 delete $self->{texture}; 2734 delete $self->{texture};
2466 } 2735 }
2467 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2471 2744
2472 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2473 2746
2474 my $y0 = $top; 2747 my $y0 = $top;
2475 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2476 2749
2477 my $y = 0; 2750 my $y = 0;
2478 2751
2479 my $layout = $self->{layout};
2480
2481 $layout->set_font ($self->{font}) if $self->{font};
2482
2483 glEnable GL_BLEND;
2484 #TODO# not correct in windows where rgba is forced off
2485 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2486
2487 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2488 my $h = $par->[1]; 2753 my $h = $para->{h};
2489 2754
2490 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]);
2493 $layout->set_markup ($par->[4]);
2494 2756
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2496 2758
2497 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2498 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 }
2499 } 2773 }
2500 2774
2501 $y += $h; 2775 $y += $h;
2502 } 2776 }
2503
2504 glDisable GL_BLEND;
2505 }; 2777 };
2506 }); 2778 });
2507} 2779}
2508 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2509sub _draw { 2790sub _draw {
2510 my ($self) = @_; 2791 my ($self) = @_;
2511 2792
2512 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2515 $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});
2516 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2517 2798
2518 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2519
2520} 2800}
2521 2801
2522############################################################################# 2802#############################################################################
2523 2803
2524package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2603} 2883}
2604 2884
2605sub set_tooltip_from { 2885sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2886 my ($self, $widget) = @_;
2607 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
2608 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2901 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2903 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2904 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2905 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2906 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2621 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2622 2914
2623 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2624} 2916}
2625 2917
2626sub size_allocate { 2918sub invoke_size_allocate {
2627 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2628 2920
2629 $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 });
2630} 2940}
2631 2941
2632sub _draw { 2942sub _draw {
2633 my ($self) = @_; 2943 my ($self) = @_;
2634 2944
… …
2651 glVertex $w, $h; 2961 glVertex $w, $h;
2652 glVertex $w, 0; 2962 glVertex $w, 0;
2653 glEnd; 2963 glEnd;
2654 2964
2655 glTranslate 2 - 0.375, 2 - 0.375; 2965 glTranslate 2 - 0.375, 2 - 0.375;
2966
2656 $self->SUPER::_draw; 2967 $self->SUPER::_draw;
2657} 2968}
2658 2969
2659############################################################################# 2970#############################################################################
2660 2971
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 3031
2721 if ($tex) { 3032 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2727 } 3038 }
2728} 3039}
2729 3040
2730sub DESTROY { 3041sub destroy {
2731 my ($self) = @_; 3042 my ($self) = @_;
2732 3043
2733 $self->{timer}->cancel 3044 $self->{timer}->cancel
2734 if $self->{timer}; 3045 if $self->{timer};
2735 3046
2736 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2737} 3048}
2738 3049
2739############################################################################# 3050#############################################################################
2740 3051
2741package CFClient::UI::Inventory; 3052package CFClient::UI::Buttonbar;
2742 3053
2743our @ISA = CFClient::UI::ScrolledWindow::; 3054our @ISA = CFClient::UI::HBox::;
2744 3055
2745sub new { 3056# TODO: should actualyl wrap buttons and other goodies.
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780 3057
2781############################################################################# 3058#############################################################################
2782 3059
2783package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2784 3061
… …
2796 ); 3073 );
2797 3074
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799 3076
2800 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2802 3079
2803 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2804 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 {
2805 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2806 can_hover => 1, 3097 can_hover => 1,
2807 can_events => 1, 3098 can_events => 1,
2808 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2809 } 3102 }
2810 3103
2811 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2812 3105
2813 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2818 3111
2819# 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)
2820sub popup { 3113sub popup {
2821 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
2822 3115
2823 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2824 3117
2825 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 3119 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2828 3121
2829 $self->show; 3122 $self->show;
2830 $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);
2831} 3124}
2832 3125
2833sub mouse_motion { 3126sub invoke_mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2835 3128
2836 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2839}
2840 3132
3133 0
3134}
3135
2841sub button_up { 3136sub invoke_button_up {
2842 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2843 3138
2844 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2845 undef $GRAB; 3140 undef $GRAB;
2846 $self->hide; 3141 $self->hide;
2847 3142
2848 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3145 } else {
3146 return 0
3147 }
3148
2850 } 3149 1
2851} 3150}
2852 3151
2853############################################################################# 3152#############################################################################
2854 3153
2855package CFClient::UI::Statusbox; 3154package CFClient::UI::Multiplexer;
2856 3155
2857our @ISA = CFClient::UI::VBox::; 3156our @ISA = CFClient::UI::Container::;
2858 3157
2859sub new { 3158sub new {
2860 my $class = shift; 3159 my $class = shift;
2861 3160
2862 $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 (
2863 fontsize => 0.8, 3340 fontsize => 0.8,
2864 @_, 3341 @_,
2865 ) 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
2866} 3349}
2867 3350
2868sub reorder { 3351sub reorder {
2869 my ($self) = @_; 3352 my ($self) = @_;
2870 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} };
2871 3359
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3362 }
2875 3363
… …
2878 my @items = sort { 3366 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
2882 3370
3371 $self->{timer}->interval (1);
3372
2883 my $count = 10 + 1; 3373 my $count = 10 + 1;
2884 for my $item (@items) { 3374 for my $item (@items) {
2885 last unless --$count; 3375 last unless --$count;
2886 3376
2887 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3381 : $item->{text};
2892 3382
… …
2900 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3396 can_events => 1,
2907 can_hover => 1 3397 can_hover => 1
2908 }; 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;
2909 } 3411 }
2910 3412
2911 $self->clear; 3413 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
2913} 3415}
… …
2918 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
2920 3422
2921 return unless $text; 3423 return unless $text;
2922 3424
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3426
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3428
2927 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
2929 $item->{count}++; 3431 $item->{count}++;
2930 } else { 3432 } else {
2931 $item->{count} = 1; 3433 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
2933 } 3435 }
2934 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3438 delete $item->{label};
2937 } else { 3439 } else {
2938 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
2945 count => 1, 3447 count => 1,
2946 %arg, 3448 %arg,
2947 }; 3449 };
2948 } 3450 }
2949 3451
3452 $ROOT->on_refresh (reorder => sub {
2950 $self->reorder; 3453 $self->reorder;
3454 });
2951} 3455}
2952 3456
2953sub reconfigure { 3457sub reconfigure {
2954 my ($self) = @_; 3458 my ($self) = @_;
2955 3459
… …
2958 3462
2959 $self->reorder; 3463 $self->reorder;
2960 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
2961} 3465}
2962 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
2963############################################################################# 3475#############################################################################
2964 3476
2965package CFClient::UI::Root; 3477package CFClient::UI::Inventory;
2966 3478
2967our @ISA = CFClient::UI::Container::; 3479our @ISA = CFClient::UI::Table::;
2968
2969use CFClient::OpenGL;
2970 3480
2971sub new { 3481sub new {
2972 my $class = shift; 3482 my $class = shift;
2973 3483
2974 $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 (
2975 visible => 1, 3653 visible => 1,
2976 @_, 3654 @_,
2977 ) 3655 );
2978}
2979 3656
2980sub configure { 3657 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3658
2983 $self->{w} = $w; 3659 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3660}
2993 3661
2994sub size_request { 3662sub size_request {
2995 my ($self) = @_; 3663 my ($self) = @_;
2996 3664
2997 ($self->{w}, $self->{h}) 3665 ($self->{w}, $self->{h})
2998} 3666}
2999 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
3000sub size_allocate { 3682sub invoke_size_allocate {
3001 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
3002 3684
3003 for my $child ($self->children) { 3685 for my $child ($self->children) {
3004 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)};
3005 3687
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3688 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3689 $Y = $child->{force_y} if exists $child->{force_y};
3008 3690
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3691 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3693
3017 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3018 } 3695 }
3696
3697 1
3019} 3698}
3020 3699
3021sub coord2local { 3700sub coord2local {
3022 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3023 3702
… …
3031} 3710}
3032 3711
3033sub update { 3712sub update {
3034 my ($self) = @_; 3713 my ($self) = @_;
3035 3714
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3715 $::WANT_REFRESH++;
3038} 3716}
3039 3717
3040sub add { 3718sub add {
3041 my ($self, @children) = @_; 3719 my ($self, @children) = @_;
3042 3720
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3721 $_->{is_toplevel} = 1
3045 3722 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3723
3051 $self->SUPER::add (@children); 3724 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3725}
3059 3726
3060sub remove { 3727sub remove {
3061 my ($self, @children) = @_; 3728 my ($self, @children) = @_;
3062 3729
3063 $self->SUPER::remove (@children); 3730 $self->SUPER::remove (@children);
3731
3732 delete $self->{is_toplevel}
3733 for @children;
3064 3734
3065 while (@children) { 3735 while (@children) {
3066 my $w = pop @children; 3736 my $w = pop @children;
3067 push @children, $w->children; 3737 push @children, $w->children;
3068 $w->set_invisible; 3738 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3757 while ($self->{refresh_hook}) {
3088 $_->() 3758 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3759 for values %{delete $self->{refresh_hook}};
3090 } 3760 }
3091 3761
3092 if ($self->{check_size}) { 3762 if ($self->{realloc}) {
3763 my %queue;
3093 my @queue; 3764 my @queue;
3765 my $widget;
3094 3766
3095 for (;;) { 3767 outer:
3096 if ($self->{check_size}) { 3768 while () {
3097 #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
3098 3772
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3773 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3774
3775 push @{ $queue[$widget->{visible}] }, $widget;
3776 }
3101 } 3777 }
3102 3778
3779 while () {
3780 @queue or last outer;
3781
3103 my $widget = pop @queue || last; 3782 $widget = pop @{ $queue[-1] || [] }
3104 3783 and last;
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114 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}) {
3115 $widget->{req_w} = $w; 3803 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3804 $widget->{req_h} = $h;
3117 3805
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3806 $self->{size_alloc}{$widget+0} = $widget;
3119 3807
3120 $widget->{parent}->check_size
3121 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 }
3122 } 3815 }
3816
3817 delete $self->{realloc}{$widget+0};
3123 } 3818 }
3124 } 3819 }
3125 3820
3126 while ($self->{size_alloc}) { 3821 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3822 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 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)};
3129 3829
3130 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3132 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
3133 $widget->{w} = $w; 3846 $widget->{w} = $w;
3134 $widget->{h} = $h; 3847 $widget->{h} = $h;
3848
3135 $widget->emit (size_allocate => $w, $h); 3849 $widget->emit (size_allocate => $w, $h);
3850 }
3136 } 3851 }
3137 } 3852 }
3138 3853
3139 while ($self->{post_alloc_hook}) { 3854 while ($self->{post_alloc_hook}) {
3140 $_->() 3855 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3856 for values %{delete $self->{post_alloc_hook}};
3142 } 3857 }
3858
3143 3859
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3860 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3862 glClear GL_COLOR_BUFFER_BIT;
3147 3863
… …
3149 glLoadIdentity; 3865 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3867 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3868 glLoadIdentity;
3153 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
3154 $self->_draw; 3877 $self->_draw;
3155} 3878}
3156 3879
3157############################################################################# 3880#############################################################################
3158 3881

Diff Legend

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