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

Diff Legend

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