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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.337 by root, Mon Jul 24 04:24:43 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, CFClient::ceil $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $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 {
392 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
393 433
434 Carp::confess unless $self->{parent};#d#
435
394 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
395} 437}
396 438
397# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
398sub coord2global { 440sub coord2global {
399 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
400 442
443 Carp::confess unless $self->{parent};#d#
444
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 446}
403 447
404sub focus_in { 448sub invoke_focus_in {
405 my ($self) = @_; 449 my ($self) = @_;
406 450
407 return if $FOCUS == $self; 451 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
409 453
410 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
411 455
412 $self->_emit (focus_in => $focus); 456 $self->update;
413 457
414 $focus->update if $focus; 458 0
415 $FOCUS->update;
416} 459}
417 460
418sub focus_out { 461sub invoke_focus_out {
419 my ($self) = @_; 462 my ($self) = @_;
420 463
421 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
422 465
423 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
424 467
425 $self->_emit (focus_out => $focus); 468 $self->update;
426 469
427 $focus->update if $focus; #?
428
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 471 unless $FOCUS;
431}
432 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
433sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
434sub button_up { } 484sub invoke_button_up { 0 }
435sub key_down { } 485sub invoke_key_down { 0 }
436sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
437 488
438sub button_down { 489sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
440 491
441 $self->focus_in; 492 $self->grab_focus;
442}
443 493
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
531}
449 532
450sub find_widget { 533sub find_widget {
451 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
452 535
453 return () unless $self->{can_events}; 536 return () unless $self->{can_events};
… …
461 544
462sub set_parent { 545sub set_parent {
463 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
464 547
465 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
468} 550}
469 551
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 { 552sub realloc {
494 my ($self) = @_; 553 my ($self) = @_;
495 554
496 if ($self->{visible}) { 555 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 556 return if $self->{root}{realloc}{$self+0};
498 557
499 $self->{root}{realloc}{$self} = $self; 558 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 559 $self->{root}->update;
501 } else { 560 } else {
502 delete $self->{req_w}; 561 delete $self->{req_w};
562 delete $self->{req_h};
503 } 563 }
504} 564}
505 565
506sub update { 566sub update {
507 my ($self) = @_; 567 my ($self) = @_;
508 568
509 $self->{parent}->update 569 $self->{parent}->update
510 if $self->{parent}; 570 if $self->{parent};
511} 571}
512 572
573sub reconfigure {
574 my ($self) = @_;
575
576 $self->realloc;
577 $self->update;
578}
579
580# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583
513sub draw { 584sub draw {
514 my ($self) = @_; 585 my ($self) = @_;
515 586
516 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 596
518 glPushMatrix; 597 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 599
523 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 602 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 604 glBegin GL_QUADS;
530 glVertex $x , $y; 605 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
534 glEnd; 609 glEnd;
535 glDisable GL_BLEND; 610 glDisable GL_BLEND;
536 } 611 }
537 612
538 if ($ENV{PCLIENT_DEBUG}) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 614 glPushMatrix;
540 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 618 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
547 glEnd; 622 glEnd;
548 glPopMatrix; 623 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
551} 629}
552 630
553sub _draw { 631sub _draw {
554 my ($self) = @_; 632 my ($self) = @_;
555 633
… …
557} 635}
558 636
559sub DESTROY { 637sub DESTROY {
560 my ($self) = @_; 638 my ($self) = @_;
561 639
640 return if CFClient::in_destruct;
641
562 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
563 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 646}
565 647
566############################################################################# 648#############################################################################
567 649
568package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
593 675
594 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
596 678
597 glEnable GL_BLEND; 679 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 681 glColor_premultiply @$color;
600 682
601 glBegin GL_QUADS; 683 glBegin GL_QUADS;
602 glVertex 0 , 0; 684 glVertex 0 , 0;
603 glVertex 0 , $h; 685 glVertex 0 , $h;
604 glVertex $w, $h; 686 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
621} 703}
622 704
623sub size_request { 705sub size_request {
624 (0, 0) 706 my ($self) = @_;
707
708 ($self->{w} + 0, $self->{h} + 0)
625} 709}
626 710
627sub draw { } 711sub draw { }
628 712
629############################################################################# 713#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
634 718
635sub new { 719sub new {
636 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
637 721
638 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
639 723
640 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
641 children => [], 725 children => [],
642 can_events => 0, 726 can_events => 0,
643 %arg, 727 %arg,
644 ); 728 );
729
645 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
646 732
647 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
648} 742}
649 743
650sub add { 744sub add {
651 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
652 746
… …
698 $x -= $self->{x}; 792 $x -= $self->{x};
699 $y -= $self->{y}; 793 $y -= $self->{y};
700 794
701 my $res; 795 my $res;
702 796
703 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
705 and return $res; 799 and return $res;
706 } 800 }
707 801
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 823}
730 824
731sub add { 825sub add {
732 my ($self, $child) = @_; 826 my ($self, $child) = @_;
733 827
734 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
737} 830}
738 831
739sub remove { 832sub remove {
740 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
749 842
750sub size_request { 843sub size_request {
751 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
752} 845}
753 846
754sub size_allocate { 847sub invoke_size_allocate {
755 my ($self, $w, $h, $changed) = @_; 848 my ($self, $w, $h) = @_;
756 849
757 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
758} 853}
759 854
760############################################################################# 855#############################################################################
856
857# back-buffered drawing area
761 858
762package CFClient::UI::Window; 859package CFClient::UI::Window;
763 860
764our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
765 862
… …
776 873
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 875 $self->SUPER::update;
779} 876}
780 877
781sub size_allocate { 878sub invoke_size_allocate {
782 my ($self, $w, $h, $changed) = @_; 879 my ($self, $w, $h) = @_;
783 880
784 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update 881 $self->update;
786 if $changed; 882
883 $self->SUPER::invoke_size_allocate ($w, $h)
787} 884}
788 885
789sub _render { 886sub _render {
887 my ($self) = @_;
888
790 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
791} 890}
792 891
793sub render_child { 892sub render_child {
794 my ($self) = @_; 893 my ($self) = @_;
795 894
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
799 898
899 {
900 package CFClient::UI::Base;
901
902 ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h});
904 }
905
800 $self->_render; 906 $self->_render;
801 }; 907 };
802} 908}
803 909
804sub _draw { 910sub _draw {
805 my ($self) = @_; 911 my ($self) = @_;
806 912
807 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
808 914
809 my $tex = $self->{texture} 915 my $tex = $self->{texture}
810 or return; 916 or return;
811 917
812 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
815 921
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 923
818 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
819} 925}
… …
835} 941}
836 942
837sub size_request { 943sub size_request {
838 my ($self) = @_; 944 my ($self) = @_;
839 945
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 947
842 $w = 10 if $self->{scroll_x}; 948 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
844 950
845 ($w, $h) 951 ($w, $h)
846} 952}
847 953
848sub size_allocate { 954sub invoke_size_allocate {
849 my ($self, $w, $h, $changed) = @_; 955 my ($self, $w, $h) = @_;
850 956
957 my $child = $self->child;
958
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 961
854 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
855 $self->update; 963 $self->update;
964
965 1
856} 966}
857 967
858sub set_offset { 968sub set_offset {
859 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
860 970
… …
893} 1003}
894 1004
895sub _render { 1005sub _render {
896 my ($self) = @_; 1006 my ($self) = @_;
897 1007
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
1010
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 1012
900 $self->SUPER::_render; 1013 $self->SUPER::_render;
901} 1014}
902 1015
… …
905package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
906 1019
907our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
908 1021
909sub new { 1022sub new {
910 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
911 1026
912 my $self; 1027 my $self;
913 1028
914 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
915 vertical => 1, 1030 vertical => 1,
… …
918 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
919 }, 1034 },
920 ; 1035 ;
921 1036
922 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
924 slider => $slider, 1040 slider => $slider,
925 @_, 1041 %arg,
926 ); 1042 );
927 1043
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
931 1046
932 $self 1047 $self
933} 1048}
934 1049
1050#TODO# update range on size_allocate depending on child
1051
1052sub add {
1053 my ($self, $widget) = @_;
1054
1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
935sub update { 1074sub update {
936 my ($self) = @_; 1075 my ($self) = @_;
937 1076
938 $self->SUPER::update; 1077 $self->SUPER::update;
939 1078
940 # todo: overwrite size_allocate of child 1079 $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} 1080}
944 1081
945sub size_allocate { 1082sub invoke_size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1083 my ($self, $w, $h) = @_;
947 1084
1085 $self->update_slider;
1086
948 $self->SUPER::size_allocate ($w, $h, $changed); 1087 $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} 1088}
953
954#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll
956 1089
957############################################################################# 1090#############################################################################
958 1091
959package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
960 1093
… …
976 1109
977 if ($self->{bg}) { 1110 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
979 1112
980 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
983 1116
984 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
985 glVertex 0 , 0; 1118 glVertex 0 , 0;
986 glVertex 0 , $h; 1119 glVertex 0 , $h;
987 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1000 1133
1001our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFClient::UI::Bin::;
1002 1135
1003use CFClient::OpenGL; 1136use CFClient::OpenGL;
1004 1137
1005my @tex = 1138my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1;
1141
1142my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 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); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1145
1009sub new { 1146sub new {
1010 my $class = shift; 1147 my ($class, %arg) = @_;
1011 1148
1012 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1152 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1153 can_events => 1,
1018 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
1019 ); 1157 );
1020 1158
1021 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1022 align => 0, 1160 align => 0,
1023 valign => 1, 1161 valign => 1,
1024 text => $self->{title}, 1162 text => $self->{title},
1025 fontsize => $self->{border}; 1163 fontsize => $self->{border},
1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1026 1174
1027 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028} 1184}
1029 1185
1030sub border { 1186sub border {
1031 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1032} 1188}
1033 1189
1034sub size_request { 1190sub size_request {
1035 my ($self) = @_; 1191 my ($self) = @_;
1192
1193 $self->{title_widget}->size_request
1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1036 1198
1037 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1038 1200
1039 ( 1201 (
1040 $w + $self->border * 2, 1202 $w + $self->border * 2,
1041 $h + $self->border * 2, 1203 $h + $self->border * 2,
1042 ) 1204 )
1043} 1205}
1044 1206
1045sub size_allocate { 1207sub invoke_size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1208 my ($self, $w, $h) = @_;
1047 1209
1048 return unless $changed; 1210 if ($self->{title_widget}) {
1211 $self->{title_widget}{w} = $w;
1212 $self->{title_widget}{h} = $h;
1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1214 }
1049 1215
1216 my $border = $self->border;
1217
1050 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1052 1220
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); 1221 $self->child->configure ($border, $border, $w, $h);
1057}
1058 1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1234 1
1235}
1236
1059sub button_down { 1237sub invoke_button_down {
1060 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1061 1239
1062 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1063 my $border = $self->border; 1241 my $border = $self->border;
1064 1242
… …
1077 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1078 1256
1079 my $dx = $ev->{x} - $ox; 1257 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1081 1259
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1264 $self->realloc;
1088 }; 1265 };
1089 1266
1090 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1271 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1096 1273
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1275
1099 $self->{user_x} = $bx + $x - $ox; 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1277 # HACK: the next line is required to enforce placement
1101 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1105 } 1284 1
1106} 1285}
1107 1286
1108sub button_up { 1287sub invoke_button_up {
1109 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1110 1289
1111 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1112} 1291}
1113 1292
1114sub mouse_motion { 1293sub invoke_mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1116 1295
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1118} 1299}
1119 1300
1120sub _draw { 1301sub _draw {
1121 my ($self) = @_; 1302 my ($self) = @_;
1122 1303
1304 my $child = $self->{children}[0];
1305
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1308
1126 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1311
1129 my $border = $self->border; 1312 my $border = $self->border;
1130 1313
1131 glColor @{ $self->{border_bg} }; 1314 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1315 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1319
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1321 glColor @{ $self->{bg} };
1139 1322
1140 # TODO: repeat texture not scale 1323 # TODO: repeat texture not scale
1324 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1325 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1326 $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); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1328 }
1151 1329
1152 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1153 1331
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1332 $child->draw;
1333
1334 if ($self->{title_widget}) {
1335 glTranslate 0, $border - $self->{h};
1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1157} 1343}
1158 1344
1159############################################################################# 1345#############################################################################
1160 1346
1161package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1178sub children { 1364sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1180} 1366}
1181 1367
1182sub add { 1368sub add {
1183 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1184 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1185 $child->set_parent ($self); 1373 $child->set_parent ($self);
1186 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1187 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1188 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1189} 1386}
1190 1387
1191# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1192sub clear { 1389sub clear {
1193 my ($self) = @_; 1390 my ($self) = @_;
… …
1234 (sum @$ws), 1431 (sum @$ws),
1235 (sum @$hs), 1432 (sum @$hs),
1236 ) 1433 )
1237} 1434}
1238 1435
1239sub size_allocate { 1436sub invoke_size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1437 my ($self, $w, $h) = @_;
1241 1438
1242 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1243 1440
1244 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1442 my $req_h = (sum @$hs) || 1;
… …
1276 } 1473 }
1277 1474
1278 $y += $row_h; 1475 $y += $row_h;
1279 } 1476 }
1280 1477
1478 1
1281} 1479}
1282 1480
1283sub find_widget { 1481sub find_widget {
1284 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1285 1483
… …
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1522 )
1325} 1523}
1326 1524
1327sub size_allocate { 1525sub invoke_size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1526 my ($self, $w, $h) = @_;
1329 1527
1330 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1332 1530
1333 my @req; 1531 my @req;
1334 1532
1335 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1336 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1337 } else { 1535 } else {
1338 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1339 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1340 1538
1341 if ($req > $space) { 1539 if ($req > $space) {
1342 # ah well, not enough space 1540 # ah well, not enough space
1343 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1344 } else { 1542 } else {
1345 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1346 1544
1347 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1348 1546
1349 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1350 for 0 .. $#$children; 1548 for 0 .. $#children;
1351 } 1549 }
1352 } 1550 }
1353 1551
1354 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1355 1553
1356 my $pos = 0; 1554 my $pos = 0;
1357 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1358 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1359 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360 1558
1361 $pos += $alloc; 1559 $pos += $alloc;
1362 } 1560 }
1363 1561
1364 1 1562 1
… …
1416 ellipsise => 3, # end 1614 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1615 layout => (new CFClient::Layout),
1418 fontsize => 1, 1616 fontsize => 1,
1419 align => -1, 1617 align => -1,
1420 valign => -1, 1618 valign => -1,
1421 padding => 2, 1619 padding_x => 2,
1620 padding_y => 2,
1422 can_events => 0, 1621 can_events => 0,
1423 %arg 1622 %arg
1424 ); 1623 );
1425 1624
1426 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
… …
1436 } 1635 }
1437 1636
1438 $self 1637 $self
1439} 1638}
1440 1639
1441sub escape($) {
1442 local $_ = $_[0];
1443
1444 s/&/&amp;/g;
1445 s/>/&gt;/g;
1446 s/</&lt;/g;
1447
1448 $_
1449}
1450
1451sub update { 1640sub update {
1452 my ($self) = @_; 1641 my ($self) = @_;
1453 1642
1454 delete $self->{texture}; 1643 delete $self->{texture};
1455 $self->SUPER::update; 1644 $self->SUPER::update;
1456} 1645}
1457 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1458sub set_text { 1654sub set_text {
1459 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1460 1656
1461 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1463 1659
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1466 1661
1662 delete $self->{size_req};
1467 $self->realloc; 1663 $self->realloc;
1468 $self->update; 1664 $self->update;
1469} 1665}
1470 1666
1471sub set_markup { 1667sub set_markup {
… …
1474 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1475 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1476 1672
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1674
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1481 1676
1677 delete $self->{size_req};
1482 $self->realloc; 1678 $self->realloc;
1483 $self->update; 1679 $self->update;
1484} 1680}
1485 1681
1486sub size_request { 1682sub size_request {
1487 my ($self) = @_; 1683 my ($self) = @_;
1488 1684
1685 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1691
1495 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1496 1693
1497 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1698
1501 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1502 1700
1503 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1505 } 1706 };
1506 1707
1507 ( 1708 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1709}
1512 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1513sub size_allocate { 1715sub invoke_size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1716 my ($self, $w, $h) = @_;
1717
1718 delete $self->{ox};
1515 1719
1516 delete $self->{texture} 1720 delete $self->{texture}
1517 if $changed; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1518} 1724}
1519 1725
1520sub set_fontsize { 1726sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1522 1728
1523 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1524 delete $self->{texture}; 1731 delete $self->{texture};
1525 1732
1526 $self->realloc; 1733 $self->realloc;
1527} 1734}
1528 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1529sub _draw { 1745sub _draw {
1530 my ($self) = @_; 1746 my ($self) = @_;
1531 1747
1532 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1533 1749
1534 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1535 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1536 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1537 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1757
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$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 }; 1759 };
1554 1760
1555 glEnable GL_TEXTURE_2D; 1761 unless (exists $self->{ox}) {
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1764 : ($self->{w} - $size->[0]) * 0.5);
1557 1765
1558 if ($tex->{format} == GL_ALPHA) { 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 glColor @{$self->{fg}}; 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1768 : ($self->{h} - $size->[1]) * 0.5);
1561 } else {
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1563 } 1769 };
1564 1770
1565 glDisable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773
1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1566} 1775}
1567 1776
1568############################################################################# 1777#############################################################################
1569 1778
1570package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1584 can_hover => 1, 1793 can_hover => 1,
1585 can_focus => 1, 1794 can_focus => 1,
1586 valign => 0, 1795 valign => 0,
1587 can_events => 1, 1796 can_events => 1,
1588 #text => ... 1797 #text => ...
1798 #hidden => "*",
1589 @_ 1799 @_
1590 ) 1800 )
1591} 1801}
1592 1802
1593sub _set_text { 1803sub _set_text {
… …
1595 1805
1596 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1597 1807
1598 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1599 1809
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1811 $self->{text} = $text;
1604 1812
1605 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1607 1816
1608 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1609} 1821}
1610 1822
1611sub set_text { 1823sub set_text {
1612 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1613 1825
1614 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1827 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1828}
1619 1829
1620sub get_text { 1830sub get_text {
1621 $_[0]{text} 1831 $_[0]{text}
1622} 1832}
… …
1627 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1628 1838
1629 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1630} 1840}
1631 1841
1632sub key_down { 1842sub invoke_key_down {
1633 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1634 1844
1635 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1636 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1637 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1649 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1650 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1651 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1652 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1864 $self->emit ('escape');
1655 } elsif ($uni) { 1865 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1657 } 1869 }
1658 1870
1659 $self->_set_text ($text); 1871 $self->_set_text ($text);
1660 1872
1661 $self->realloc; 1873 $self->realloc;
1662}
1663 1874
1875 1
1876}
1877
1664sub focus_in { 1878sub invoke_focus_in {
1665 my ($self) = @_; 1879 my ($self) = @_;
1666 1880
1667 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1668 1882
1669 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1670} 1884}
1671 1885
1672sub button_down { 1886sub invoke_button_down {
1673 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1674 1888
1675 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1676 1890
1677 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1678 1892
1679 # byte-index to char-index 1893 # byte-index to char-index
1680 my $text = $self->{text}; 1894 my $text = $self->{text};
1681 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1683 1897
1684 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1685 $self->update; 1899 $self->update;
1900
1901 1
1686} 1902}
1687 1903
1688sub mouse_motion { 1904sub invoke_mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1907
1908 1
1691} 1909}
1692 1910
1693sub _draw { 1911sub _draw {
1694 my ($self) = @_; 1912 my ($self) = @_;
1695 1913
1696 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1697 1915
1698 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1701 } else { 1919 } else {
1702 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1703 } 1921 }
1704 1922
1705 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1926 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1736 1954
1737our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1738 1956
1739use CFClient::OpenGL; 1957use CFClient::OpenGL;
1740 1958
1741sub key_down { 1959sub invoke_key_down {
1742 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1743 1961
1744 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1745 1963
1746 if ($sym == 13) { 1964 if ($sym == 13) {
1747 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1748 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1749 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1750 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1751 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1752 $self->update; 1971 $self->update;
1753 1972
1754 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1755 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1756 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1772 } else { 1991 } else {
1773 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1774 } 1993 }
1775 1994
1776 } else { 1995 } else {
1777 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1778 } 1999 1
1779
1780} 2000}
1781 2001
1782############################################################################# 2002#############################################################################
1783 2003
1784package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1793 2013
1794sub new { 2014sub new {
1795 my $class = shift; 2015 my $class = shift;
1796 2016
1797 $class->SUPER::new ( 2017 $class->SUPER::new (
1798 padding => 4, 2018 padding_x => 4,
2019 padding_y => 4,
1799 fg => [1, 1, 1], 2020 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 2021 active_fg => [0, 0, 1],
1801 can_hover => 1, 2022 can_hover => 1,
1802 align => 0, 2023 align => 0,
1803 valign => 0, 2024 valign => 0,
1804 can_events => 1, 2025 can_events => 1,
1805 @_ 2026 @_
1806 ) 2027 )
1807} 2028}
1808 2029
1809sub activate { }
1810
1811sub button_up { 2030sub invoke_button_up {
1812 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1813 2032
1814 $self->emit ("activate") 2033 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1817} 2038}
1818 2039
1819sub _draw { 2040sub _draw {
1820 my ($self) = @_; 2041 my ($self) = @_;
1821 2042
1822 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 2044
1828 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1831 2048
… …
1850 2067
1851sub new { 2068sub new {
1852 my $class = shift; 2069 my $class = shift;
1853 2070
1854 $class->SUPER::new ( 2071 $class->SUPER::new (
1855 padding => 2, 2072 padding_x => 2,
2073 padding_y => 2,
1856 fg => [1, 1, 1], 2074 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 2075 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 2076 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 2077 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 2078 state => 0,
… …
1864} 2082}
1865 2083
1866sub size_request { 2084sub size_request {
1867 my ($self) = @_; 2085 my ($self) = @_;
1868 2086
1869 ($self->{padding} * 2 + 6) x 2 2087 (6) x 2
1870} 2088}
1871 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1872sub button_down { 2098sub invoke_button_down {
1873 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1874 2100
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 2103 $self->toggle;
1878 $self->_emit (changed => $self->{state}); 2104 } else {
2105 return 0
2106 }
2107
1879 } 2108 1
1880} 2109}
1881 2110
1882sub _draw { 2111sub _draw {
1883 my ($self) = @_; 2112 my ($self) = @_;
1884 2113
1885 $self->SUPER::_draw; 2114 $self->SUPER::_draw;
1886 2115
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2117
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2118 my ($w, $h) = @$self{qw(w h)};
2119
2120 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2121
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2122 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2123
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2124 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2125
… …
1902package CFClient::UI::Image; 2133package CFClient::UI::Image;
1903 2134
1904our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
1905 2136
1906use CFClient::OpenGL; 2137use CFClient::OpenGL;
1907use Carp qw/confess/;
1908 2138
1909our %loaded_images; 2139our %texture_cache;
1910 2140
1911sub new { 2141sub new {
1912 my $class = shift; 2142 my $class = shift;
1913 2143
1914 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
1915 2148
1916 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
1917 2151
1918 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1919 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1920 2154
1921 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
1922 2156
1923 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1924
1925 $self->{aspect} = $tex->{w} / $tex->{h};
1926 2158
1927 $self 2159 $self
1928} 2160}
1929 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
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
… …
1948 } 2195 }
1949 2196
1950 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2199
1953 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
1954 2201
1955 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
1956} 2239}
1957 2240
1958############################################################################# 2241#############################################################################
1959 2242
1960package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2047 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2048 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2049 2332
2050 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2052 2338
2053 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2344
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2345 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2346 glBegin GL_QUADS;
… …
2074 2361
2075 if ($t3) { 2362 if ($t3) {
2076 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2077 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2078 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2079 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2080 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2081 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2082 glEnd; 2369 glEnd;
2083 } 2370 }
2084 2371
2085 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2159 fg => [1, 1, 1], 2446 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2447 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2448 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2449 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2450 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2451 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2452 min_h => $::WIDTH / 80,
2166 vertical => 0, 2453 vertical => 0,
2167 can_hover => 1, 2454 can_hover => 1,
2168 inner_pad => 0.02, 2455 inner_pad => 0.02,
2169 @_ 2456 @_
2170 ); 2457 );
… …
2173 $self->update; 2460 $self->update;
2174 2461
2175 $self 2462 $self
2176} 2463}
2177 2464
2178sub changed { }
2179
2180sub set_range { 2465sub set_range {
2181 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2182 2467
2183 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2184 2469
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2187} 2474}
2188 2475
2189sub set_value { 2476sub set_value {
2190 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2191 2478
… …
2202 if $unit; 2489 if $unit;
2203 2490
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205 2492
2206 if ($value != $old_value) { 2493 if ($value != $old_value) {
2207 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2208 $self->update; 2495 $self->update;
2209 } 2496 }
2210} 2497}
2211 2498
2212sub size_request { 2499sub size_request {
2213 my ($self) = @_; 2500 my ($self) = @_;
2214 2501
2215 my $w = $self->{req_w}; 2502 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2503}
2220 2504
2221sub button_down { 2505sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2223 2507
2224 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2225 2509
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2511
2228 $self->mouse_motion ($ev, $x, $y); 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2229} 2513}
2230 2514
2231sub mouse_motion { 2515sub invoke_mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2233 2517
2234 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236 2520
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2521 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2522
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2523 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2524
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2525 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2526 } else {
2527 return 0;
2528 }
2529
2242 } 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2243} 2541}
2244 2542
2245sub update { 2543sub update {
2246 my ($self) = @_; 2544 my ($self) = @_;
2247 2545
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2546 delete $self->{knob_w};
2547 $self->SUPER::update;
2548}
2549
2550sub _draw {
2551 my ($self) = @_;
2552
2553 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2554 $self->set_value ($self->{range}[0]);
2250 2555
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2556 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2557 my $range = ($hi - $page - $lo) || 1e-100;
2253 2558
… …
2259 $value = ($value - $lo) / $range; 2564 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2565 $value = $value * $self->{scale} + $self->{offset};
2261 2566
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2567 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2568 $self->{knob_w} = $knob_w;
2264 }); 2569 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2570
2272 $self->SUPER::_draw (); 2571 $self->SUPER::_draw ();
2273 2572
2274 glScale $self->{w}, $self->{h}; 2573 glScale $self->{w}, $self->{h};
2275 2574
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2338 2637
2339############################################################################# 2638#############################################################################
2340 2639
2341package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2342 2641
2343our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2344 2643
2345use CFClient::OpenGL; 2644use CFClient::OpenGL;
2346 2645
2347sub new { 2646sub new {
2348 my $class = shift; 2647 my $class = shift;
2349 2648
2350 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2351 fontsize => 1, 2650 fontsize => 1,
2352 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2353 #font => default_font 2653 #font => default_font
2354 @_, 2654 @_,
2355 2655
2356 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2357 par => [], 2657 par => [],
2358 height => 0, 2658 height => 0,
2359 children => [ 2659 children => [
2360 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2361 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2372 2672
2373 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2674 $self->reflow;
2375} 2675}
2376 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2377sub size_allocate { 2686sub invoke_size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2687 my ($self, $w, $h) = @_;
2379 2688
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2381 2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2382 return unless $changed;
2383 2691
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2696
2388 $self->reflow; 2697 $self->reflow;
2389}
2390 2698
2391sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2392 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2393 2715
2394 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2395 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2399 2729 );
2730
2400 $layout->size 2731 $layout
2401} 2732}
2402 2733
2403sub reflow { 2734sub reflow {
2404 my ($self) = @_; 2735 my ($self) = @_;
2405 2736
… …
2414 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2415} 2746}
2416 2747
2417sub clear { 2748sub clear {
2418 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2419 2753
2420 $self->{par} = []; 2754 $self->{par} = [];
2421 $self->{height} = 0; 2755 $self->{height} = 0;
2422 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2423} 2757}
2424 2758
2425sub add_paragraph { 2759sub add_paragraph {
2426 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2427 2761
2428 for my $line (split /\n/, $text) { 2762 my ($text, @w) = ref $para ? @$para : $para;
2429 my ($w, $h) = $self->text_size ($line); 2763
2430 $self->{height} += $h; 2764 $para = {
2431 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 w => 1e10,
2766 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2432 } 2771 };
2433 2772
2434 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@w) if @w;
2774 push @{$self->{par}}, $para;
2775
2776 $self->{need_reflow}++;
2777 $self->update;
2778}
2779
2780sub scroll_to_bottom {
2781 my ($self) = @_;
2782
2783 $self->{scroll_to_bottom} = 1;
2784 $self->update;
2435} 2785}
2436 2786
2437sub update { 2787sub update {
2438 my ($self) = @_; 2788 my ($self) = @_;
2439 2789
… …
2441 2791
2442 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2443 2793
2444 delete $self->{texture}; 2794 delete $self->{texture};
2445 2795
2446 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448 2798
2449 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2450 my $height = 0; 2800 my $height = 0;
2451 2801
2452 my $layout = $self->{layout};
2453
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455
2456 for (@{$self->{par}}) { 2802 for my $para (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2458 $layout->set_width ($W - $_->[3]); 2804 my $layout = $self->get_layout ($para);
2459 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2805 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2806
2462 $_->[1] = $h; 2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2463 } 2810 }
2464 2811
2465 $height += $_->[1]; 2812 $height += $para->{h};
2466 } 2813 }
2467 2814
2468 $self->{height} = $height; 2815 $self->{height} = $height;
2469 2816
2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2471 2818
2472 delete $self->{texture}; 2819 delete $self->{texture};
2473 } 2820 }
2474 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2478 2829
2479 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2480 2831
2481 my $y0 = $top; 2832 my $y0 = $top;
2482 my $y1 = $top + $H; 2833 my $y1 = $top + $H;
2483 2834
2484 my $y = 0; 2835 my $y = 0;
2485 2836
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}}) { 2837 for my $para (@{$self->{par}}) {
2495 my $h = $par->[1]; 2838 my $h = $para->{h};
2496 2839
2497 if ($y0 < $y + $h && $y < $y1) { 2840 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 2841
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2503 2843
2504 glRasterPos $par->[3], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2505 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2845
2846 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes;
2848
2849 for (@w) {
2850 my ($dx, $dy) = splice @s, 0, 2, ();
2851
2852 $_->{x} = $dx + $para->{indent};
2853 $_->{y} = $dy + $y - $y0;
2854
2855 $_->draw;
2856 }
2857 }
2506 } 2858 }
2507 2859
2508 $y += $h; 2860 $y += $h;
2509 } 2861 }
2510
2511 glDisable GL_BLEND;
2512 }; 2862 };
2513 }); 2863 });
2514} 2864}
2515 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2516sub _draw { 2875sub _draw {
2517 my ($self) = @_; 2876 my ($self) = @_;
2518 2877
2519 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2881 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2524 2883
2525 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2526
2527} 2885}
2528 2886
2529############################################################################# 2887#############################################################################
2530 2888
2531package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2610} 2968}
2611 2969
2612sub set_tooltip_from { 2970sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2971 my ($self, $widget) = @_;
2614 2972
2973 my $tooltip = $widget->{tooltip};
2974
2975 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n"
2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2978 . "req $widget->{req_w} $widget->{req_h}\n"
2979 . "visible $widget->{visible}";
2980 }
2981
2982 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//;
2984
2615 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2986 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2988 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2989 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2990 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2991 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2629 2999
2630 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2631} 3001}
2632 3002
2633sub size_allocate { 3003sub invoke_size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 3004 my ($self, $w, $h) = @_;
2635 3005
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3006 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2639} 3007}
2640 3008
2641sub visibility_change { 3009sub invoke_visibility_change {
2642 my ($self, $visible) = @_; 3010 my ($self, $visible) = @_;
2643 3011
2644 return unless $visible; 3012 return unless $visible;
2645 3013
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner}; 3015 my $widget = $self->{owner}
3016 or return;
2648 3017
3018 if ($widget->{visible}) {
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 3020
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 3022 if $x + $self->{w} > $self->{root}{w};
2653 3023
2654 $self->move ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2655 }); 3028 });
2656} 3029}
2657 3030
2658sub _draw { 3031sub _draw {
2659 my ($self) = @_; 3032 my ($self) = @_;
… …
2685 3058
2686############################################################################# 3059#############################################################################
2687 3060
2688package CFClient::UI::Face; 3061package CFClient::UI::Face;
2689 3062
2690our @ISA = CFClient::UI::Base::; 3063our @ISA = CFClient::UI::DrawBG::;
2691 3064
2692use CFClient::OpenGL; 3065use CFClient::OpenGL;
2693 3066
2694sub new { 3067sub new {
2695 my $class = shift; 3068 my $class = shift;
… …
2732sub _draw { 3105sub _draw {
2733 my ($self) = @_; 3106 my ($self) = @_;
2734 3107
2735 return unless $::CONN; 3108 return unless $::CONN;
2736 3109
3110 $self->SUPER::_draw;
3111
2737 my $face; 3112 my $face;
2738 3113
2739 if ($self->{frame}) { 3114 if ($self->{frame}) {
2740 my $anim = $::CONN->{anim}[$self->{anim}]; 3115 my $anim = $::CONN->{anim}[$self->{anim}];
2741 3116
… …
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747 3122
2748 if ($tex) { 3123 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 3124 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 3126 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 3128 glDisable GL_TEXTURE_2D;
2754 } 3129 }
2755} 3130}
2756 3131
2757sub DESTROY { 3132sub destroy {
2758 my ($self) = @_; 3133 my ($self) = @_;
2759 3134
2760 $self->{timer}->cancel 3135 $self->{timer}->cancel
2761 if $self->{timer}; 3136 if $self->{timer};
2762 3137
2763 $self->SUPER::DESTROY; 3138 $self->SUPER::destroy;
2764} 3139}
2765 3140
2766############################################################################# 3141#############################################################################
2767 3142
2768package CFClient::UI::Inventory; 3143package CFClient::UI::Buttonbar;
2769 3144
2770our @ISA = CFClient::UI::ScrolledWindow::; 3145our @ISA = CFClient::UI::HBox::;
2771 3146
2772sub new { 3147# TODO: should actualyl wrap buttons and other goodies.
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807 3148
2808############################################################################# 3149#############################################################################
2809 3150
2810package CFClient::UI::Menu; 3151package CFClient::UI::Menu;
2811 3152
… …
2823 ); 3164 );
2824 3165
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3166 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2826 3167
2827 for my $item (@{ $self->{items} }) { 3168 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 3169 my ($widget, $cb, $tooltip) = @$item;
2829 3170
2830 # handle various types of items, only text for now 3171 # handle various types of items, only text for now
2831 if (!ref $widget) { 3172 if (!ref $widget) {
3173 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2;
3175
3176 $widget = new CFClient::UI::HBox
3177 can_hover => 1,
3178 can_events => 1,
3179 tooltip => $tooltip,
3180 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1),
3183 ],
3184 ;
3185
3186 } else {
2832 $widget = new CFClient::UI::Label 3187 $widget = new CFClient::UI::Label
2833 can_hover => 1, 3188 can_hover => 1,
2834 can_events => 1, 3189 can_events => 1,
2835 text => $widget; 3190 markup => $widget,
3191 tooltip => $tooltip;
3192 }
2836 } 3193 }
2837 3194
2838 $self->{item}{$widget} = $item; 3195 $self->{item}{$widget} = $item;
2839 3196
2840 $self->{vbox}->add ($widget); 3197 $self->{vbox}->add ($widget);
… …
2845 3202
2846# popup given the event (must be a mouse button down event currently) 3203# popup given the event (must be a mouse button down event currently)
2847sub popup { 3204sub popup {
2848 my ($self, $ev) = @_; 3205 my ($self, $ev) = @_;
2849 3206
2850 $self->_emit ("popdown"); 3207 $self->emit ("popdown");
2851 3208
2852 # maybe save $GRAB? must be careful about events... 3209 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 3210 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 3211 $self->{button} = $ev->{button};
2855 3212
2856 $self->show; 3213 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3214 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 3215}
2859 3216
2860sub mouse_motion { 3217sub invoke_mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 3218 my ($self, $ev, $x, $y) = @_;
2862 3219
2863 # TODO: should use vbox->find_widget or so 3220 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3221 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 3222 $self->{hover} = $self->{item}{$HOVER};
2866}
2867 3223
3224 0
3225}
3226
2868sub button_up { 3227sub invoke_button_up {
2869 my ($self, $ev, $x, $y) = @_; 3228 my ($self, $ev, $x, $y) = @_;
2870 3229
2871 if ($ev->{button} == $self->{button}) { 3230 if ($ev->{button} == $self->{button}) {
2872 undef $GRAB; 3231 undef $GRAB;
2873 $self->hide; 3232 $self->hide;
2874 3233
2875 $self->_emit ("popdown"); 3234 $self->emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 3235 $self->{hover}[1]->() if $self->{hover};
3236 } else {
3237 return 0
3238 }
3239
2877 } 3240 1
2878} 3241}
2879 3242
2880############################################################################# 3243#############################################################################
2881 3244
2882package CFClient::UI::Statusbox; 3245package CFClient::UI::Multiplexer;
2883 3246
2884our @ISA = CFClient::UI::VBox::; 3247our @ISA = CFClient::UI::Container::;
2885 3248
2886sub new { 3249sub new {
2887 my $class = shift; 3250 my $class = shift;
2888 3251
2889 $class->SUPER::new ( 3252 my $self = $class->SUPER::new (
3253 @_,
3254 );
3255
3256 $self->{current} = $self->{children}[0]
3257 if @{ $self->{children} };
3258
3259 $self
3260}
3261
3262sub add {
3263 my ($self, @widgets) = @_;
3264
3265 $self->SUPER::add (@widgets);
3266
3267 $self->{current} = $self->{children}[0]
3268 if @{ $self->{children} };
3269}
3270
3271sub get_current_page {
3272 my ($self) = @_;
3273
3274 $self->{current}
3275}
3276
3277sub set_current_page {
3278 my ($self, $page_or_widget) = @_;
3279
3280 my $widget = ref $page_or_widget
3281 ? $page_or_widget
3282 : $self->{children}[$page_or_widget];
3283
3284 $self->{current} = $widget;
3285 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3286
3287 $self->emit (page_changed => $self->{current});
3288
3289 $self->realloc;
3290}
3291
3292sub visible_children {
3293 $_[0]{current}
3294}
3295
3296sub size_request {
3297 my ($self) = @_;
3298
3299 $self->{current}->size_request
3300}
3301
3302sub invoke_size_allocate {
3303 my ($self, $w, $h) = @_;
3304
3305 $self->{current}->configure (0, 0, $w, $h);
3306
3307 1
3308}
3309
3310sub _draw {
3311 my ($self) = @_;
3312
3313 $self->{current}->draw;
3314}
3315
3316#############################################################################
3317
3318package CFClient::UI::Notebook;
3319
3320our @ISA = CFClient::UI::VBox::;
3321
3322sub new {
3323 my $class = shift;
3324
3325 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3328 # filter => # will be put between multiplexer and $self
3329 @_,
3330 );
3331
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3333 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3334
3335 $self
3336}
3337
3338sub add {
3339 my ($self, $title, $widget, $tooltip) = @_;
3340
3341 Scalar::Util::weaken $self;
3342
3343 $self->{buttonbar}->add (new CFClient::UI::Button
3344 markup => $title,
3345 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) },
3347 );
3348
3349 $self->{multiplexer}->add ($widget);
3350}
3351
3352sub get_current_page {
3353 my ($self) = @_;
3354
3355 $self->{multiplexer}->get_current_page
3356}
3357
3358sub set_current_page {
3359 my ($self, $page) = @_;
3360
3361 $self->{multiplexer}->set_current_page ($page);
3362 $self->emit (page_changed => $self->{multiplexer}{current});
3363}
3364
3365#############################################################################
3366
3367package CFClient::UI::Selector;
3368
3369use utf8;
3370
3371our @ISA = CFClient::UI::Button::;
3372
3373sub new {
3374 my $class = shift;
3375
3376 my $self = $class->SUPER::new (
3377 options => [], # [value, title, longdesc], ...
3378 value => undef,
3379 @_,
3380 );
3381
3382 $self->_set_value ($self->{value});
3383
3384 $self
3385}
3386
3387sub invoke_button_down {
3388 my ($self, $ev) = @_;
3389
3390 my @menu_items;
3391
3392 for (@{ $self->{options} }) {
3393 my ($value, $title, $tooltip) = @$_;
3394
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 }
3397
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399}
3400
3401sub _set_value {
3402 my ($self, $value) = @_;
3403
3404 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3405 or return;
3406
3407 $self->{value} = $item->[0];
3408 $self->set_markup ("$item->[1] ⇓");
3409 $self->set_tooltip ($item->[2]);
3410}
3411
3412sub set_value {
3413 my ($self, $value) = @_;
3414
3415 return unless $self->{value} ne $value;
3416
3417 $self->_set_value ($value);
3418 $self->emit (changed => $value);
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::Statusbox;
3424
3425our @ISA = CFClient::UI::VBox::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3431 fontsize => 0.8,
2891 @_, 3432 @_,
2892 ) 3433 );
3434
3435 Scalar::Util::weaken (my $this = $self);
3436
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438
3439 $self
2893} 3440}
2894 3441
2895sub reorder { 3442sub reorder {
2896 my ($self) = @_; 3443 my ($self) = @_;
2897 my $NOW = time; 3444 my $NOW = Time::HiRes::time;
3445
3446 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} };
2898 3450
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3451 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3452 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3453 }
2902 3454
… …
2905 my @items = sort { 3457 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3458 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3459 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3460 } values %{ $self->{item} };
2909 3461
3462 $self->{timer}->interval (1);
3463
2910 my $count = 10 + 1; 3464 my $count = 10 + 1;
2911 for my $item (@items) { 3465 for my $item (@items) {
2912 last unless --$count; 3466 last unless --$count;
2913 3467
2914 push @widgets, $item->{label} ||= do { 3468 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3469 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3470 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3471 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3472 : $item->{text};
2919 3473
… …
2927 tooltip => $item->{tooltip}, 3481 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3482 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3483 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3484 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3485 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3486 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3487 can_events => 1,
2934 can_hover => 1 3488 can_hover => 1
2935 }; 3489 };
3490
3491 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3492 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3493 $label->update;
3494 $label->set_max_size (undef, $label->{req_h} * $diff)
3495 if $diff < 1;
3496 $self->{timer}->interval (1/30);
3497 } else {
3498 $label->{fg}[3] = $item->{fg}[3] || 1;
3499 }
3500
3501 push @widgets, $label;
2936 } 3502 }
2937 3503
2938 $self->clear; 3504 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3505 $self->SUPER::add (reverse @widgets);
2940} 3506}
… …
2945 $text =~ s/^\s+//; 3511 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3512 $text =~ s/\s+$//;
2947 3513
2948 return unless $text; 3514 return unless $text;
2949 3515
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3516 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3517
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3518 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3519
2954 if (my $item = $self->{item}{$group}) { 3520 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3521 if ($item->{text} eq $text) {
2956 $item->{count}++; 3522 $item->{count}++;
2957 } else { 3523 } else {
2958 $item->{count} = 1; 3524 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text; 3525 $item->{text} = $item->{tooltip} = $text;
2960 } 3526 }
2961 $item->{id} = ++$self->{id}; 3527 $item->{id} += 0.2;#d#
2962 $item->{timeout} = $timeout; 3528 $item->{timeout} = $timeout;
2963 delete $item->{label}; 3529 delete $item->{label};
2964 } else { 3530 } else {
2965 $self->{item}{$group} = { 3531 $self->{item}{$group} = {
2966 id => ++$self->{id}, 3532 id => ++$self->{id},
… …
2972 count => 1, 3538 count => 1,
2973 %arg, 3539 %arg,
2974 }; 3540 };
2975 } 3541 }
2976 3542
3543 $ROOT->on_refresh (reorder => sub {
2977 $self->reorder; 3544 $self->reorder;
3545 });
2978} 3546}
2979 3547
2980sub reconfigure { 3548sub reconfigure {
2981 my ($self) = @_; 3549 my ($self) = @_;
2982 3550
… …
2985 3553
2986 $self->reorder; 3554 $self->reorder;
2987 $self->SUPER::reconfigure; 3555 $self->SUPER::reconfigure;
2988} 3556}
2989 3557
3558sub destroy {
3559 my ($self) = @_;
3560
3561 $self->{timer}->cancel;
3562
3563 $self->SUPER::destroy;
3564}
3565
2990############################################################################# 3566#############################################################################
2991 3567
3568package CFClient::UI::Inventory;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 col_expand => [0, 1, 0],
3577 items => [],
3578 @_,
3579 );
3580
3581 $self->set_sort_order (undef);
3582
3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3619}
3620
3621sub set_items {
3622 my ($self, $items) = @_;
3623
3624 $self->{items} = [$items ? values %$items : ()];
3625 $self->update_items;
3626}
3627
3628#############################################################################
3629
3630package CFClient::UI::SpellList;
3631
3632our @ISA = CFClient::UI::Table::;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 binding => [],
3639 commands => [],
3640 @_,
3641 )
3642}
3643
3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3729sub add_spell {
3730 my ($self, $spell) = @_;
3731
3732 $self->{spell}->{$spell->{name}} = $spell;
3733 $self->rebuild_spell_list;
3734}
3735
3736sub remove_spell {
3737 my ($self, $spell) = @_;
3738
3739 delete $self->{spell}->{$spell->{name}};
3740 $self->rebuild_spell_list;
3741}
3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3750#############################################################################
3751
2992package CFClient::UI::Root; 3752package CFClient::UI::Root;
2993 3753
2994our @ISA = CFClient::UI::Container::; 3754our @ISA = CFClient::UI::Container::;
3755
3756use List::Util qw(min max);
2995 3757
2996use CFClient::OpenGL; 3758use CFClient::OpenGL;
2997 3759
2998sub new { 3760sub new {
2999 my $class = shift; 3761 my $class = shift;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3768 Scalar::Util::weaken ($self->{root} = $self);
3007 3769
3008 $self 3770 $self
3009} 3771}
3010 3772
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3773sub size_request {
3028 my ($self) = @_; 3774 my ($self) = @_;
3029 3775
3030 ($self->{w}, $self->{h}) 3776 ($self->{w}, $self->{h})
3031} 3777}
3032 3778
3779sub _to_pixel {
3780 my ($coord, $size, $max) = @_;
3781
3782 $coord =
3783 $coord eq "center" ? ($max - $size) * 0.5
3784 : $coord eq "max" ? $max
3785 : $coord;
3786
3787 $coord = 0 if $coord < 0;
3788 $coord = $max - $size if $coord > $max - $size;
3789
3790 int $coord + 0.5
3791}
3792
3033sub size_allocate { 3793sub invoke_size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3794 my ($self, $w, $h) = @_;
3035 3795
3036 for my $child ($self->children) { 3796 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3797 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3798
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3799 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3800 $Y = $child->{force_y} if exists $child->{force_y};
3041 3801
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3802 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3803 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3804
3050 $child->configure ($X, $Y, $W, $H); 3805 $child->configure ($X, $Y, $W, $H);
3051 } 3806 }
3807
3808 1
3052} 3809}
3053 3810
3054sub coord2local { 3811sub coord2local {
3055 my ($self, $x, $y) = @_; 3812 my ($self, $x, $y) = @_;
3056 3813
… …
3070} 3827}
3071 3828
3072sub add { 3829sub add {
3073 my ($self, @children) = @_; 3830 my ($self, @children) = @_;
3074 3831
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3832 $_->{is_toplevel} = 1
3077 3833 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3834
3083 $self->SUPER::add (@children); 3835 $self->SUPER::add (@children);
3084} 3836}
3085 3837
3086sub remove { 3838sub remove {
3087 my ($self, @children) = @_; 3839 my ($self, @children) = @_;
3088 3840
3089 $self->SUPER::remove (@children); 3841 $self->SUPER::remove (@children);
3842
3843 delete $self->{is_toplevel}
3844 for @children;
3090 3845
3091 while (@children) { 3846 while (@children) {
3092 my $w = pop @children; 3847 my $w = pop @children;
3093 push @children, $w->children; 3848 push @children, $w->children;
3094 $w->set_invisible; 3849 $w->set_invisible;
… …
3114 $_->() 3869 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3870 for values %{delete $self->{refresh_hook}};
3116 } 3871 }
3117 3872
3118 if ($self->{realloc}) { 3873 if ($self->{realloc}) {
3874 my %queue;
3119 my @queue; 3875 my @queue;
3876 my $widget;
3120 3877
3878 outer:
3121 while () { 3879 while () {
3122 if ($self->{realloc}) { 3880 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3881 for $widget (values %$realloc) {
3882 $widget->{visible} or next; # do not resize invisible widgets
3124 3883
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3884 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3885
3886 push @{ $queue[$widget->{visible}] }, $widget;
3887 }
3127 } 3888 }
3128 3889
3890 while () {
3891 @queue or last outer;
3892
3893 $widget = pop @{ $queue[-1] || [] }
3894 and last;
3895
3896 pop @queue;
3897 }
3898
3899 delete $queue{$widget+0};
3900
3901 my ($w, $h) = $widget->size_request;
3902
3903 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3904 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3905
3906 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3907 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3908
3909 $w = $widget->{force_w} if exists $widget->{force_w};
3910 $h = $widget->{force_h} if exists $widget->{force_h};
3911
3912 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3913 || delete $widget->{force_realloc}) {
3914 $widget->{req_w} = $w;
3915 $widget->{req_h} = $h;
3916
3917 $self->{size_alloc}{$widget+0} = $widget;
3918
3919 if (my $parent = $widget->{parent}) {
3920 $self->{realloc}{$parent+0} = $parent
3921 unless $queue{$parent+0};
3922
3923 $parent->{force_size_alloc} = 1;
3924 $self->{size_alloc}{$parent+0} = $parent;
3925 }
3926 }
3927
3928 delete $self->{realloc}{$widget+0};
3929 }
3930 }
3931
3932 while (my $size_alloc = delete $self->{size_alloc}) {
3933 my @queue = sort { $b->{visible} <=> $a->{visible} }
3934 values %$size_alloc;
3935
3936 while () {
3129 my $widget = pop @queue || last; 3937 my $widget = pop @queue || last;
3130 3938
3131 $widget->{visible} or last; # do not resize invisible widgets 3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3940
3156 $w = 0 if $w < 0; 3941 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3942 $h = 0 if $h < 0;
3158 3943
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3944 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h;
3160 3946
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3952
3953 $w = int $w + 0.5;
3954 $h = int $h + 0.5;
3955
3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3957 $widget->{old_w} = $widget->{w};
3958 $widget->{old_h} = $widget->{h};
3959
3161 $widget->{w} = $w; 3960 $widget->{w} = $w;
3162 $widget->{h} = $h; 3961 $widget->{h} = $h;
3163 3962
3164 $widget->emit (size_allocate => $w, $h, $changed); 3963 $widget->emit (size_allocate => $w, $h);
3964 }
3165 } 3965 }
3166 } 3966 }
3167 3967
3168 while ($self->{post_alloc_hook}) { 3968 while ($self->{post_alloc_hook}) {
3169 $_->() 3969 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3970 for values %{delete $self->{post_alloc_hook}};
3171 } 3971 }
3972
3172 3973
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3974 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3976 glClear GL_COLOR_BUFFER_BIT;
3176 3977
… …
3178 glLoadIdentity; 3979 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3981 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3982 glLoadIdentity;
3182 3983
3984 {
3985 package CFClient::UI::Base;
3986
3987 ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h});
3989 }
3990
3183 $self->_draw; 3991 $self->_draw;
3184} 3992}
3185 3993
3186############################################################################# 3994#############################################################################
3187 3995

Diff Legend

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