ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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