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.148 by elmex, Sat Apr 22 12:14:45 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 abstract"; 337 Carp::confess "size_request is abstract";
… …
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 += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
158 $y += int +($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 872
587sub new { 873sub new {
588 my $class = shift; 874 my $class = shift;
589 875
590 my $self = $class->SUPER::new ( 876 $class->SUPER::new (
591 bg => [1, 1, 1, 1], 877 scroll_x => 0,
592 border_bg => [1, 1, 1, 1], 878 scroll_y => 1,
593 border => 0.8,
594 @_ 879 @_,
595 ); 880 )
596
597 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605} 881}
606 882
607sub size_request { 883sub size_request {
608 my ($self) = @_; 884 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h}) 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)
610} 892}
611 893
612sub size_allocate { 894sub size_allocate {
613 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
614 $self->{w} = $w; 896
615 $self->{h} = $h; 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
616 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
903 $self->update;
617} 904}
618 905
619sub _draw { 906sub set_offset {
620 my ($self) = @_; 907 my ($self, $x, $y) = @_;
621 908
622 my ($w, $h) = ($self->{w}, $self->{h}); 909 $self->{view_x} = int $x;
910 $self->{view_y} = int $y;
623 911
624 glEnable GL_BLEND; 912 $self->update;
625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 913}
626 glEnable GL_TEXTURE_2D;
627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
628 914
629# glBegin GL_QUADS; 915# hmm, this does not work for topleft of $self... but we should not ask for that
630# glColor 0, 0, 0, 0; 916sub coord2local {
631# glVertex 0 , 0; 917 my ($self, $x, $y) = @_;
632# glVertex 0 , $h;
633# glVertex $w, $h;
634# glVertex $w, 0;
635# glEnd;
636 918
919 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
920}
637 921
638 $self->child->draw; 922sub coord2global {
639 glDisable GL_BLEND; 923 my ($self, $x, $y) = @_;
640 glDisable GL_TEXTURE_2D; 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;
641} 952}
642 953
643############################################################################# 954#############################################################################
644 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
645package CFClient::UI::FancyFrame; 1017package CFClient::UI::Frame;
646 1018
647our @ISA = CFClient::UI::Bin::; 1019our @ISA = CFClient::UI::Bin::;
648 1020
649use CFClient::OpenGL; 1021use CFClient::OpenGL;
650
651my @tex =
652 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
653 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
654 1022
655sub new { 1023sub new {
656 my $class = shift; 1024 my $class = shift;
657 1025
658 # TODO: user_x, user_y, overwrite moveto? 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};
659 1075
660 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
663 border => 0.8, 1079 border => 0.6,
664 @_ 1080 can_events => 1,
1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
665 ); 1084 );
666 1085
667 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
668 align => 0, 1087 align => 0,
669 valign => 1, 1088 valign => 1,
670 text => $self->{title}, 1089 text => $title,
671 fontsize => 1; 1090 fontsize => $self->{border}
1091 if defined $title;
672 1092
673 $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};
674} 1101}
675 1102
676sub border { 1103sub border {
677 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
678} 1105}
679 1106
680sub size_request { 1107sub size_request {
681 my ($self) = @_; 1108 my ($self) = @_;
682 1109
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1110 $self->{title}->size_request
1111 if $self->{title};
684 1112
685 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
686 1114
687 ( 1115 (
688 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
691} 1119}
692 1120
693sub size_allocate { 1121sub size_allocate {
694 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
695 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
696 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
697 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
698 1134
699 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
700 if $self->{title};
701
702 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
703} 1136}
704 1137
705sub button_down { 1138sub button_down {
706 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
707 1140
1141 my ($w, $h) = @$self{qw(w h)};
708 my $border = $self->border; 1142 my $border = $self->border;
709 1143
710 if ($x < $self->{w} && $x >= $self->{w} - $border 1144 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711 && $y < $self->{h} && $y >= $self->{h} - $border) { 1145 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712 1146
1147 if ($lr & $td) {
1148 my ($wx, $wy) = ($self->{x}, $self->{y});
713 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1149 my ($ox, $oy) = ($ev->{x}, $ev->{y});
714 my ($bw, $bh) = ($self->{w}, $self->{h}); 1150 my ($bw, $bh) = ($self->{w}, $self->{h});
715 1151
1152 my $mx = $x < $border;
1153 my $my = $y < $border;
1154
716 $self->{motion} = sub { 1155 $self->{motion} = sub {
717 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
718 1157
719 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 my $dx = $ev->{x} - $ox;
1159 my $dy = $ev->{y} - $oy;
720 1160
721 $self->{user_w} = $bw + $x - $ox; 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
722 $self->{user_h} = $bh + $y - $oy; 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
723 $self->check_size; 1163
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc;
724 }; 1166 };
725 1167
726 } elsif ($x >= 0 && $x < $self->{w} 1168 } elsif ($lr ^ $td) {
727 && $y >= 0 && $y < $border) {
728
729 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
730 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
731 1171
732 $self->{motion} = sub { 1172 $self->{motion} = sub {
733 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
734 1174
735 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
736 1176
737 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
738 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
739 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
740 } 1185 1
741} 1186}
742 1187
743sub button_up { 1188sub button_up {
744 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
745 1190
746 delete $self->{motion}; 1191 !!delete $self->{motion}
747} 1192}
748 1193
749sub mouse_motion { 1194sub mouse_motion {
750 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
751 1196
752 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
753} 1200}
754 1201
755sub _draw { 1202sub _draw {
756 my ($self) = @_; 1203 my ($self) = @_;
757 1204
1205 my $child = $self->{children}[0];
1206
758 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
759 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
760 1209
761 glEnable GL_BLEND;
762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
763 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
765 1212
766 my $border = $self->border; 1213 my $border = $self->border;
767 1214
768 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
769 $tex[1]->draw_quad (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
770 $tex[3]->draw_quad (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
771 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
772 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
773 1220
774 my $bg = $tex[0]; 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} };
775 1223
776 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
777 my $rep_x = $cw / $bg->{w}; 1225 # solve this better(?)
778 my $rep_y = $ch / $bg->{h}; 1226 $bg->{s} = $cw / $bg->{w};
779 1227 $bg->{t} = $ch / $bg->{h};
780 glColor @{ $self->{bg} };
781
782 $bg->{s} = $rep_x;
783 $bg->{t} = $rep_y;
784 $bg->{wrap_mode} = 1;
785 $bg->draw_quad ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1229 }
786 1230
787 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
788 glDisable GL_BLEND;
789 1232
790 $self->{title}->draw if $self->{title};
791 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
792} 1239}
793 1240
794############################################################################# 1241#############################################################################
795 1242
796package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
804sub new { 1251sub new {
805 my $class = shift; 1252 my $class = shift;
806 1253
807 $class->SUPER::new ( 1254 $class->SUPER::new (
808 col_expand => [], 1255 col_expand => [],
809 @_ 1256 @_,
810 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
811} 1262}
812 1263
813sub add { 1264sub add {
814 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
815 1266
816 $child->set_parent ($self); 1267 $child->set_parent ($self);
817 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
818 1269
819 $child->check_size; 1270 $self->realloc;
820} 1271}
821 1272
822# 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?
823sub clear { 1274sub clear {
824 my ($self) = @_; 1275 my ($self) = @_;
825 1276
1277 my @children = $self->children;
826 delete $self->{children}; 1278 delete $self->{children};
827 $self->update; 1279
1280 for (@children) {
1281 delete $_->{parent};
1282 $_->hide;
1283 }
1284
1285 $self->realloc;
828} 1286}
829 1287
830sub get_wh { 1288sub get_wh {
831 my ($self) = @_; 1289 my ($self) = @_;
832 1290
… …
837 or next; 1295 or next;
838 1296
839 for my $x (0 .. $#$row) { 1297 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 1298 my $widget = $row->[$x]
841 or next; 1299 or next;
842 my ($w, $h) = $widget->size_request; 1300 my ($w, $h) = @$widget{qw(req_w req_h)};
843 1301
844 $w[$x] = max $w[$x], $w; 1302 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 1303 $h[$y] = max $h[$y], $h;
846 } 1304 }
847 } 1305 }
… …
863sub size_allocate { 1321sub size_allocate {
864 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
865 1323
866 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
867 1325
868 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
869 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
870 1328
871 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
872 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
873 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
874 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
928 } 1386 }
929} 1387}
930 1388
931############################################################################# 1389#############################################################################
932 1390
933package CFClient::UI::HBox; 1391package CFClient::UI::Box;
934
935# TODO: wrap into common Box base class
936 1392
937our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
938 1394
939sub size_request { 1395sub size_request {
940 my ($self) = @_; 1396 my ($self) = @_;
941 1397
942 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
943 1399 ? (
944 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
945 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
946 (List::Util::max map $_->[1], @alloc), 1402 )
947 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
948} 1407}
949 1408
950sub size_allocate { 1409sub size_allocate {
951 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
952 1411
953 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
954
955 my $children = $self->{children}; 1413 my $children = $self->{children};
956 1414
957 my @h = map +($_->size_request)[0], @$children; 1415 my @req;
958 1416
959 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
960 1418 @req = ($space / (@$children || 1)) x @$children;
961 if ($req_h > $h) {
962 # ah well, not enough space
963 $_ *= $h / $req_h for @h;
964 } 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 {
965 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
966 $exp ||= 1;
967 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
968 for (0 .. $#$children) { 1432 for 0 .. $#$children;
969 my $child = $children->[$_];
970
971 my $alloc_h = $h[$_];
972 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
973 $h[$_] = $alloc_h;
974 } 1433 }
975 } 1434 }
976 1435
977 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
978 1437
979 my $y = 0; 1438 my $pos = 0;
980 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
981 my $child = $children->[$_];
982 my $h = $h[$_]; 1440 my $alloc = $req[$_];
983 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
984 1442
985 $y += $h; 1443 $pos += $alloc;
986 } 1444 }
987 1445
988 1 1446 1
989} 1447}
990 1448
991############################################################################# 1449#############################################################################
992 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
993package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
994 1467
995# TODO: wrap into common Box base class
996
997our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
998 1469
999sub size_request { 1470sub new {
1000 my ($self) = @_; 1471 my $class = shift;
1001 1472
1002 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1003 1474 vertical => 1,
1004 ( 1475 @_,
1005 (List::Util::max map $_->[0], @alloc),
1006 (List::Util::sum map $_->[1], @alloc),
1007 ) 1476 )
1008} 1477}
1009 1478
1010sub size_allocate {
1011 my ($self, $w, $h) = @_;
1012
1013 my $children = $self->{children};
1014
1015 my @h = map +($_->size_request)[1], @$children;
1016
1017 my $req_h = List::Util::sum @h;
1018
1019 if ($req_h > $h) {
1020 # ah well, not enough space
1021 $_ *= $h / $req_h for @h;
1022 } else {
1023 my $exp = List::Util::sum map $_->{expand}, @$children;
1024 $exp ||= 1;
1025
1026 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028
1029 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1030 }
1031 }
1032
1033 CFClient::UI::harmonize \@h;
1034
1035 my $y = 0;
1036 for (0 .. $#$children) {
1037 my $child = $children->[$_];
1038 my $h = $h[$_];
1039 $child->configure (0, $y, $w, $h);
1040
1041 $y += $h;
1042 }
1043
1044 1
1045}
1046
1047############################################################################# 1479#############################################################################
1048 1480
1049package CFClient::UI::Label; 1481package CFClient::UI::Label;
1050 1482
1051our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1052 1484
1053use CFClient::OpenGL; 1485use CFClient::OpenGL;
1054 1486
1055sub new { 1487sub new {
1056 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1057 1489
1058 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1059 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),
1060 fontsize => 1, 1500 fontsize => 1,
1061 text => "",
1062 align => -1, 1501 align => -1,
1063 valign => -1, 1502 valign => -1,
1064 padding => 2, 1503 padding_x => 2,
1065 layout => new CFClient::Layout, 1504 padding_y => 2,
1505 can_events => 0,
1066 %arg 1506 %arg
1067 ); 1507 );
1068 1508
1069 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1510 my $layout = new CFClient::Layout;
1071 $layout->set_text (delete $self->{template}); 1511 $layout->set_text (delete $self->{template});
1072 $self->{template} = $layout; 1512 $self->{template} = $layout;
1073 } 1513 }
1074 1514
1075 $self->set_text (delete $self->{text}) if exists $self->{text}; 1515 if (exists $self->{markup}) {
1076 $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 }
1077 1520
1078 $self 1521 $self
1079} 1522}
1080 1523
1081sub escape_text { 1524sub escape($) {
1082 local $_ = $_[1]; 1525 local $_ = $_[0];
1083 1526
1084 s/&/&amp;/g; 1527 s/&/&amp;/g;
1085 s/>/&gt;/g; 1528 s/>/&gt;/g;
1086 s/</&lt;/g; 1529 s/</&lt;/g;
1087 1530
1088 $_[1] 1531 $_
1532}
1533
1534sub update {
1535 my ($self) = @_;
1536
1537 delete $self->{texture};
1538 $self->SUPER::update;
1089} 1539}
1090 1540
1091sub set_text { 1541sub set_text {
1092 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1093 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;
1094 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1095 1549
1096 delete $self->{texture}; 1550 $self->realloc;
1097 $self->update; 1551 $self->update;
1098} 1552}
1099 1553
1100sub set_markup { 1554sub set_markup {
1101 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1102 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;
1103 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1104 1564
1105 delete $self->{texture}; 1565 $self->realloc;
1106 $self->update; 1566 $self->update;
1107} 1567}
1108 1568
1109sub size_request { 1569sub size_request {
1110 my ($self) = @_; 1570 my ($self) = @_;
1111 1571
1112 $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});
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1577
1115 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1116 1579
1117 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1583
1120 my ($w2, $h2) = $self->{template}->size; 1584 my ($w2, $h2) = $self->{template}->size;
1121 1585
1122 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1123 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1124 } 1588 }
1125 1589
1126 ( 1590 ($w, $h)
1127 $w + $self->{padding} * 2,
1128 $h + $self->{padding} * 2,
1129 )
1130} 1591}
1131 1592
1132sub size_allocate { 1593sub size_allocate {
1133 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1134 1595
1596 delete $self->{ox};
1597
1135 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1136} 1600}
1137 1601
1138sub set_fontsize { 1602sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1140 1604
1141 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1142 $self->check_size; 1606 delete $self->{texture};
1607
1608 $self->realloc;
1143} 1609}
1144 1610
1145sub _draw { 1611sub _draw {
1146 my ($self) = @_; 1612 my ($self) = @_;
1147 1613
1614 $self->SUPER::_draw; # draw background, if applicable
1615
1148 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};
1149 $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});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623
1151 new_from_layout CFClient::Texture $self->{layout} 1624 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1625 };
1153 1626
1154 glEnable GL_BLEND; 1627 unless (exists $self->{ox}) {
1155 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
1156 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1158 1639
1159 glColor @{$self->{fg}}; 1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1160 1642
1161 $self->{ox} = int (
1162 $self->{align} < 0 ? $self->{padding}
1163 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1164 : ($self->{w} - $tex->{w}) * 0.5
1165 );
1166
1167 $self->{oy} = int (
1168 $self->{valign} < 0 ? $self->{padding}
1169 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1170 : ($self->{h} - $tex->{h}) * 0.5
1171 );
1172
1173 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1174 1644
1175 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1176 glDisable GL_BLEND;
1177} 1646}
1178 1647
1179############################################################################# 1648#############################################################################
1180 1649
1181package CFClient::UI::EntryBase; 1650package CFClient::UI::EntryBase;
… …
1186 1655
1187sub new { 1656sub new {
1188 my $class = shift; 1657 my $class = shift;
1189 1658
1190 $class->SUPER::new ( 1659 $class->SUPER::new (
1191 fg => [1, 1, 1], 1660 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1661 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1662 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1195 can_hover => 1, 1664 can_hover => 1,
1196 can_focus => 1, 1665 can_focus => 1,
1197 valign => 0, 1666 valign => 0,
1667 can_events => 1,
1668 #text => ...
1198 @_ 1669 @_
1199 ) 1670 )
1200} 1671}
1201 1672
1202sub _set_text { 1673sub _set_text {
… …
1204 1675
1205 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1206 1677
1207 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1208 1679
1209 delete $self->{texture};
1210
1211 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1212 $self->{text} = $text; 1681 $self->{text} = $text;
1213 1682
1214 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1215 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1216 1685
1217 $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;
1218} 1697}
1219 1698
1220sub get_text { 1699sub get_text {
1221 $_[0]{text} 1700 $_[0]{text}
1222} 1701}
… …
1225 my ($self) = @_; 1704 my ($self) = @_;
1226 1705
1227 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1228 1707
1229 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1230}
1231
1232sub size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 $self->_set_text ($self->{text});
1236}
1237
1238sub set_text {
1239 my ($self, $text) = @_;
1240
1241 $self->{cursor} = length $text;
1242 $self->_set_text ($text);
1243 $self->update;
1244} 1709}
1245 1710
1246sub key_down { 1711sub key_down {
1247 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1248 1713
… …
1250 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1251 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1252 1717
1253 my $text = $self->get_text; 1718 my $text = $self->get_text;
1254 1719
1255 if ($sym == 8) { 1720 if ($uni == 8) {
1256 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1257 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1258 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1259 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1260 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1261 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1262 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1263 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1264 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1265 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1266 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1267 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1268 $self->emit ('escape'); 1733 $self->_emit ('escape');
1269 } elsif ($uni) { 1734 } elsif ($uni) {
1270 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1271 } 1738 }
1272 1739
1273 $self->_set_text ($text); 1740 $self->_set_text ($text);
1274 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1275} 1745}
1276 1746
1277sub focus_in { 1747sub focus_in {
1278 my ($self) = @_; 1748 my ($self) = @_;
1279 1749
… …
1294 utf8::encode $text; 1764 utf8::encode $text;
1295 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1296 1766
1297 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1298 $self->update; 1768 $self->update;
1769
1770 1
1299} 1771}
1300 1772
1301sub mouse_motion { 1773sub mouse_motion {
1302 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1303# 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
1304} 1778}
1305 1779
1306sub _draw { 1780sub _draw {
1307 my ($self) = @_; 1781 my ($self) = @_;
1308 1782
1309 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1310 1784
1311 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1312 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1313 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1314 } else { 1788 } else {
1315 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1316 } 1790 }
1317 1791
1318 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1319 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1320 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1321 glVertex 0 , 0; 1795 glVertex 0 , 0;
1322 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1323 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1324 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1355 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1356 1830
1357 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1358 1832
1359 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} = '';
1360 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1361 $self->update; 1839 $self->update;
1362 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
1363 } else { 1863 } else {
1364 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1365 } 1867 1
1366
1367} 1868}
1368 1869
1369############################################################################# 1870#############################################################################
1370 1871
1371package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1380 1881
1381sub new { 1882sub new {
1382 my $class = shift; 1883 my $class = shift;
1383 1884
1384 $class->SUPER::new ( 1885 $class->SUPER::new (
1385 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1386 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1389 can_hover => 1, 1890 can_hover => 1,
1390 align => 0, 1891 align => 0,
1391 valign => 0, 1892 valign => 0,
1893 can_events => 1,
1392 @_ 1894 @_
1393 ) 1895 )
1394} 1896}
1395 1897
1898sub activate { }
1899
1396sub button_up { 1900sub button_up {
1397 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1398 1902
1903 $self->emit ("activate")
1399 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1400 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1401 $self->emit ("activate"); 1906
1402 } 1907 1
1403} 1908}
1404 1909
1405sub _draw { 1910sub _draw {
1406 my ($self) = @_; 1911 my ($self) = @_;
1407 1912
1408 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1409 1914
1410 if ($GRAB == $self) {
1411 $self->{fg} = $self->{active_fg};
1412 }
1413
1414 glEnable GL_BLEND;
1415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1416 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1419 1918
1420 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1421 1920
1422 glDisable GL_TEXTURE_2D; 1921 glDisable GL_TEXTURE_2D;
1423 glDisable GL_BLEND;
1424 1922
1425 $self->SUPER::_draw; 1923 $self->SUPER::_draw;
1426} 1924}
1427 1925
1428############################################################################# 1926#############################################################################
… …
1439 1937
1440sub new { 1938sub new {
1441 my $class = shift; 1939 my $class = shift;
1442 1940
1443 $class->SUPER::new ( 1941 $class->SUPER::new (
1444 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1445 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1446 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],
1447 state => 0, 1948 state => 0,
1448 can_hover => 1, 1949 can_hover => 1,
1449 @_ 1950 @_
1450 ) 1951 )
1451} 1952}
1452 1953
1453sub size_request { 1954sub size_request {
1454 my ($self) = @_; 1955 my ($self) = @_;
1455 1956
1456 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1457} 1958}
1458 1959
1459sub button_down { 1960sub button_down {
1460 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1461 1962
1462 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1463 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1464 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1465 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1466 } 1971 1
1467} 1972}
1468 1973
1469sub _draw { 1974sub _draw {
1470 my ($self) = @_; 1975 my ($self) = @_;
1471 1976
1472 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1473 1978
1474 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1475 1980
1476 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;
1477 1984
1478 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1479 1986
1480 glEnable GL_BLEND; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1988
1481 glEnable GL_TEXTURE_2D; 1989 glEnable GL_TEXTURE_2D;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483
1484 my $tex = $self->{state} ? $tex[1] : $tex[0];
1485
1486 $tex->draw_quad (0, 0, $s, $s); 1990 $tex->draw_quad_alpha (0, 0, $s, $s);
1487
1488 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1489 glDisable GL_BLEND;
1490} 1992}
1491 1993
1492############################################################################# 1994#############################################################################
1493 1995
1494package CFClient::UI::Image; 1996package CFClient::UI::Image;
… …
1501our %loaded_images; 2003our %loaded_images;
1502 2004
1503sub new { 2005sub new {
1504 my $class = shift; 2006 my $class = shift;
1505 2007
1506 my $self = $class->SUPER::new (@_); 2008 my $self = $class->SUPER::new (can_events => 0, @_);
1507 2009
1508 $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!";
1509 2011
1510 $loaded_images{$self->{image}} ||= 2012 $loaded_images{$self->{image}} ||=
1511 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;
… …
1537 glTranslate 0, -$self->{w}, 0; 2039 glTranslate 0, -$self->{w}, 0;
1538 2040
1539 ($w, $h) = ($h, $w); 2041 ($w, $h) = ($h, $w);
1540 } 2042 }
1541 2043
1542 glEnable GL_BLEND;
1543 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1544 glEnable GL_TEXTURE_2D; 2044 glEnable GL_TEXTURE_2D;
1545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1546 2046
1547 $tex->draw_quad (0, 0, $w, $h); 2047 $tex->draw_quad_alpha (0, 0, $w, $h);
1548 2048
1549 glDisable GL_BLEND;
1550 glDisable GL_TEXTURE_2D; 2049 glDisable GL_TEXTURE_2D;
1551} 2050}
1552 2051
1553############################################################################# 2052#############################################################################
1554 2053
1555package CFClient::UI::VGauge; 2054package CFClient::UI::VGauge;
1556 2055
1557our @ISA = CFClient::UI::Base::; 2056our @ISA = CFClient::UI::Base::;
2057
2058use List::Util qw(min max);
1558 2059
1559use CFClient::OpenGL; 2060use CFClient::OpenGL;
1560 2061
1561my %tex = ( 2062my %tex = (
1562 food => [ 2063 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 2066 ],
1566 grace => [ 2067 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 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/
1569 ], 2070 ],
1570 hp => [ 2071 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 2074 ],
1574 mana => [ 2075 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 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/
1577 ], 2078 ],
1578); 2079);
1579 2080
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 2081# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 2082sub new {
… …
1600} 2101}
1601 2102
1602sub set_max { 2103sub set_max {
1603 my ($self, $max) = @_; 2104 my ($self, $max) = @_;
1604 2105
2106 return if $self->{max_val} == $max;
2107
1605 $self->{max_val} = $max; 2108 $self->{max_val} = $max;
2109 $self->update;
1606} 2110}
1607 2111
1608sub set_value { 2112sub set_value {
1609 my ($self, $val, $max) = @_; 2113 my ($self, $val, $max) = @_;
1610 2114
1611 $self->set_max ($max) 2115 $self->set_max ($max)
1612 if defined $max; 2116 if defined $max;
1613 2117
1614 $max = $self->{max_val}; 2118 return if $self->{val} == $val;
2119
1615 $self->{val} = $val; 2120 $self->{val} = $val;
1616
1617 $self->update; 2121 $self->update;
1618} 2122}
1619 2123
1620sub _draw { 2124sub _draw {
1621 my ($self) = @_; 2125 my ($self) = @_;
1622 2126
1623 my $tex = $tex{$self->{type}}; 2127 my $tex = $tex{$self->{type}};
2128 my ($t1, $t2, $t3) = @$tex;
1624 2129
1625 my ($w, $h) = ($self->{w}, $self->{h}); 2130 my ($w, $h) = ($self->{w}, $self->{h});
1626 2131
1627 if ($self->{vertical}) { 2132 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 2133 glRotate 90, 0, 0, 1;
… …
1630 2135
1631 ($w, $h) = ($h, $w); 2136 ($w, $h) = ($h, $w);
1632 } 2137 }
1633 2138
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 2139 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 2140
1637 my $t1 = $tex->[0]; 2141 my $ycut1 = max 0, min 1, $ycut;
1638 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);
1639 2146
1640 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1641 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;
1642 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 2152
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 2155 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2156 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2157 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2158 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 2159 glEnd;
1655 2160
2161 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2164 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2165 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2166 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2167 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 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 }
1663 2179
1664 glDisable GL_BLEND; 2180 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 2181 glDisable GL_TEXTURE_2D;
1666} 2182}
1667 2183
… …
1670package CFClient::UI::Gauge; 2186package CFClient::UI::Gauge;
1671 2187
1672our @ISA = CFClient::UI::VBox::; 2188our @ISA = CFClient::UI::VBox::;
1673 2189
1674sub new { 2190sub new {
1675 my ($class, %arg) = shift; 2191 my ($class, %arg) = @_;
1676 2192
1677 my $self = $class->SUPER::new ( 2193 my $self = $class->SUPER::new (
1678 @_, 2194 tooltip => $arg{type},
2195 can_hover => 1,
2196 can_events => 1,
2197 %arg,
1679 ); 2198 );
1680 2199
1681 $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");
1682 $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);
1683 $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");
1684 2203
1685 $self 2204 $self
1686} 2205}
1687 2206
1688sub set_fontsize { 2207sub set_fontsize {
… …
1690 2209
1691 $self->{value}->set_fontsize ($fsize); 2210 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 2211 $self->{max} ->set_fontsize ($fsize);
1693} 2212}
1694 2213
2214sub set_max {
2215 my ($self, $max) = @_;
2216
2217 $self->{gauge}->set_max ($max);
2218 $self->{max}->set_text ($max);
2219}
2220
1695sub set_value { 2221sub set_value {
1696 my ($self, $val, $max) = @_; 2222 my ($self, $val, $max) = @_;
1697 2223
1698 $self->set_max ($max) 2224 $self->set_max ($max)
1699 if defined $max; 2225 if defined $max;
1700 2226
1701 $self->{gauge}->set_value ($val, $max); 2227 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 2228 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 2229}
1711 2230
1712############################################################################# 2231#############################################################################
1713 2232
1714package CFClient::UI::Slider; 2233package CFClient::UI::Slider;
… …
1724 qw(s1_slider.png s1_slider_bg.png); 2243 qw(s1_slider.png s1_slider_bg.png);
1725 2244
1726sub new { 2245sub new {
1727 my $class = shift; 2246 my $class = shift;
1728 2247
1729 # range [value, low, high, page] 2248 # range [value, low, high, page, unit]
1730 2249
1731 # TODO: 0-width page 2250 # TODO: 0-width page
1732 # TODO: req_w/h are wrong with vertical 2251 # TODO: req_w/h are wrong with vertical
1733 # TODO: calculations are off 2252 # TODO: calculations are off
1734 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
1735 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
1736 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],
1737 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
1738 req_w => 20, 2259 min_w => $::WIDTH / 80,
1739 req_h => 20, 2260 min_h => $::WIDTH / 80,
1740 vertical => 0, 2261 vertical => 0,
1741 can_hover => 1, 2262 can_hover => 1,
1742 inner_pad => 5, 2263 inner_pad => 0.02,
1743 @_ 2264 @_
1744 ); 2265 );
1745 2266
2267 $self->set_value ($self->{range}[0]);
2268 $self->update;
2269
1746 $self 2270 $self
1747} 2271}
1748 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
1749sub size_request { 2307sub size_request {
1750 my ($self) = @_; 2308 my ($self) = @_;
1751 2309
1752 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
1753 my $h = $self->{req_h};
1754
1755 $self->{vertical} ? ($h, $w) : ($w, $h)
1756} 2311}
1757 2312
1758sub button_down { 2313sub button_down {
1759 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
1760 2315
1761 $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
1762 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
1763} 2321}
1764 2322
1765sub mouse_motion { 2323sub mouse_motion {
1766 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
1767 2325
1768 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
1769 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
1770 2356
1771 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1772 2358
1773 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1774 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1775 2361
1776 $x -= $inner_pad_px; # substract the padding 2362 $value = ($value - $lo) / $range;
1777 $x = $x * ($hi - $lo) / $inner_w + $lo; 2363 $value = $value * $self->{scale} + $self->{offset};
1778 $x = $lo if $x < $lo;
1779 $x = $hi - $page if $x > $hi - $page;
1780 $self->{range}[0] = $x;
1781 2364
1782 $self->emit (changed => $x); 2365 $self->{knob_x} = $value - $knob_w * 0.5;
1783 $self->update; 2366 $self->{knob_w} = $knob_w;
1784 } 2367 }
1785}
1786
1787# the inner_* stuff is for generating a padding for the slider handle,
1788# so that the handle doesn't leave the texture. This calculation isn't 100%
1789# correct propably, but it does the job for now
1790sub _calc_inner_pad_px {
1791 my ($self, $w) = @_;
1792 ($w / 100) * $self->{inner_pad} # % to pixels
1793}
1794
1795sub _draw {
1796 my ($self) = @_;
1797 2368
1798 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
1799 2370
1800 my ($w, $h) = @$self{qw(w h)}; 2371 glScale $self->{w}, $self->{h};
1801 2372
1802 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
1803 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
1804 2375
2376 glTranslate 1, 0, 0;
1805 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
1806 glTranslate 0, -$self->{w}, 0;
1807
1808 ($w, $h) = ($h, $w);
1809 } 2378 }
1810 2379
1811 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1812 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1813 2382
1814 my ($value, $lo, $hi, $page) = @{$self->{range}};
1815
1816 $hi = $value + 1 if $lo == $hi;
1817
1818 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1819 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1820
1821 $page = int $page * $inner_w / ($hi - $lo);
1822 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1823
1824 $w -= $page;
1825 $page &= ~1;
1826 glTranslate $page * 0.5, 0, 0;
1827 $page ||= 2;
1828
1829 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1830 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1831
1832 glEnable GL_BLEND;
1833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1834 glEnable GL_TEXTURE_2D; 2383 glEnable GL_TEXTURE_2D;
1835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1836 2385
1837 # draw background 2386 # draw background
1838 $tex[1]->draw_quad (0, 0, $w, $h); 2387 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1839 2388
1840 # draw handle 2389 # draw handle
1841 $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);
1842 2391
1843 glDisable GL_BLEND;
1844 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
1845} 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 (@_) }
1846 2435
1847############################################################################# 2436#############################################################################
1848 2437
1849package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
1850 2439
… …
1854 2443
1855sub new { 2444sub new {
1856 my $class = shift; 2445 my $class = shift;
1857 2446
1858 my $self = $class->SUPER::new ( 2447 my $self = $class->SUPER::new (
1859 fontsize => 1, 2448 fontsize => 1,
2449 can_events => 0,
2450 #font => default_font
1860 @_, 2451 @_,
1861 2452
1862 layout => (new CFClient::Layout), 2453 layout => (new CFClient::Layout 1),
1863 par => [], 2454 par => [],
1864 height => 0, 2455 height => 0,
1865 children => [ 2456 children => [
1866 (new CFClient::UI::Empty expand => 1), 2457 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2458 (new CFClient::UI::Slider vertical => 1),
1868 ], 2459 ],
1869 ); 2460 );
1870 2461
1871 $self->{children}[1]->connect (changed => sub { 2462 $self->{children}[1]->connect (changed => sub { $self->update });
1872 $self->update;
1873 });
1874 2463
1875 $self 2464 $self
1876} 2465}
1877 2466
1878sub set_fontsize { 2467sub set_fontsize {
… …
1880 2469
1881 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
1882 $self->reflow; 2471 $self->reflow;
1883} 2472}
1884 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
1885sub text_height { 2486sub text_size {
1886 my ($self, $text) = @_; 2487 my ($self, $text, $indent) = @_;
1887 2488
1888 my $layout = $self->{layout}; 2489 my $layout = $self->{layout};
1889 2490
1890 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891 $layout->set_width ($self->{w}); 2492 $layout->set_width ($self->{children}[0]{w} - $indent);
1892 $layout->set_text ($text); 2493 $layout->set_markup ($text);
1893 2494
1894 ($layout->size)[1] 2495 $layout->size
1895} 2496}
1896 2497
1897sub reflow { 2498sub reflow {
1898 my ($self) = @_; 2499 my ($self) = @_;
1899 2500
1900 $self->{need_reflow}++; 2501 $self->{need_reflow}++;
1901 $self->update; 2502 $self->update;
1902} 2503}
1903 2504
1904sub 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 {
1905 my ($self, $w, $h) = @_; 2513 my ($self) = @_;
1906 2514
1907 $self->SUPER::size_allocate ($w, $h); 2515 $self->{par} = [];
1908 2516 $self->{height} = 0;
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1910 $self->{layout}->set_width ($self->{children}[0]{w});
1911
1912 $self->reflow;
1913} 2518}
1914 2519
1915sub add_paragraph { 2520sub add_paragraph {
1916 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
1917 2522
1918 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
1919 2524 my ($w, $h) = $self->text_size ($line);
1920 my $height = $self->text_height ($text);
1921
1922 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
1923 2528
1924 push @{$self->{par}}, [$height, $color, $text];
1925
1926 $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]);
1927 $self->{children}[1]->update;
1928} 2530}
1929 2531
1930sub update { 2532sub update {
1931 my ($self) = @_; 2533 my ($self) = @_;
1932 2534
… …
1934 2536
1935 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
1936 2538
1937 delete $self->{texture}; 2539 delete $self->{texture};
1938 2540
1939 $ROOT->on_refresh ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
1940 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
1941 my $height = 0; 2545 my $height = 0;
1942 2546
1943 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
1944 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 }
1945 2562
1946 $self->{height} = $height; 2563 $self->{height} = $height;
1947 2564
1948 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1949 2566
1950 delete $self->{texture}; 2567 delete $self->{texture};
1951 } 2568 }
1952 2569
1953 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1954 glClearColor 0, 0, 0, 1; 2571 glClearColor 0, 0, 0, 0;
1955 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
1956 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
1957 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
1958 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1959 glEnable GL_TEXTURE_2D;
1960 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1961
1962 my $top = int $self->{children}[1]{range}[0];
1963
1964 my $y0 = $top;
1965 my $y1 = $top + $self->{h};
1966
1967 my $y = 0;
1968
1969 my $layout = $self->{layout};
1970 2588
1971 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2590 my $h = $par->[1];
1973 2591
1974 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]);
1975 $layout->set_text ($par->[2]); 2595 $layout->set_markup ($par->[4]);
1976 2596
1977 glColor @{ $par->[1] }; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1978 my ($W, $H) = $layout->size; 2598
1979 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;
1980 } 2601 }
1981 2602
1982 $y += $h; 2603 $y += $h;
1983 } 2604 }
1984 2605
1985 glDisable GL_TEXTURE_2D;
1986 glDisable GL_BLEND; 2606 glDisable GL_BLEND;
1987 }; 2607 };
1988 }); 2608 });
1989} 2609}
1990 2610
1991sub _draw { 2611sub _draw {
1992 my ($self) = @_; 2612 my ($self) = @_;
1993 2613
1994 if ($self->{texture}) {
1995 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 $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});
1998 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
1999 }
2000 2619
2001 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2002 2621
2003} 2622}
2004 2623
… …
2052 2671
2053sub new { 2672sub new {
2054 my $class = shift; 2673 my $class = shift;
2055 2674
2056 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2057 state => 0, 2676 state => 0,
2058 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2059 @_ 2678 @_
2060 ); 2679 );
2061 2680
2062 if ($self->{state}) {
2063 $self->{state} = 0;
2064 $self->toggle_flopper;
2065 }
2066
2067 $self 2681 $self
2068} 2682}
2069 2683
2070sub toggle_flopper { 2684sub toggle_flopper {
2071 my ($self) = @_; 2685 my ($self) = @_;
2072 2686
2073 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2074 if ($self->{state} = !$self->{state}) { 2688}
2075 $CFClient::UI::ROOT->add ($self->{other}); 2689
2076 $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
2077 $self->emit ("open"); 2946 $self->_emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover};
2078 } else { 2948 } else {
2079 $CFClient::UI::ROOT->remove ($self->{other}); 2949 return 0
2080 $self->emit ("close"); 2950 }
2951
2081 } 2952 1
2082
2083 $self->emit (changed => $self->{state});
2084} 2953}
2085 2954
2086############################################################################# 2955#############################################################################
2087 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
2088package CFClient::UI::Root; 3470package CFClient::UI::Root;
2089 3471
2090our @ISA = CFClient::UI::Container::; 3472our @ISA = CFClient::UI::Container::;
2091 3473
2092use CFClient::OpenGL; 3474use CFClient::OpenGL;
2093 3475
2094sub check_size { 3476sub new {
2095 my ($self) = @_; 3477 my $class = shift;
2096 3478
2097 $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
2098} 3487}
2099 3488
2100sub size_request { 3489sub size_request {
2101 ($::WIDTH, $::HEIGHT) 3490 my ($self) = @_;
2102}
2103 3491
2104sub 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 {
2105 my ($self, $x, $y, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2106 3511
2107 $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)};
2108 3514
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3515 $X = $child->{force_x} if exists $child->{force_x};
2110 for @{$self->{children}}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2111}
2112 3517
2113sub _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 {
2114 my ($self, $x, $y) = @_; 3526 my ($self, $x, $y) = @_;
2115 3527
2116 ($x, $y) 3528 ($x, $y)
2117} 3529}
2118 3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
2119sub update { 3537sub update {
2120 my ($self) = @_; 3538 my ($self) = @_;
2121 3539
2122 $self->check_size; 3540 $::WANT_REFRESH++;
2123 ::refresh ();
2124} 3541}
2125 3542
2126sub add { 3543sub add {
2127 my ($self, $child) = @_; 3544 my ($self, @children) = @_;
2128 3545
2129 # integerize window positions 3546 $_->{is_toplevel} = 1
2130 $child->{x} = int $child->{x}; 3547 for @children;
2131 $child->{y} = int $child->{y};
2132 3548
2133 $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 }
2134} 3565}
2135 3566
2136sub on_refresh { 3567sub on_refresh {
2137 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2138 3569
2139 $self->{refresh_hook}{$id} = $cb; 3570 $self->{refresh_hook}{$id} = $cb;
2140} 3571}
2141 3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
2142sub draw { 3579sub draw {
2143 my ($self) = @_; 3580 my ($self) = @_;
2144 3581
2145 while (my $rcb = delete $self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2146 $_->() for values %$rcb; 3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
2147 } 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
2148 3675
2149 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2150 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2151 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
2152 3679
2153 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
2154 glLoadIdentity; 3681 glLoadIdentity;
2155 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2156 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
2157 glLoadIdentity; 3684 glLoadIdentity;
2158 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
2159 $self->_draw; 3693 $self->_draw;
2160} 3694}
2161 3695
2162############################################################################# 3696#############################################################################
2163 3697
2164package CFClient::UI; 3698package CFClient::UI;
2165 3699
2166$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2167 3702
21681 37031
2169 3704

Diff Legend

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