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.146 by elmex, Fri Apr 21 15:03:46 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
14 71
15# class methods for events 72# class methods for events
16sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
18} 76}
19 77
20sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
22} 81}
23 82
24sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
25 my ($ev) = @_; 84 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 88 my $widget = $ROOT->find_widget ($x, $y);
30 89
31 $GRAB = $widget; 90 $GRAB = $widget;
32 $GRAB->update if $GRAB; 91 $GRAB->update if $GRAB;
92
93 check_tooltip;
33 } 94 }
34 95
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 97
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
38} 100}
39 101
40sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
41 my ($ev) = @_; 103 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
43 105
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 107
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 109
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
49 112
50 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 115 $grab->update if $grab;
53 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
117
118 check_tooltip;
54 } 119 }
55} 120}
56 121
57sub feed_sdl_motion_event { 122sub feed_sdl_motion_event {
58 my ($ev) = @_; 123 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 128 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 129 my $hover = $HOVER; $HOVER = $widget;
65 130
66 $hover->update if $hover && $hover->{can_hover}; 131 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 133
134 check_tooltip;
135 }
136
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
71} 139}
72 140
73# convert position array to integers 141# convert position array to integers
74sub harmonize { 142sub harmonize {
75 my ($vals) = @_; 143 my ($vals) = @_;
… …
81 $rem += $_ - $i; 149 $rem += $_ - $i;
82 $_ = $i; 150 $_ = $i;
83 } 151 }
84} 152}
85 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
86############################################################################# 195#############################################################################
87 196
88package CFClient::UI::Base; 197package CFClient::UI::Base;
89 198
90use strict; 199use strict;
… …
93 202
94sub new { 203sub new {
95 my $class = shift; 204 my $class = shift;
96 205
97 my $self = bless { 206 my $self = bless {
98 x => 0, 207 x => "center",
99 y => 0, 208 y => "center",
100 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
212 can_events => 1,
101 @_ 213 @_
102 }, $class; 214 }, $class;
103 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
104 for (keys %$self) { 218 for (keys %$self) {
105 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
107 } 221 }
108 } 222 }
109 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
110 $self 236 $self
111} 237}
112 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
113sub show { 246sub show {
114 my ($self) = @_; 247 my ($self) = @_;
115 248
116 return if $self->{parent}; 249 return if $self->{parent};
117 250
118 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
119} 252}
120 253
254sub set_visible {
255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
278
279 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self;
281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
121sub hide { 307sub hide {
122 my ($self) = @_; 308 my ($self) = @_;
123 309
124 return unless $self->{parent}; 310 $self->set_invisible;
125 311
126 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
127} 314}
128 315
129sub move { 316sub move_abs {
130 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
131 318
132 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
135 322
136 $self->update; 323 $self->update;
137} 324}
138 325
139sub needs_redraw { 326sub set_size {
140 0 327 my ($self, $w, $h) = @_;
328
329 $self->{force_w} = $w;
330 $self->{force_h} = $h;
331
332 $self->realloc;
141} 333}
142 334
143sub size_request { 335sub size_request {
144 require Carp; 336 require Carp;
145 Carp::confess "size_request is abtract"; 337 Carp::confess "size_request is abstract";
146} 338}
147 339
148sub configure { 340sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
150 342
151 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
154 348
155 # use alignment to adjust x, y 349 # use alignment to adjust x, y
156 350
157 $x += ($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
158 $y += ($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
159
160 ($w, $h) = ($w2, $h2);
161 } 353 }
162 354
163 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
164 $self->{x} = $x; 356 $self->{x} = $x;
165 $self->{y} = $y; 357 $self->{y} = $y;
166 $self->update; 358 $self->update;
167 } 359 }
168 360
169 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
170 $self->{w} = $w; 364 $self->{alloc_w} = $w;
171 $self->{h} = $h; 365 $self->{alloc_h} = $h;
172 366
173 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
174 $self->update;
175 } 368 }
176} 369}
177 370
178sub size_allocate { 371sub size_allocate {
179 # nothing to be done 372 # nothing to be done
180} 373}
181 374
182# return top left coordinates 375sub children {
183sub _topleft { 376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
383sub set_max_size {
184 my ($self, $x, $y) = @_; 384 my ($self, $w, $h) = @_;
185 385
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388}
389
390sub set_tooltip {
391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
187} 404}
188 405
189# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
190sub coord2local { 407sub coord2local {
191 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
192 409
193 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 411}
196 412
197# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
198sub coord2global { 414sub coord2global {
199 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
200 416
201 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 418}
204 419
205sub focus_in { 420sub focus_in {
206 my ($self) = @_; 421 my ($self) = @_;
207 422
208 return if $FOCUS == $self; 423 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
210 425
211 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
212 427
213 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
214 429
215 $focus->update if $focus; 430 $focus->update if $focus;
216 $FOCUS->update; 431 $FOCUS->update;
217} 432}
218 433
… …
221 436
222 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
223 438
224 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
225 440
226 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
227 442
228 $focus->update if $focus; #? 443 $focus->update if $focus; #?
229}
230 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
231sub mouse_motion { } 449sub mouse_motion { 0 }
232sub button_up { } 450sub button_up { 0 }
233sub key_down { } 451sub key_down { 0 }
234sub key_up { } 452sub key_up { 0 }
235 453
236sub button_down { 454sub button_down {
237 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
238 456
239 $self->focus_in; 457 $self->focus_in;
240}
241 458
242sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
243sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
244sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
245sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
246sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
247
248sub draw {
249 my ($self) = @_;
250
251 return unless $self->{h} && $self->{w};
252
253 glPushMatrix;
254 glTranslate $self->{x}, $self->{y}, 0;
255 $self->_draw;
256 glPopMatrix;
257
258 if ($self == $HOVER && $self->{can_hover}) {
259 my ($x, $y) = @$self{qw(x y)};
260
261 glColor 1, 0.8, 0.5, 0.2;
262 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS;
265 glVertex $x , $y;
266 glVertex $x + $self->{w}, $y;
267 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h};
269 glEnd;
270 glDisable GL_BLEND;
271 } 459 0
272}
273
274sub _draw {
275 my ($self) = @_;
276
277 warn "no draw defined for $self\n";
278} 460}
279 461
280sub find_widget { 462sub find_widget {
281 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
282 466
283 return $self 467 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 470
… …
289 473
290sub set_parent { 474sub set_parent {
291 my ($self, $parent) = @_; 475 my ($self, $parent) = @_;
292 476
293 Scalar::Util::weaken ($self->{parent} = $parent); 477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
294} 479}
295 480
296sub check_size { 481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
297 my ($self) = @_; 501 #my ($self, $visible) = @_;
502}
298 503
299 my ($w, $h) = $self->size_request; 504sub realloc {
505 my ($self) = @_;
300 506
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
302 $self->{req_w} = $w; 513 delete $self->{req_w};
303 $self->{req_h} = $h; 514 delete $self->{req_h};
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 } 515 }
308} 516}
309 517
310sub update { 518sub update {
311 my ($self) = @_; 519 my ($self) = @_;
312 520
313 $self->{parent}->update 521 $self->{parent}->update
314 if $self->{parent}; 522 if $self->{parent};
315} 523}
316 524
317sub connect { 525sub reconfigure {
318 my ($self, $signal, $cb) = @_; 526 my ($self) = @_;
319 527
320 push @{ $self->{signal_cb}{$signal} }, $cb; 528 $self->realloc;
529 $self->update;
321} 530}
322 531
323sub emit { 532# using global variables seems a bit hacky, but passing through all drawing
324 my ($self, $signal, @args) = @_; 533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
325 535
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 536sub draw {
327 $cb->($self, @args); 537 my ($self) = @_;
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
328 } 565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584
585sub _draw {
586 my ($self) = @_;
587
588 warn "no draw defined for $self\n";
329} 589}
330 590
331sub DESTROY { 591sub DESTROY {
332 my ($self) = @_; 592 my ($self) = @_;
333 593
594 delete $WIDGET{$self+0};
334 #$self->deactivate; 595 #$self->deactivate;
335} 596}
336 597
337############################################################################# 598#############################################################################
338 599
… …
347 my $class = shift; 608 my $class = shift;
348 609
349 # range [value, low, high, page] 610 # range [value, low, high, page]
350 611
351 $class->SUPER::new ( 612 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
354 @_ 615 @_
355 ) 616 )
356} 617}
357 618
358sub _draw { 619sub _draw {
359 my ($self) = @_; 620 my ($self) = @_;
360 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
362 628
363 glEnable GL_BLEND; 629 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
366 632
367 glBegin GL_QUADS; 633 glBegin GL_QUADS;
368 glVertex 0 , 0; 634 glVertex 0 , 0;
369 glVertex 0 , $h; 635 glVertex 0 , $h;
370 glVertex $w, $h; 636 glVertex $w, $h;
371 glVertex $w, 0; 637 glVertex $w, 0;
372 glEnd; 638 glEnd;
373 639
374 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
375} 642}
376 643
377############################################################################# 644#############################################################################
378 645
379package CFClient::UI::Empty; 646package CFClient::UI::Empty;
380
381our @ISA = CFClient::UI::Base::;
382
383sub size_request {
384 (0, 0)
385}
386
387sub draw { }
388
389#############################################################################
390
391package CFClient::UI::Container;
392 647
393our @ISA = CFClient::UI::Base::; 648our @ISA = CFClient::UI::Base::;
394 649
395sub new { 650sub new {
396 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg);
653}
397 654
655sub size_request {
656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
659}
660
661sub draw { }
662
663#############################################################################
664
665package CFClient::UI::Container;
666
667our @ISA = CFClient::UI::Base::;
668
669sub new {
670 my ($class, %arg) = @_;
671
398 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
399 673
400 my $self = $class->SUPER::new (children => [], %arg); 674 my $self = $class->SUPER::new (
675 children => [],
676 can_events => 0,
677 %arg,
678 );
679
401 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
402 682
403 $self 683 $self
404} 684}
405 685
406sub add { 686sub add {
407 my ($self, $child) = @_; 687 my ($self, @widgets) = @_;
408 688
409 $child->set_parent ($self); 689 $_->set_parent ($self)
690 for @widgets;
410 691
411 use sort 'stable'; 692 use sort 'stable';
412 693
413 $self->{children} = [ 694 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 696 @{$self->{children}}, @widgets
416 ]; 697 ];
417 698
418 $child->check_size; 699 $self->realloc;
700}
701
702sub children {
703 @{ $_[0]{children} }
419} 704}
420 705
421sub remove { 706sub remove {
422 my ($self, $child) = @_; 707 my ($self, $child) = @_;
423 708
424 delete $child->{parent}; 709 delete $child->{parent};
710 $child->hide;
425 711
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 713
428 $self->check_size; 714 $self->realloc;
715}
716
717sub clear {
718 my ($self) = @_;
719
720 my $children = delete $self->{children};
721 $self->{children} = [];
722
723 for (@$children) {
724 delete $_->{parent};
725 $_->hide;
726 }
727
728 $self->realloc;
429} 729}
430 730
431sub find_widget { 731sub find_widget {
432 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
433 733
434 $x -= $self->{x}; 734 $x -= $self->{x};
435 $y -= $self->{y}; 735 $y -= $self->{y};
436 736
437 my $res; 737 my $res;
438 738
439 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
440 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
441 and return $res; 741 and return $res;
442 } 742 }
443 743
444 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
493 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
494} 794}
495 795
496############################################################################# 796#############################################################################
497 797
798# back-buffered drawing area
799
498package CFClient::UI::Window; 800package CFClient::UI::Window;
499 801
500our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
501 803
502use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
508} 810}
509 811
510sub update { 812sub update {
511 my ($self) = @_; 813 my ($self) = @_;
512 814
513 # we want to do this delayed... 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 816 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 817}
527 818
528sub size_allocate { 819sub size_allocate {
529 my ($self, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
530 821
531 $self->child->configure (0, 0, $w, $h); 822 $self->SUPER::size_allocate ($w, $h);
823 $self->update;
824}
532 825
826sub _render {
827 my ($self) = @_;
828
829 $self->{children}[0]->draw;
830}
831
832sub render_child {
833 my ($self) = @_;
834
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT;
838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
533 $self->render_chld; 846 $self->_render;
847 };
534} 848}
535 849
536sub _draw { 850sub _draw {
537 my ($self) = @_; 851 my ($self) = @_;
538 852
539 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
540 854
541 my $tex = $self->{texture} 855 my $tex = $self->{texture}
542 or return; 856 or return;
543 857
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1;
548 861
549 $tex->draw_quad (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 863
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
553} 865}
554 866
555############################################################################# 867#############################################################################
556 868
557package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
558 870
559our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 872
633sub new { 873sub new {
634 my $class = shift; 874 my $class = shift;
635 875
636 # TODO: user_x, user_y, overwrite moveto? 876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
883sub size_request {
884 my ($self) = @_;
885
886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887
888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
892}
893
894sub size_allocate {
895 my ($self, $w, $h) = @_;
896
897 my $child = $self->child;
898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
902 $self->child->configure (0, 0, $w, $h);
903 $self->update;
904}
905
906sub set_offset {
907 my ($self, $x, $y) = @_;
908
909 $self->{view_x} = int $x;
910 $self->{view_y} = int $y;
911
912 $self->update;
913}
914
915# hmm, this does not work for topleft of $self... but we should not ask for that
916sub coord2local {
917 my ($self, $x, $y) = @_;
918
919 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
920}
921
922sub coord2global {
923 my ($self, $x, $y) = @_;
924
925 $x = List::Util::min $self->{w}, $x - $self->{view_x};
926 $y = List::Util::min $self->{h}, $y - $self->{view_y};
927
928 $self->SUPER::coord2global ($x, $y)
929}
930
931sub find_widget {
932 my ($self, $x, $y) = @_;
933
934 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
936 ) {
937 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
938 } else {
939 $self->CFClient::UI::Base::find_widget ($x, $y)
940 }
941}
942
943sub _render {
944 my ($self) = @_;
945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950
951 $self->SUPER::_render;
952}
953
954#############################################################################
955
956package CFClient::UI::ScrolledWindow;
957
958our @ISA = CFClient::UI::HBox::;
959
960sub new {
961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
964
965 my $self;
966
967 my $slider = new CFClient::UI::Slider
968 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]);
972 },
973 ;
974
975 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1),
977 slider => $slider,
978 %arg,
979 );
980
981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
983
984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
991}
992
993sub update {
994 my ($self) = @_;
995
996 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001}
1002
1003sub size_allocate {
1004 my ($self, $w, $h) = @_;
1005
1006 $self->SUPER::size_allocate ($w, $h);
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014
1015#############################################################################
1016
1017package CFClient::UI::Frame;
1018
1019our @ISA = CFClient::UI::Bin::;
1020
1021use CFClient::OpenGL;
1022
1023sub new {
1024 my $class = shift;
1025
1026 $class->SUPER::new (
1027 bg => undef,
1028 @_,
1029 )
1030}
1031
1032sub _draw {
1033 my ($self) = @_;
1034
1035 if ($self->{bg}) {
1036 my ($w, $h) = @$self{qw(w h)};
1037
1038 glEnable GL_BLEND;
1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1040 glColor_premultiply @{ $self->{bg} };
1041
1042 glBegin GL_QUADS;
1043 glVertex 0 , 0;
1044 glVertex 0 , $h;
1045 glVertex $w, $h;
1046 glVertex $w, 0;
1047 glEnd;
1048
1049 glDisable GL_BLEND;
1050 }
1051
1052 $self->SUPER::_draw;
1053}
1054
1055#############################################################################
1056
1057package CFClient::UI::FancyFrame;
1058
1059our @ISA = CFClient::UI::Bin::;
1060
1061use CFClient::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070
1071sub new {
1072 my ($class, %arg) = @_;
1073
1074 my $title = delete $arg{title};
637 1075
638 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
641 border => 0.8, 1079 border => 0.6,
642 @_ 1080 can_events => 1,
1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
643 ); 1084 );
644 1085
645 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
646 align => 0, 1087 align => 0,
647 valign => 1, 1088 valign => 1,
648 text => $self->{title}, 1089 text => $title,
649 fontsize => 1; 1090 fontsize => $self->{border}
1091 if defined $title;
650 1092
651 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
652} 1101}
653 1102
654sub border { 1103sub border {
655 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
656} 1105}
657 1106
658sub size_request { 1107sub size_request {
659 my ($self) = @_; 1108 my ($self) = @_;
660 1109
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1110 $self->{title}->size_request
1111 if $self->{title};
662 1112
663 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
664 1114
665 ( 1115 (
666 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
669} 1119}
670 1120
671sub size_allocate { 1121sub size_allocate {
672 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
673 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
674 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
676 1134
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
678 if $self->{title};
679
680 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
681} 1136}
682 1137
683sub button_down { 1138sub button_down {
684 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
685 1140
1141 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 1142 my $border = $self->border;
687 1143
688 if ($x < $self->{w} && $x >= $self->{w} - $border 1144 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 1145 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1146
1147 if ($lr & $td) {
1148 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1149 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1150 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1151
1152 my $mx = $x < $border;
1153 my $my = $y < $border;
1154
694 $self->{motion} = sub { 1155 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
696 1157
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 my $dx = $ev->{x} - $ox;
1159 my $dy = $ev->{y} - $oy;
698 1160
699 $self->{user_w} = $bw + $x - $ox; 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
701 $self->check_size; 1163
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc;
702 }; 1166 };
703 1167
704 } elsif ($x >= 0 && $x < $self->{w} 1168 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
709 1171
710 $self->{motion} = sub { 1172 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
712 1174
713 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
714 1176
715 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
716 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
717 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
718 } 1185 1
719} 1186}
720 1187
721sub button_up { 1188sub button_up {
722 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
723 1190
724 delete $self->{motion}; 1191 !!delete $self->{motion}
725} 1192}
726 1193
727sub mouse_motion { 1194sub mouse_motion {
728 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
729 1196
730 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
731} 1200}
732 1201
733sub _draw { 1202sub _draw {
734 my ($self) = @_; 1203 my ($self) = @_;
735 1204
1205 my $child = $self->{children}[0];
1206
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
738 1209
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1212
744 my $border = $self->border; 1213 my $border = $self->border;
745 1214
746 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1220
752 my $bg = $tex[0]; 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} };
753 1223
754 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1225 # solve this better(?)
756 my $rep_y = $ch / $bg->{h}; 1226 $bg->{s} = $cw / $bg->{w};
757 1227 $bg->{t} = $ch / $bg->{h};
758 glColor @{ $self->{bg} };
759
760 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1229 }
764 1230
765 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1232
768 $self->{title}->draw if $self->{title};
769 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
770} 1239}
771 1240
772############################################################################# 1241#############################################################################
773 1242
774package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
782sub new { 1251sub new {
783 my $class = shift; 1252 my $class = shift;
784 1253
785 $class->SUPER::new ( 1254 $class->SUPER::new (
786 col_expand => [], 1255 col_expand => [],
787 @_ 1256 @_,
788 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
789} 1262}
790 1263
791sub add { 1264sub add {
792 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
793 1266
794 $child->set_parent ($self); 1267 $child->set_parent ($self);
795 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
796 1269
797 $child->check_size; 1270 $self->realloc;
798} 1271}
799 1272
800# TODO: move to container class maybe? send childs a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
801sub clear { 1274sub clear {
802 my ($self) = @_; 1275 my ($self) = @_;
803 1276
1277 my @children = $self->children;
804 delete $self->{children}; 1278 delete $self->{children};
805 $self->update; 1279
1280 for (@children) {
1281 delete $_->{parent};
1282 $_->hide;
1283 }
1284
1285 $self->realloc;
806} 1286}
807 1287
808sub get_wh { 1288sub get_wh {
809 my ($self) = @_; 1289 my ($self) = @_;
810 1290
… …
815 or next; 1295 or next;
816 1296
817 for my $x (0 .. $#$row) { 1297 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1298 my $widget = $row->[$x]
819 or next; 1299 or next;
820 my ($w, $h) = $widget->size_request; 1300 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1301
822 $w[$x] = max $w[$x], $w; 1302 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1303 $h[$y] = max $h[$y], $h;
824 } 1304 }
825 } 1305 }
… …
841sub size_allocate { 1321sub size_allocate {
842 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
843 1323
844 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
845 1325
846 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
847 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
848 1328
849 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
850 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
851 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
852 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
906 } 1386 }
907} 1387}
908 1388
909############################################################################# 1389#############################################################################
910 1390
911package CFClient::UI::HBox; 1391package CFClient::UI::Box;
912
913# TODO: wrap into common Box base class
914 1392
915our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
916 1394
917sub size_request { 1395sub size_request {
918 my ($self) = @_; 1396 my ($self) = @_;
919 1397
920 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
921 1399 ? (
922 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
923 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
924 (List::Util::max map $_->[1], @alloc), 1402 )
925 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
926} 1407}
927 1408
928sub size_allocate { 1409sub size_allocate {
929 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
930 1411
931 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
932
933 my $children = $self->{children}; 1413 my $children = $self->{children};
934 1414
935 my @h = map +($_->size_request)[0], @$children; 1415 my @req;
936 1416
937 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
938 1418 @req = ($space / (@$children || 1)) x @$children;
939 if ($req_h > $h) {
940 # ah well, not enough space
941 $_ *= $h / $req_h for @h;
942 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
943 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
944 $exp ||= 1;
945 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
946 for (0 .. $#$children) { 1432 for 0 .. $#$children;
947 my $child = $children->[$_];
948
949 my $alloc_h = $h[$_];
950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
951 $h[$_] = $alloc_h;
952 } 1433 }
953 } 1434 }
954 1435
955 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
956 1437
957 my $y = 0; 1438 my $pos = 0;
958 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
959 my $child = $children->[$_];
960 my $h = $h[$_]; 1440 my $alloc = $req[$_];
961 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
962 1442
963 $y += $h; 1443 $pos += $alloc;
964 } 1444 }
965 1445
966 1 1446 1
967} 1447}
968 1448
969############################################################################# 1449#############################################################################
970 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
971package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
972 1467
973# TODO: wrap into common Box base class
974
975our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
976 1469
977sub size_request { 1470sub new {
978 my ($self) = @_; 1471 my $class = shift;
979 1472
980 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
981 1474 vertical => 1,
982 ( 1475 @_,
983 (List::Util::max map $_->[0], @alloc),
984 (List::Util::sum map $_->[1], @alloc),
985 ) 1476 )
986} 1477}
987 1478
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 my $children = $self->{children};
992
993 my @h = map +($_->size_request)[1], @$children;
994
995 my $req_h = List::Util::sum @h;
996
997 if ($req_h > $h) {
998 # ah well, not enough space
999 $_ *= $h / $req_h for @h;
1000 } else {
1001 my $exp = List::Util::sum map $_->{expand}, @$children;
1002 $exp ||= 1;
1003
1004 for (0 .. $#$children) {
1005 my $child = $children->[$_];
1006
1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1008 }
1009 }
1010
1011 CFClient::UI::harmonize \@h;
1012
1013 my $y = 0;
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016 my $h = $h[$_];
1017 $child->configure (0, $y, $w, $h);
1018
1019 $y += $h;
1020 }
1021
1022 1
1023}
1024
1025############################################################################# 1479#############################################################################
1026 1480
1027package CFClient::UI::Label; 1481package CFClient::UI::Label;
1028 1482
1029our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1030 1484
1031use CFClient::OpenGL; 1485use CFClient::OpenGL;
1032 1486
1033sub new { 1487sub new {
1034 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1035 1489
1036 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1491 fg => [1, 1, 1],
1492 #bg => none
1493 #active_bg => none
1494 #font => default_font
1495 #text => initial text
1496 #markup => initial narkup
1497 #max_w => maximum pixel width
1498 ellipsise => 3, # end
1499 layout => (new CFClient::Layout),
1038 fontsize => 1, 1500 fontsize => 1,
1039 text => "",
1040 align => -1, 1501 align => -1,
1041 valign => -1, 1502 valign => -1,
1042 padding => 2, 1503 padding_x => 2,
1043 layout => new CFClient::Layout, 1504 padding_y => 2,
1505 can_events => 0,
1044 %arg 1506 %arg
1045 ); 1507 );
1046 1508
1047 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1510 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1511 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1512 $self->{template} = $layout;
1051 } 1513 }
1052 1514
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1515 if (exists $self->{markup}) {
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1516 $self->set_markup (delete $self->{markup});
1517 } else {
1518 $self->set_text (delete $self->{text});
1519 }
1055 1520
1056 $self 1521 $self
1057} 1522}
1058 1523
1059sub escape_text { 1524sub escape($) {
1060 local $_ = $_[1]; 1525 local $_ = $_[0];
1061 1526
1062 s/&/&amp;/g; 1527 s/&/&amp;/g;
1063 s/>/&gt;/g; 1528 s/>/&gt;/g;
1064 s/</&lt;/g; 1529 s/</&lt;/g;
1065 1530
1066 $_[1] 1531 $_
1532}
1533
1534sub update {
1535 my ($self) = @_;
1536
1537 delete $self->{texture};
1538 $self->SUPER::update;
1067} 1539}
1068 1540
1069sub set_text { 1541sub set_text {
1070 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1071 1543
1544 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text";
1546
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1072 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1073 1549
1074 delete $self->{texture}; 1550 $self->realloc;
1075 $self->update; 1551 $self->update;
1076} 1552}
1077 1553
1078sub set_markup { 1554sub set_markup {
1079 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1080 1556
1557 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup";
1559
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1081 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1082 1564
1083 delete $self->{texture}; 1565 $self->realloc;
1084 $self->update; 1566 $self->update;
1085} 1567}
1086 1568
1087sub size_request { 1569sub size_request {
1088 my ($self) = @_; 1570 my ($self) = @_;
1089 1571
1090 $self->{layout}->set_width; 1572 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1577
1093 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1094 1579
1095 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1583
1098 my ($w2, $h2) = $self->{template}->size; 1584 my ($w2, $h2) = $self->{template}->size;
1099 1585
1100 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1102 } 1588 }
1103 1589
1104 ( 1590 ($w, $h)
1105 $w + $self->{padding} * 2,
1106 $h + $self->{padding} * 2,
1107 )
1108} 1591}
1109 1592
1110sub size_allocate { 1593sub size_allocate {
1111 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1112 1595
1596 delete $self->{ox};
1597
1113 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1114} 1600}
1115 1601
1116sub set_fontsize { 1602sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1118 1604
1119 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1120 $self->update; 1606 delete $self->{texture};
1607
1608 $self->realloc;
1121} 1609}
1122 1610
1123sub _draw { 1611sub _draw {
1124 my ($self) = @_; 1612 my ($self) = @_;
1125 1613
1614 $self->SUPER::_draw; # draw background, if applicable
1615
1126 my $tex = $self->{texture} ||= do { 1616 my $tex = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font};
1127 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623
1129 new_from_layout CFClient::Texture $self->{layout} 1624 new_from_layout CFClient::Texture $self->{layout}
1130 }; 1625 };
1131 1626
1132 glEnable GL_BLEND; 1627 unless (exists $self->{ox}) {
1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5);
1631
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5);
1635 };
1636
1134 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1639
1137 glColor @{$self->{fg}}; 1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1138 1642
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1152 1644
1153 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1646}
1156 1647
1157############################################################################# 1648#############################################################################
1158 1649
1159package CFClient::UI::EntryBase; 1650package CFClient::UI::EntryBase;
… …
1164 1655
1165sub new { 1656sub new {
1166 my $class = shift; 1657 my $class = shift;
1167 1658
1168 $class->SUPER::new ( 1659 $class->SUPER::new (
1169 fg => [1, 1, 1], 1660 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1661 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1662 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1173 can_hover => 1, 1664 can_hover => 1,
1174 can_focus => 1, 1665 can_focus => 1,
1175 valign => 0, 1666 valign => 0,
1667 can_events => 1,
1668 #text => ...
1176 @_ 1669 @_
1177 ) 1670 )
1178} 1671}
1179 1672
1180sub _set_text { 1673sub _set_text {
… …
1182 1675
1183 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1184 1677
1185 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1186 1679
1187 delete $self->{texture};
1188
1189 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1190 $self->{text} = $text; 1681 $self->{text} = $text;
1191 1682
1192 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1194 1685
1195 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1688}
1689
1690sub set_text {
1691 my ($self, $text) = @_;
1692
1693 $self->{cursor} = length $text;
1694 $self->_set_text ($text);
1695
1696 $self->realloc;
1196} 1697}
1197 1698
1198sub get_text { 1699sub get_text {
1199 $_[0]{text} 1700 $_[0]{text}
1200} 1701}
… …
1203 my ($self) = @_; 1704 my ($self) = @_;
1204 1705
1205 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1206 1707
1207 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1208}
1209
1210sub size_allocate {
1211 my ($self, $w, $h) = @_;
1212
1213 $self->_set_text ($self->{text});
1214}
1215
1216sub set_text {
1217 my ($self, $text) = @_;
1218
1219 $self->{cursor} = length $text;
1220 $self->_set_text ($text);
1221 $self->update;
1222} 1709}
1223 1710
1224sub key_down { 1711sub key_down {
1225 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1226 1713
… …
1228 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1230 1717
1231 my $text = $self->get_text; 1718 my $text = $self->get_text;
1232 1719
1233 if ($sym == 8) { 1720 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1733 $self->_emit ('escape');
1247 } elsif ($uni) { 1734 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1249 } 1738 }
1250 1739
1251 $self->_set_text ($text); 1740 $self->_set_text ($text);
1252 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1253} 1745}
1254 1746
1255sub focus_in { 1747sub focus_in {
1256 my ($self) = @_; 1748 my ($self) = @_;
1257 1749
… …
1272 utf8::encode $text; 1764 utf8::encode $text;
1273 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1274 1766
1275 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1276 $self->update; 1768 $self->update;
1769
1770 1
1277} 1771}
1278 1772
1279sub mouse_motion { 1773sub mouse_motion {
1280 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1281# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1282} 1778}
1283 1779
1284sub _draw { 1780sub _draw {
1285 my ($self) = @_; 1781 my ($self) = @_;
1286 1782
1287 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1288 1784
1289 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1290 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1291 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1292 } else { 1788 } else {
1293 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1294 } 1790 }
1295 1791
1296 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1297 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1298 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1299 glVertex 0 , 0; 1795 glVertex 0 , 0;
1300 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1301 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1302 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1333 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1334 1830
1335 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1336 1832
1337 if ($sym == 13) { 1833 if ($sym == 13) {
1834 unshift @{$self->{history}},
1835 my $txt = $self->get_text;
1836 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = '';
1338 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1339 $self->update; 1839 $self->update;
1340 1840
1841 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text;
1844 }
1845 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++;
1847 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1848 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 }
1852
1853 } elsif ($sym == CFClient::SDLK_DOWN) {
1854 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856
1857 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else {
1860 $self->set_text ($self->{history_saveback});
1861 }
1862
1341 } else { 1863 } else {
1342 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1343 } 1867 1
1344
1345} 1868}
1346 1869
1347############################################################################# 1870#############################################################################
1348 1871
1349package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1358 1881
1359sub new { 1882sub new {
1360 my $class = shift; 1883 my $class = shift;
1361 1884
1362 $class->SUPER::new ( 1885 $class->SUPER::new (
1363 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1364 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1367 can_hover => 1, 1890 can_hover => 1,
1368 align => 0, 1891 align => 0,
1369 valign => 0, 1892 valign => 0,
1893 can_events => 1,
1370 @_ 1894 @_
1371 ) 1895 )
1372} 1896}
1373 1897
1898sub activate { }
1899
1374sub button_up { 1900sub button_up {
1375 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1376 1902
1903 $self->emit ("activate")
1377 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1378 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1379 $self->emit ("activate"); 1906
1380 } 1907 1
1381} 1908}
1382 1909
1383sub _draw { 1910sub _draw {
1384 my ($self) = @_; 1911 my ($self) = @_;
1385 1912
1386 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1387 1914
1388 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg};
1390 }
1391
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1397 1918
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1920
1400 glDisable GL_TEXTURE_2D; 1921 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1922
1403 $self->SUPER::_draw; 1923 $self->SUPER::_draw;
1404} 1924}
1405 1925
1406############################################################################# 1926#############################################################################
… …
1417 1937
1418sub new { 1938sub new {
1419 my $class = shift; 1939 my $class = shift;
1420 1940
1421 $class->SUPER::new ( 1941 $class->SUPER::new (
1422 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1423 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1424 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1946 bg => [0, 0, 0, 0.2],
1947 active_bg => [1, 1, 1, 0.5],
1425 state => 0, 1948 state => 0,
1426 can_hover => 1, 1949 can_hover => 1,
1427 @_ 1950 @_
1428 ) 1951 )
1429} 1952}
1430 1953
1431sub size_request { 1954sub size_request {
1432 my ($self) = @_; 1955 my ($self) = @_;
1433 1956
1434 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1435} 1958}
1436 1959
1437sub button_down { 1960sub button_down {
1438 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1439 1962
1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1442 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1443 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1444 } 1971 1
1445} 1972}
1446 1973
1447sub _draw { 1974sub _draw {
1448 my ($self) = @_; 1975 my ($self) = @_;
1449 1976
1450 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1451 1978
1452 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1453 1980
1454 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1455 1984
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1986
1458 glEnable GL_BLEND; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1988
1459 glEnable GL_TEXTURE_2D; 1989 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1990 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1992}
1469 1993
1470############################################################################# 1994#############################################################################
1471 1995
1472package CFClient::UI::Image; 1996package CFClient::UI::Image;
… …
1479our %loaded_images; 2003our %loaded_images;
1480 2004
1481sub new { 2005sub new {
1482 my $class = shift; 2006 my $class = shift;
1483 2007
1484 my $self = $class->SUPER::new (@_); 2008 my $self = $class->SUPER::new (can_events => 0, @_);
1485 2009
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487 2011
1488 $loaded_images{$self->{image}} ||= 2012 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1490 2014
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2015 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2016
2017 Scalar::Util::weaken $loaded_images{$self->{image}};
1492 2018
1493 $self->{aspect} = $tex->{w} / $tex->{h}; 2019 $self->{aspect} = $tex->{w} / $tex->{h};
1494 2020
1495 $self 2021 $self
1496} 2022}
… …
1513 glTranslate 0, -$self->{w}, 0; 2039 glTranslate 0, -$self->{w}, 0;
1514 2040
1515 ($w, $h) = ($h, $w); 2041 ($w, $h) = ($h, $w);
1516 } 2042 }
1517 2043
1518 glEnable GL_BLEND;
1519 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1520 glEnable GL_TEXTURE_2D; 2044 glEnable GL_TEXTURE_2D;
1521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 2046
1523 $tex->draw_quad (0, 0, $w, $h); 2047 $tex->draw_quad_alpha (0, 0, $w, $h);
1524 2048
1525 glDisable GL_BLEND;
1526 glDisable GL_TEXTURE_2D; 2049 glDisable GL_TEXTURE_2D;
1527} 2050}
1528 2051
1529############################################################################# 2052#############################################################################
1530 2053
1531package CFClient::UI::VGauge; 2054package CFClient::UI::VGauge;
1532 2055
1533our @ISA = CFClient::UI::Base::; 2056our @ISA = CFClient::UI::Base::;
2057
2058use List::Util qw(min max);
1534 2059
1535use CFClient::OpenGL; 2060use CFClient::OpenGL;
1536 2061
1537my %tex = ( 2062my %tex = (
1538 food => [ 2063 food => [
1539 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1540 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1541 ], 2066 ],
1542 grace => [ 2067 grace => [
1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1544 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2069 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1545 ], 2070 ],
1546 hp => [ 2071 hp => [
1547 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1548 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1549 ], 2074 ],
1550 mana => [ 2075 mana => [
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1552 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2077 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1553 ], 2078 ],
1554); 2079);
1555 2080
1556# eg. VGauge->new (gauge => 'food'), default gauge: food 2081# eg. VGauge->new (gauge => 'food'), default gauge: food
1557sub new { 2082sub new {
… …
1576} 2101}
1577 2102
1578sub set_max { 2103sub set_max {
1579 my ($self, $max) = @_; 2104 my ($self, $max) = @_;
1580 2105
2106 return if $self->{max_val} == $max;
2107
1581 $self->{max_val} = $max; 2108 $self->{max_val} = $max;
2109 $self->update;
1582} 2110}
1583 2111
1584sub set_value { 2112sub set_value {
1585 my ($self, $val, $max) = @_; 2113 my ($self, $val, $max) = @_;
1586 2114
1587 $self->set_max ($max) 2115 $self->set_max ($max)
1588 if defined $max; 2116 if defined $max;
1589 2117
1590 $max = $self->{max_val}; 2118 return if $self->{val} == $val;
2119
1591 $self->{val} = $val; 2120 $self->{val} = $val;
1592
1593 $self->update; 2121 $self->update;
1594} 2122}
1595 2123
1596sub _draw { 2124sub _draw {
1597 my ($self) = @_; 2125 my ($self) = @_;
1598 2126
1599 my $tex = $tex{$self->{type}}; 2127 my $tex = $tex{$self->{type}};
2128 my ($t1, $t2, $t3) = @$tex;
1600 2129
1601 my ($w, $h) = ($self->{w}, $self->{h}); 2130 my ($w, $h) = ($self->{w}, $self->{h});
1602 2131
1603 if ($self->{vertical}) { 2132 if ($self->{vertical}) {
1604 glRotate 90, 0, 0, 1; 2133 glRotate 90, 0, 0, 1;
… …
1606 2135
1607 ($w, $h) = ($h, $w); 2136 ($w, $h) = ($h, $w);
1608 } 2137 }
1609 2138
1610 my $ycut = $self->{val} / ($self->{max_val} || 1); 2139 my $ycut = $self->{val} / ($self->{max_val} || 1);
1611 $ycut = 1 if $self->{val} > $self->{max_val};
1612 2140
1613 my $t1 = $tex->[0]; 2141 my $ycut1 = max 0, min 1, $ycut;
1614 my $t2 = $tex->[1]; 2142 my $ycut2 = max 0, min 1, $ycut - 1;
2143
2144 my $h1 = $self->{h} * (1 - $ycut1);
2145 my $h2 = $self->{h} * (1 - $ycut2);
1615 2146
1616 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 2152
1621 my $h1 = $self->{h} - $ycut * $self->{h};
1622 my $h2 = $ycut * $self->{h};
1623
1624 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1625 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
1626 glTexCoord 0 , 0; glVertex 0 , 0; 2155 glTexCoord 0 , 0; glVertex 0 , 0;
1627 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2156 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1628 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2157 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1629 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2158 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1630 glEnd; 2159 glEnd;
1631 2160
2161 my $ycut1 = List::Util::min 1, $ycut;
1632 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t2->{name};
1633 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
1634 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2164 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1635 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2165 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1636 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2166 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1637 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2167 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1638 glEnd; 2168 glEnd;
2169
2170 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd;
2178 }
1639 2179
1640 glDisable GL_BLEND; 2180 glDisable GL_BLEND;
1641 glDisable GL_TEXTURE_2D; 2181 glDisable GL_TEXTURE_2D;
1642} 2182}
1643 2183
… …
1646package CFClient::UI::Gauge; 2186package CFClient::UI::Gauge;
1647 2187
1648our @ISA = CFClient::UI::VBox::; 2188our @ISA = CFClient::UI::VBox::;
1649 2189
1650sub new { 2190sub new {
1651 my ($class, %arg) = shift; 2191 my ($class, %arg) = @_;
1652 2192
1653 my $self = $class->SUPER::new ( 2193 my $self = $class->SUPER::new (
1654 @_, 2194 tooltip => $arg{type},
2195 can_hover => 1,
2196 can_events => 1,
2197 %arg,
1655 ); 2198 );
1656 2199
1657 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2200 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1658 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2201 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1659 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2202 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1660 2203
1661 $self 2204 $self
1662} 2205}
1663 2206
1664sub set_fontsize { 2207sub set_fontsize {
1665 my ($self, $fsize) = @_; 2208 my ($self, $fsize) = @_;
1666 2209
1667 $self->{value}->set_fontsize ($fsize); 2210 $self->{value}->set_fontsize ($fsize);
1668 $self->{max} ->set_fontsize ($fsize); 2211 $self->{max} ->set_fontsize ($fsize);
1669 $self->update; 2212}
2213
2214sub set_max {
2215 my ($self, $max) = @_;
2216
2217 $self->{gauge}->set_max ($max);
2218 $self->{max}->set_text ($max);
1670} 2219}
1671 2220
1672sub set_value { 2221sub set_value {
1673 my ($self, $val, $max) = @_; 2222 my ($self, $val, $max) = @_;
1674 2223
1675 $self->set_max ($max) 2224 $self->set_max ($max)
1676 if defined $max; 2225 if defined $max;
1677 2226
1678 $self->{gauge}->set_value ($val, $max); 2227 $self->{gauge}->set_value ($val, $max);
1679 $self->{value}->set_text ($val); 2228 $self->{value}->set_text ($val);
1680}
1681
1682sub set_max {
1683 my ($self, $max) = @_;
1684
1685 $self->{gauge}->set_max ($max);
1686 $self->{max}->set_text ($max);
1687} 2229}
1688 2230
1689############################################################################# 2231#############################################################################
1690 2232
1691package CFClient::UI::Slider; 2233package CFClient::UI::Slider;
… …
1701 qw(s1_slider.png s1_slider_bg.png); 2243 qw(s1_slider.png s1_slider_bg.png);
1702 2244
1703sub new { 2245sub new {
1704 my $class = shift; 2246 my $class = shift;
1705 2247
1706 # range [value, low, high, page] 2248 # range [value, low, high, page, unit]
1707 2249
1708 # TODO: 0-width page 2250 # TODO: 0-width page
1709 # TODO: req_w/h are wrong with vertical 2251 # TODO: req_w/h are wrong with vertical
1710 # TODO: calculations are off 2252 # TODO: calculations are off
1711 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
1712 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
1713 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2256 bg => [0, 0, 0, 0.2],
2257 active_bg => [1, 1, 1, 0.5],
1714 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
1715 req_w => 20, 2259 min_w => $::WIDTH / 80,
1716 req_h => 20, 2260 min_h => $::WIDTH / 80,
1717 vertical => 0, 2261 vertical => 0,
1718 can_hover => 1, 2262 can_hover => 1,
1719 inner_pad => 5, 2263 inner_pad => 0.02,
1720 @_ 2264 @_
1721 ); 2265 );
1722 2266
2267 $self->set_value ($self->{range}[0]);
2268 $self->update;
2269
1723 $self 2270 $self
1724} 2271}
1725 2272
2273sub changed { }
2274
2275sub set_range {
2276 my ($self, $range) = @_;
2277
2278 ($range, $self->{range}) = ($self->{range}, $range);
2279
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}";
2282}
2283
2284sub set_value {
2285 my ($self, $value) = @_;
2286
2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2288
2289 $hi = $lo + 1 if $hi <= $lo;
2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2293 $value = $lo if $value < $lo;
2294 $value = $hi - $page if $value > $hi - $page;
2295
2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2297 if $unit;
2298
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300
2301 if ($value != $old_value) {
2302 $self->_emit (changed => $value);
2303 $self->update;
2304 }
2305}
2306
1726sub size_request { 2307sub size_request {
1727 my ($self) = @_; 2308 my ($self) = @_;
1728 2309
1729 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
1730 my $h = $self->{req_h};
1731
1732 $self->{vertical} ? ($h, $w) : ($w, $h)
1733} 2311}
1734 2312
1735sub button_down { 2313sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
1737 2315
1738 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2317
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319
1739 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
1740} 2321}
1741 2322
1742sub mouse_motion { 2323sub mouse_motion {
1743 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
1744 2325
1745 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328
2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2330
2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2332
2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2338 1
2339}
2340
2341sub update {
2342 my ($self) = @_;
2343
2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2352 $self->set_value ($self->{range}[0]);
2353
1746 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
1747 2356
1748 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1749 2358
1750 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1751 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1752 2361
1753 $x -= $inner_pad_px; # substract the padding 2362 $value = ($value - $lo) / $range;
1754 $x = $x * ($hi - $lo) / $inner_w + $lo; 2363 $value = $value * $self->{scale} + $self->{offset};
1755 $x = $lo if $x < $lo;
1756 $x = $hi - $page if $x > $hi - $page;
1757 $self->{range}[0] = $x;
1758 2364
1759 $self->emit (changed => $x); 2365 $self->{knob_x} = $value - $knob_w * 0.5;
1760 $self->update; 2366 $self->{knob_w} = $knob_w;
1761 } 2367 }
1762}
1763
1764# the inner_* stuff is for generating a padding for the slider handle,
1765# so that the handle doesn't leave the texture. This calculation isn't 100%
1766# correct propably, but it does the job for now
1767sub _calc_inner_pad_px {
1768 my ($self, $w) = @_;
1769 ($w / 100) * $self->{inner_pad} # % to pixels
1770}
1771
1772sub _draw {
1773 my ($self) = @_;
1774 2368
1775 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
1776 2370
1777 my ($w, $h) = @$self{qw(w h)}; 2371 glScale $self->{w}, $self->{h};
1778 2372
1779 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
1780 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
1781 2375
2376 glTranslate 1, 0, 0;
1782 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
1783 glTranslate 0, -$self->{w}, 0;
1784
1785 ($w, $h) = ($h, $w);
1786 } 2378 }
1787 2379
1788 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1789 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1790 2382
1791 my ($value, $lo, $hi, $page) = @{$self->{range}};
1792
1793 $hi = $value + 1 if $lo == $hi;
1794
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1797
1798 $page = int $page * $inner_w / ($hi - $lo);
1799 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1800
1801 $w -= $page;
1802 $page &= ~1;
1803 glTranslate $page * 0.5, 0, 0;
1804 $page ||= 2;
1805
1806 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1807 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1808
1809 glEnable GL_BLEND;
1810 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1811 glEnable GL_TEXTURE_2D; 2383 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 2385
1814 # draw background 2386 # draw background
1815 $tex[1]->draw_quad (0, 0, $w, $h); 2387 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1816 2388
1817 # draw handle 2389 # draw handle
1818 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2390 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1819 2391
1820 glDisable GL_BLEND;
1821 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
1822} 2393}
2394
2395#############################################################################
2396
2397package CFClient::UI::ValSlider;
2398
2399our @ISA = CFClient::UI::HBox::;
2400
2401sub new {
2402 my ($class, %arg) = @_;
2403
2404 my $range = delete $arg{range};
2405
2406 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift },
2410 from_value => sub { shift },
2411 %arg,
2412 );
2413
2414 $self->{slider}->connect (changed => sub {
2415 my ($self, $value) = @_;
2416 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2417 $self->{parent}->emit (changed => $value);
2418 });
2419
2420# $self->{entry}->connect (changed => sub {
2421# my ($self, $value) = @_;
2422# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2423# $self->{parent}->emit (changed => $value);
2424# });
2425
2426 $self->add ($self->{slider}, $self->{entry});
2427
2428 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2429
2430 $self
2431}
2432
2433sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) }
1823 2435
1824############################################################################# 2436#############################################################################
1825 2437
1826package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
1827 2439
… …
1831 2443
1832sub new { 2444sub new {
1833 my $class = shift; 2445 my $class = shift;
1834 2446
1835 my $self = $class->SUPER::new ( 2447 my $self = $class->SUPER::new (
1836 fontsize => 1, 2448 fontsize => 1,
2449 can_events => 0,
2450 #font => default_font
1837 @_, 2451 @_,
1838 2452
1839 layout => (new CFClient::Layout), 2453 layout => (new CFClient::Layout 1),
1840 par => [], 2454 par => [],
1841 height => 0, 2455 height => 0,
1842 children => [ 2456 children => [
1843 (new CFClient::UI::Empty expand => 1), 2457 (new CFClient::UI::Empty expand => 1),
1844 (new CFClient::UI::Slider vertical => 1), 2458 (new CFClient::UI::Slider vertical => 1),
1845 ], 2459 ],
1846 ); 2460 );
1847 2461
1848 $self->{children}[1]->connect (changed => sub { 2462 $self->{children}[1]->connect (changed => sub { $self->update });
1849 $self->update;
1850 });
1851 2463
1852 $self 2464 $self
1853} 2465}
1854 2466
1855sub set_fontsize { 2467sub set_fontsize {
… …
1857 2469
1858 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
1859 $self->reflow; 2471 $self->reflow;
1860} 2472}
1861 2473
2474sub size_allocate {
2475 my ($self, $w, $h) = @_;
2476
2477 $self->SUPER::size_allocate ($w, $h);
2478
2479 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w});
2482
2483 $self->reflow;
2484}
2485
1862sub text_height { 2486sub text_size {
1863 my ($self, $text) = @_; 2487 my ($self, $text, $indent) = @_;
1864 2488
1865 my $layout = $self->{layout}; 2489 my $layout = $self->{layout};
1866 2490
1867 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1868 $layout->set_width ($self->{w}); 2492 $layout->set_width ($self->{children}[0]{w} - $indent);
1869 $layout->set_text ($text); 2493 $layout->set_markup ($text);
1870 2494
1871 ($layout->size)[1] 2495 $layout->size
1872} 2496}
1873 2497
1874sub reflow { 2498sub reflow {
1875 my ($self) = @_; 2499 my ($self) = @_;
1876 2500
1877 $self->{need_reflow}++; 2501 $self->{need_reflow}++;
1878 $self->update; 2502 $self->update;
1879} 2503}
1880 2504
1881sub size_allocate { 2505sub set_offset {
2506 my ($self, $offset) = @_;
2507
2508 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset);
2510}
2511
2512sub clear {
1882 my ($self, $w, $h) = @_; 2513 my ($self) = @_;
1883 2514
1884 $self->SUPER::size_allocate ($w, $h); 2515 $self->{par} = [];
1885 2516 $self->{height} = 0;
1886 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1887 $self->{layout}->set_width ($self->{children}[0]{w});
1888
1889 $self->reflow;
1890} 2518}
1891 2519
1892sub add_paragraph { 2520sub add_paragraph {
1893 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
1894 2522
1895 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
1896 2524 my ($w, $h) = $self->text_size ($line);
1897 my $height = $self->text_height ($text);
1898
1899 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
1900 2528
1901 push @{$self->{par}}, [$height, $color, $text];
1902
1903 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1904 $self->{children}[1]->update;
1905} 2530}
1906 2531
1907sub update { 2532sub update {
1908 my ($self) = @_; 2533 my ($self) = @_;
1909 2534
… …
1911 2536
1912 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
1913 2538
1914 delete $self->{texture}; 2539 delete $self->{texture};
1915 2540
1916 $ROOT->on_refresh ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
1917 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
1918 my $height = 0; 2545 my $height = 0;
1919 2546
1920 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
1921 for @{$self->{par}}; 2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
1922 2562
1923 $self->{height} = $height; 2563 $self->{height} = $height;
1924 2564
1925 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1926 2566
1927 delete $self->{texture}; 2567 delete $self->{texture};
1928 } 2568 }
1929 2569
1930 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1931 glClearColor 0, 0, 0, 1; 2571 glClearColor 0, 0, 0, 0;
1932 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
1933 2573
2574 my $top = int $self->{children}[1]{range}[0];
2575
2576 my $y0 = $top;
2577 my $y1 = $top + $H;
2578
2579 my $y = 0;
2580
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
1934 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
1935 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1936 glEnable GL_TEXTURE_2D;
1937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1938
1939 my $top = int $self->{children}[1]{range}[0];
1940
1941 my $y0 = $top;
1942 my $y1 = $top + $self->{h};
1943
1944 my $y = 0;
1945
1946 my $layout = $self->{layout};
1947 2588
1948 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
1949 my $h = $par->[0]; 2590 my $h = $par->[1];
1950 2591
1951 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
1952 $layout->set_text ($par->[2]); 2595 $layout->set_markup ($par->[4]);
1953 2596
1954 glColor @{ $par->[1] }; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1955 my ($W, $H) = $layout->size; 2598
1956 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2599 glRasterPos $par->[3], $y - $y0;
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1957 } 2601 }
1958 2602
1959 $y += $h; 2603 $y += $h;
1960 } 2604 }
1961 2605
1962 glDisable GL_TEXTURE_2D;
1963 glDisable GL_BLEND; 2606 glDisable GL_BLEND;
1964 }; 2607 };
1965 }); 2608 });
1966} 2609}
1967 2610
1968sub _draw { 2611sub _draw {
1969 my ($self) = @_; 2612 my ($self) = @_;
1970 2613
1971 if ($self->{texture}) {
1972 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
1973 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1974 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2616 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1975 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
1976 }
1977 2619
1978 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
1979 2621
1980} 2622}
1981 2623
… …
2029 2671
2030sub new { 2672sub new {
2031 my $class = shift; 2673 my $class = shift;
2032 2674
2033 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2034 state => 0, 2676 state => 0,
2035 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2036 @_ 2678 @_
2037 ); 2679 );
2038 2680
2039 if ($self->{state}) {
2040 $self->{state} = 0;
2041 $self->toggle_flopper;
2042 }
2043
2044 $self 2681 $self
2045} 2682}
2046 2683
2047sub toggle_flopper { 2684sub toggle_flopper {
2048 my ($self) = @_; 2685 my ($self) = @_;
2049 2686
2050 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2051 if ($self->{state} = !$self->{state}) { 2688}
2052 $CFClient::UI::ROOT->add ($self->{other}); 2689
2053 $self->{other}->move ($self->coord2global (0, $self->{h})); 2690#############################################################################
2691
2692package CFClient::UI::Tooltip;
2693
2694our @ISA = CFClient::UI::Bin::;
2695
2696use CFClient::OpenGL;
2697
2698sub new {
2699 my $class = shift;
2700
2701 $class->SUPER::new (
2702 @_,
2703 can_events => 0,
2704 )
2705}
2706
2707sub set_tooltip_from {
2708 my ($self, $widget) = @_;
2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2719 $self->add (new CFClient::UI::Label
2720 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8,
2723 fg => [0, 0, 0, 1],
2724 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 );
2727}
2728
2729sub size_request {
2730 my ($self) = @_;
2731
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733
2734 ($w + 4, $h + 4)
2735}
2736
2737sub size_allocate {
2738 my ($self, $w, $h) = @_;
2739
2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2759}
2760
2761sub _draw {
2762 my ($self) = @_;
2763
2764 glTranslate 0.375, 0.375;
2765
2766 my ($w, $h) = @$self{qw(w h)};
2767
2768 glColor 1, 0.8, 0.4;
2769 glBegin GL_QUADS;
2770 glVertex 0 , 0;
2771 glVertex 0 , $h;
2772 glVertex $w, $h;
2773 glVertex $w, 0;
2774 glEnd;
2775
2776 glColor 0, 0, 0;
2777 glBegin GL_LINE_LOOP;
2778 glVertex 0 , 0;
2779 glVertex 0 , $h;
2780 glVertex $w, $h;
2781 glVertex $w, 0;
2782 glEnd;
2783
2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2786 $self->SUPER::_draw;
2787}
2788
2789#############################################################################
2790
2791package CFClient::UI::Face;
2792
2793our @ISA = CFClient::UI::Base::;
2794
2795use CFClient::OpenGL;
2796
2797sub new {
2798 my $class = shift;
2799
2800 my $self = $class->SUPER::new (
2801 aspect => 1,
2802 can_events => 0,
2803 @_,
2804 );
2805
2806 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self);
2808
2809 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1,
2812 interval => $self->{animspeed},
2813 cb => sub {
2814 ++$widget->{frame};
2815 $widget->update;
2816 },
2817 );
2818 }
2819
2820 $self
2821}
2822
2823sub size_request {
2824 (32, 8)
2825}
2826
2827sub update {
2828 my ($self) = @_;
2829
2830 return unless $self->{visible};
2831
2832 $self->SUPER::update;
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 return unless $::CONN;
2839
2840 my $face;
2841
2842 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}];
2844
2845 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim;
2847 }
2848
2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2850
2851 if ($tex) {
2852 glEnable GL_TEXTURE_2D;
2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2854 glColor 0, 0, 0, 1;
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D;
2857 }
2858}
2859
2860sub DESTROY {
2861 my ($self) = @_;
2862
2863 $self->{timer}->cancel
2864 if $self->{timer};
2865
2866 $self->SUPER::DESTROY;
2867}
2868
2869#############################################################################
2870
2871package CFClient::UI::Buttonbar;
2872
2873our @ISA = CFClient::UI::HBox::;
2874
2875# TODO: should actualyl wrap buttons and other goodies.
2876
2877#############################################################################
2878
2879package CFClient::UI::Menu;
2880
2881our @ISA = CFClient::UI::FancyFrame::;
2882
2883use CFClient::OpenGL;
2884
2885sub new {
2886 my $class = shift;
2887
2888 my $self = $class->SUPER::new (
2889 items => [],
2890 z => 100,
2891 @_,
2892 );
2893
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895
2896 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item;
2898
2899 # handle various types of items, only text for now
2900 if (!ref $widget) {
2901 $widget = new CFClient::UI::Label
2902 can_hover => 1,
2903 can_events => 1,
2904 text => $widget;
2905 }
2906
2907 $self->{item}{$widget} = $item;
2908
2909 $self->{vbox}->add ($widget);
2910 }
2911
2912 $self
2913}
2914
2915# popup given the event (must be a mouse button down event currently)
2916sub popup {
2917 my ($self, $ev) = @_;
2918
2919 $self->_emit ("popdown");
2920
2921 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self;
2923 $self->{button} = $ev->{button};
2924
2925 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927}
2928
2929sub mouse_motion {
2930 my ($self, $ev, $x, $y) = @_;
2931
2932 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2937}
2938
2939sub button_up {
2940 my ($self, $ev, $x, $y) = @_;
2941
2942 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB;
2944 $self->hide;
2945
2054 $self->emit ("open"); 2946 $self->_emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover};
2055 } else { 2948 } else {
2056 $CFClient::UI::ROOT->remove ($self->{other}); 2949 return 0
2057 $self->emit ("close"); 2950 }
2951
2058 } 2952 1
2059
2060 $self->emit (changed => $self->{state});
2061} 2953}
2062 2954
2063############################################################################# 2955#############################################################################
2064 2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
3061}
3062
3063#############################################################################
3064
3065package CFClient::UI::Statusbox;
3066
3067our @ISA = CFClient::UI::VBox::;
3068
3069sub new {
3070 my $class = shift;
3071
3072 $class->SUPER::new (
3073 fontsize => 0.8,
3074 @_,
3075 )
3076}
3077
3078sub reorder {
3079 my ($self) = @_;
3080 my $NOW = time;
3081
3082 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 }
3085
3086 my @widgets;
3087
3088 my @items = sort {
3089 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} };
3092
3093 my $count = 10 + 1;
3094 for my $item (@items) {
3095 last unless --$count;
3096
3097 push @widgets, $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text};
3102
3103 for ($short) {
3104 s/^\s+//;
3105 s/\s+/ /g;
3106 }
3107
3108 new CFClient::UI::Label
3109 markup => $short,
3110 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg},
3116 can_events => 1,
3117 can_hover => 1
3118 };
3119 }
3120
3121 $self->clear;
3122 $self->SUPER::add (reverse @widgets);
3123}
3124
3125sub add {
3126 my ($self, $text, %arg) = @_;
3127
3128 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
3132
3133 my $timeout = time + ((delete $arg{timeout}) || 60);
3134
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136
3137 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) {
3139 $item->{count}++;
3140 } else {
3141 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text;
3143 }
3144 $item->{id} = ++$self->{id};
3145 $item->{timeout} = $timeout;
3146 delete $item->{label};
3147 } else {
3148 $self->{item}{$group} = {
3149 id => ++$self->{id},
3150 text => $text,
3151 timeout => $timeout,
3152 tooltip => $text,
3153 fg => [0.8, 0.8, 0.8, 0.8],
3154 pri => 0,
3155 count => 1,
3156 %arg,
3157 };
3158 }
3159
3160 $self->reorder;
3161}
3162
3163sub reconfigure {
3164 my ($self) = @_;
3165
3166 delete $_->{label}
3167 for values %{ $self->{item} || {} };
3168
3169 $self->reorder;
3170 $self->SUPER::reconfigure;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
2065package CFClient::UI::Root; 3470package CFClient::UI::Root;
2066 3471
2067our @ISA = CFClient::UI::Container::; 3472our @ISA = CFClient::UI::Container::;
2068 3473
2069use CFClient::OpenGL; 3474use CFClient::OpenGL;
2070 3475
2071sub check_size { 3476sub new {
2072 my ($self) = @_; 3477 my $class = shift;
2073 3478
2074 $self->configure (0, 0, $::WITH, $::HEIGHT); 3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
2075} 3487}
2076 3488
2077sub size_request { 3489sub size_request {
2078 ($::WIDTH, $::HEIGHT) 3490 my ($self) = @_;
2079}
2080 3491
2081sub configure { 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3507}
3508
3509sub size_allocate {
2082 my ($self, $x, $y, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2083 3511
2084 $self->SUPER::configure ($x, $y, $w, $h); 3512 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2085 3514
2086 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3515 $X = $child->{force_x} if exists $child->{force_x};
2087 for @{$self->{children}}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2088}
2089 3517
2090sub _topleft { 3518 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h};
3520
3521 $child->configure ($X, $Y, $W, $H);
3522 }
3523}
3524
3525sub coord2local {
2091 my ($self, $x, $y) = @_; 3526 my ($self, $x, $y) = @_;
2092 3527
2093 ($x, $y) 3528 ($x, $y)
2094} 3529}
2095 3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
2096sub update { 3537sub update {
2097 my ($self) = @_; 3538 my ($self) = @_;
2098 3539
2099 $self->check_size; 3540 $::WANT_REFRESH++;
2100 ::refresh ();
2101} 3541}
2102 3542
2103sub add { 3543sub add {
2104 my ($self, $child) = @_; 3544 my ($self, @children) = @_;
2105 3545
2106 # integerize window positions 3546 $_->{is_toplevel} = 1
2107 $child->{x} = int $child->{x}; 3547 for @children;
2108 $child->{y} = int $child->{y};
2109 3548
2110 $self->SUPER::add ($child); 3549 $self->SUPER::add (@children);
3550}
3551
3552sub remove {
3553 my ($self, @children) = @_;
3554
3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3559
3560 while (@children) {
3561 my $w = pop @children;
3562 push @children, $w->children;
3563 $w->set_invisible;
3564 }
2111} 3565}
2112 3566
2113sub on_refresh { 3567sub on_refresh {
2114 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2115 3569
2116 $self->{refresh_hook}{$id} = $cb; 3570 $self->{refresh_hook}{$id} = $cb;
2117} 3571}
2118 3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
2119sub draw { 3579sub draw {
2120 my ($self) = @_; 3580 my ($self) = @_;
2121 3581
2122 while (my $rcb = delete $self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2123 $_->() for values %$rcb; 3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
2124 } 3585 }
3586
3587 if ($self->{realloc}) {
3588 my %queue;
3589 my @queue;
3590 my $widget;
3591
3592 outer:
3593 while () {
3594 if (my $realloc = delete $self->{realloc}) {
3595 for $widget (values %$realloc) {
3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3602 }
3603
3604 while () {
3605 @queue or last outer;
3606
3607 $widget = pop @{ $queue[-1] || [] }
3608 and last;
3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3625 $widget->{req_w} = $w;
3626 $widget->{req_h} = $h;
3627
3628 $self->{size_alloc}{$widget+0} = $widget;
3629
3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3640 }
3641 }
3642
3643 while (my $size_alloc = delete $self->{size_alloc}) {
3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651
3652 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0;
3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3662 $widget->{w} = $w;
3663 $widget->{h} = $h;
3664
3665 $widget->emit (size_allocate => $w, $h);
3666 }
3667 }
3668 }
3669
3670 while ($self->{post_alloc_hook}) {
3671 $_->()
3672 for values %{delete $self->{post_alloc_hook}};
3673 }
3674
2125 3675
2126 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2127 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2128 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
2129 3679
2130 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
2131 glLoadIdentity; 3681 glLoadIdentity;
2132 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2133 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
2134 glLoadIdentity; 3684 glLoadIdentity;
2135 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
2136 $self->_draw; 3693 $self->_draw;
2137} 3694}
2138 3695
2139############################################################################# 3696#############################################################################
2140 3697
2141package CFClient::UI; 3698package CFClient::UI;
2142 3699
2143$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2144 3702
21451 37031
2146 3704

Diff Legend

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