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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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