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.316 by root, Sun Jul 2 13:57:58 2006 UTC

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

Diff Legend

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