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

Diff Legend

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