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.140 by root, Thu Apr 20 04:20:52 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
14 71
15# class methods for events 72# class methods for events
16sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
18} 76}
19 77
20sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
22} 81}
23 82
24sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
25 my ($ev) = @_; 84 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 88 my $widget = $ROOT->find_widget ($x, $y);
30 89
31 $GRAB = $widget; 90 $GRAB = $widget;
32 $GRAB->update if $GRAB; 91 $GRAB->update if $GRAB;
92
93 check_tooltip;
33 } 94 }
34 95
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 97
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
38} 100}
39 101
40sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
41 my ($ev) = @_; 103 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
43 105
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 107
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 109
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
49 112
50 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 115 $grab->update if $grab;
53 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
117
118 check_tooltip;
54 } 119 }
55} 120}
56 121
57sub feed_sdl_motion_event { 122sub feed_sdl_motion_event {
58 my ($ev) = @_; 123 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 128 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 129 my $hover = $HOVER; $HOVER = $widget;
65 130
66 $hover->update if $hover && $hover->{can_hover}; 131 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 133
134 check_tooltip;
135 }
136
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
71} 139}
72 140
73# convert position array to integers 141# convert position array to integers
74sub harmonize { 142sub harmonize {
75 my ($vals) = @_; 143 my ($vals) = @_;
… …
81 $rem += $_ - $i; 149 $rem += $_ - $i;
82 $_ = $i; 150 $_ = $i;
83 } 151 }
84} 152}
85 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
86############################################################################# 195#############################################################################
87 196
88package CFClient::UI::Base; 197package CFClient::UI::Base;
89 198
90use strict; 199use strict;
… …
93 202
94sub new { 203sub new {
95 my $class = shift; 204 my $class = shift;
96 205
97 my $self = bless { 206 my $self = bless {
98 x => 0, 207 x => "center",
99 y => 0, 208 y => "center",
100 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
212 can_events => 1,
101 @_ 213 @_
102 }, $class; 214 }, $class;
103 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
104 for (keys %$self) { 218 for (keys %$self) {
105 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
107 } 221 }
108 } 222 }
109 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
110 $self 236 $self
111} 237}
112 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
113sub show { 246sub show {
114 my ($self) = @_; 247 my ($self) = @_;
115 248
116 return if $self->{parent}; 249 return if $self->{parent};
117 250
118 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
119} 252}
120 253
254sub set_visible {
255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
278
279 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self;
281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
121sub hide { 307sub hide {
122 my ($self) = @_; 308 my ($self) = @_;
123 309
124 return unless $self->{parent}; 310 $self->set_invisible;
125 311
126 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
127} 314}
128 315
129sub move { 316sub move_abs {
130 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
131 318
132 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
135 322
136 $self->update; 323 $self->update;
137} 324}
138 325
139sub needs_redraw { 326sub set_size {
140 0 327 my ($self, $w, $h) = @_;
328
329 $self->{force_w} = $w;
330 $self->{force_h} = $h;
331
332 $self->realloc;
141} 333}
142 334
143sub size_request { 335sub size_request {
144 require Carp; 336 require Carp;
145 Carp::confess "size_request is abtract"; 337 Carp::confess "size_request is abstract";
146} 338}
147 339
148sub configure { 340sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
150 342
151 $self->{x} = $x;
152 $self->{y} = $y;
153
154 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
155 $w = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
156 $h = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
157 }
158 348
159 return unless $self->{w} != $w || $self->{h} != $h; 349 # use alignment to adjust x, y
160 350
351 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h);
353 }
354
355 if ($self->{x} ne $x || $self->{y} ne $y) {
161 $self->{w} = $w; 356 $self->{x} = $x;
162 $self->{h} = $h; 357 $self->{y} = $y;
163
164 $self->size_allocate ($w, $h);
165 $self->update; 358 $self->update;
359 }
360
361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
368 }
166} 369}
167 370
168sub size_allocate { 371sub size_allocate {
169 # nothing to be done 372 # nothing to be done
170} 373}
171 374
172# return top left coordinates 375sub children {
173sub _topleft { 376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
383sub set_max_size {
174 my ($self, $x, $y) = @_; 384 my ($self, $w, $h) = @_;
175 385
176 $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 }
177} 404}
178 405
179# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
180sub coord2local { 407sub coord2local {
181 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
182 409
183 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
184 ($x - $X, $y - $Y)
185} 411}
186 412
187# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
188sub coord2global { 414sub coord2global {
189 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
190 416
191 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
192 ($x + $X, $y + $Y)
193} 418}
194 419
195sub focus_in { 420sub focus_in {
196 my ($self) = @_; 421 my ($self) = @_;
197 422
198 return if $FOCUS == $self; 423 return if $FOCUS == $self;
199 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
200 425
201 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
202 427
203 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
204 429
205 $focus->update if $focus; 430 $focus->update if $focus;
206 $FOCUS->update; 431 $FOCUS->update;
207} 432}
208 433
… …
211 436
212 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
213 438
214 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
215 440
216 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
217 442
218 $focus->update if $focus; #? 443 $focus->update if $focus; #?
219}
220 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
221sub mouse_motion { } 449sub mouse_motion { 0 }
222sub button_up { } 450sub button_up { 0 }
223sub key_down { } 451sub key_down { 0 }
224sub key_up { } 452sub key_up { 0 }
225 453
226sub button_down { 454sub button_down {
227 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
228 456
229 $self->focus_in; 457 $self->focus_in;
230}
231 458
232sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
233sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
234sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
235sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
236sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
237
238sub draw {
239 my ($self) = @_;
240
241 return unless $self->{h} && $self->{w};
242
243 glPushMatrix;
244 glTranslate $self->{x}, $self->{y}, 0;
245 $self->_draw;
246 glPopMatrix;
247
248 if ($self == $HOVER && $self->{can_hover}) {
249 my ($x, $y) = @$self{qw(x y)};
250
251 glColor 1, 0.8, 0.5, 0.2;
252 glEnable GL_BLEND;
253 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
254 glBegin GL_QUADS;
255 glVertex $x , $y;
256 glVertex $x + $self->{w}, $y;
257 glVertex $x + $self->{w}, $y + $self->{h};
258 glVertex $x , $y + $self->{h};
259 glEnd;
260 glDisable GL_BLEND;
261 } 459 0
262}
263
264sub _draw {
265 my ($self) = @_;
266
267 warn "no draw defined for $self\n";
268} 460}
269 461
270sub find_widget { 462sub find_widget {
271 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
272 466
273 return $self 467 return $self
274 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
275 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
276 470
… …
279 473
280sub set_parent { 474sub set_parent {
281 my ($self, $parent) = @_; 475 my ($self, $parent) = @_;
282 476
283 Scalar::Util::weaken ($self->{parent} = $parent); 477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
284} 479}
285 480
286sub 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 {
287 my ($self) = @_; 501 #my ($self, $visible) = @_;
502}
288 503
289 my ($w, $h) = $self->size_request; 504sub realloc {
505 my ($self) = @_;
290 506
291 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 {
292 $self->{req_w} = $w; 513 delete $self->{req_w};
293 $self->{req_h} = $h; 514 delete $self->{req_h};
294
295 $self->{parent}->check_size
296 if $self->{parent};
297 } 515 }
298} 516}
299 517
300sub update { 518sub update {
301 my ($self) = @_; 519 my ($self) = @_;
302 520
303 $self->{parent}->update 521 $self->{parent}->update
304 if $self->{parent}; 522 if $self->{parent};
305} 523}
306 524
307sub connect { 525sub reconfigure {
308 my ($self, $signal, $cb) = @_; 526 my ($self) = @_;
309 527
310 push @{ $self->{signal_cb}{$signal} }, $cb; 528 $self->realloc;
529 $self->update;
311} 530}
312 531
313sub emit { 532# using global variables seems a bit hacky, but passing through all drawing
314 my ($self, $signal, @args) = @_; 533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
315 535
316 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 536sub draw {
317 $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;
318 } 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";
319} 589}
320 590
321sub DESTROY { 591sub DESTROY {
322 my ($self) = @_; 592 my ($self) = @_;
323 593
594 delete $WIDGET{$self+0};
324 #$self->deactivate; 595 #$self->deactivate;
325} 596}
326 597
327############################################################################# 598#############################################################################
328 599
… …
337 my $class = shift; 608 my $class = shift;
338 609
339 # range [value, low, high, page] 610 # range [value, low, high, page]
340 611
341 $class->SUPER::new ( 612 $class->SUPER::new (
342 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
343 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
344 @_ 615 @_
345 ) 616 )
346} 617}
347 618
348sub _draw { 619sub _draw {
349 my ($self) = @_; 620 my ($self) = @_;
350 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
351 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
352 628
353 glEnable GL_BLEND; 629 glEnable GL_BLEND;
354 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
355 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
356 632
357 glBegin GL_QUADS; 633 glBegin GL_QUADS;
358 glVertex 0 , 0; 634 glVertex 0 , 0;
359 glVertex 0 , $h; 635 glVertex 0 , $h;
360 glVertex $w, $h; 636 glVertex $w, $h;
361 glVertex $w, 0; 637 glVertex $w, 0;
362 glEnd; 638 glEnd;
363 639
364 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
365} 642}
366 643
367############################################################################# 644#############################################################################
368 645
369package CFClient::UI::Empty; 646package CFClient::UI::Empty;
370
371our @ISA = CFClient::UI::Base::;
372
373sub size_request {
374 (0, 0)
375}
376
377sub draw { }
378
379#############################################################################
380
381package CFClient::UI::Container;
382 647
383our @ISA = CFClient::UI::Base::; 648our @ISA = CFClient::UI::Base::;
384 649
385sub new { 650sub new {
386 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg);
653}
387 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
388 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
389 673
390 my $self = $class->SUPER::new (children => [], %arg); 674 my $self = $class->SUPER::new (
675 children => [],
676 can_events => 0,
677 %arg,
678 );
679
391 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
392 682
393 $self 683 $self
394} 684}
395 685
396sub add { 686sub add {
397 my ($self, $child) = @_; 687 my ($self, @widgets) = @_;
398 688
399 $child->set_parent ($self); 689 $_->set_parent ($self)
690 for @widgets;
400 691
401 use sort 'stable'; 692 use sort 'stable';
402 693
403 $self->{children} = [ 694 $self->{children} = [
404 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
405 @{$self->{children}}, $child 696 @{$self->{children}}, @widgets
406 ]; 697 ];
407 698
408 $child->check_size; 699 $self->realloc;
700}
701
702sub children {
703 @{ $_[0]{children} }
409} 704}
410 705
411sub remove { 706sub remove {
412 my ($self, $child) = @_; 707 my ($self, $child) = @_;
413 708
414 delete $child->{parent}; 709 delete $child->{parent};
710 $child->hide;
415 711
416 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
417 713
418 $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;
419} 729}
420 730
421sub find_widget { 731sub find_widget {
422 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
423 733
424 $x -= $self->{x}; 734 $x -= $self->{x};
425 $y -= $self->{y}; 735 $y -= $self->{y};
426 736
427 my $res; 737 my $res;
428 738
429 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
430 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
431 and return $res; 741 and return $res;
432 } 742 }
433 743
434 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
483 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
484} 794}
485 795
486############################################################################# 796#############################################################################
487 797
798# back-buffered drawing area
799
488package CFClient::UI::Window; 800package CFClient::UI::Window;
489 801
490our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
491 803
492use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
498} 810}
499 811
500sub update { 812sub update {
501 my ($self) = @_; 813 my ($self) = @_;
502 814
503 # we want to do this delayed... 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
504 $self->render_chld;
505 $self->SUPER::update; 816 $self->SUPER::update;
506}
507
508sub render_chld {
509 my ($self) = @_;
510
511 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
512 glClearColor 0, 0, 0, 1;
513 glClear GL_COLOR_BUFFER_BIT;
514 $self->child->draw;
515 };
516} 817}
517 818
518sub size_allocate { 819sub size_allocate {
519 my ($self, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
520 821
521 $self->child->configure (0, 0, $w, $h); 822 $self->SUPER::size_allocate ($w, $h);
823 $self->update;
824}
522 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
523 $self->render_chld; 846 $self->_render;
847 };
524} 848}
525 849
526sub _draw { 850sub _draw {
527 my ($self) = @_; 851 my ($self) = @_;
528 852
529 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
530 854
531 my $tex = $self->{texture} 855 my $tex = $self->{texture}
532 or return; 856 or return;
533 857
534 glEnable GL_BLEND;
535 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
536 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
537 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;
538 861
539 $tex->draw_quad (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
540 863
541 glDisable GL_BLEND;
542 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
543} 865}
544 866
545############################################################################# 867#############################################################################
546 868
547package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
548 870
549our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
550
551sub new { die }
552
553sub size_request {
554 my ($self) = @_;
555
556 @$self{qw(child_w child_h)} = $self->child->size_request;
557 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
558
559 @$self{qw(child_w child_h)}
560}
561
562sub _draw {
563 my ($self) = @_;
564
565 $self->{children}[1]->draw;
566}
567
568
569#############################################################################
570
571package CFClient::UI::Frame;
572
573our @ISA = CFClient::UI::Bin::;
574
575use CFClient::OpenGL;
576
577sub size_request {
578 my ($self) = @_;
579 my $chld = $self->child
580 or return (0, 0);
581
582 $chld->move (2, 2);
583
584 map { $_ + 4 } $chld->size_request;
585}
586
587sub size_allocate {
588 my ($self, $x, $y, $w, $h) = @_;
589
590 $self->child->configure (2, 2, $w - 4, $h - 4);
591}
592
593sub _draw {
594 my ($self) = @_;
595
596 my $chld = $self->child;
597
598 my ($w, $h) = $chld->size_request;
599
600 glBegin GL_QUADS;
601 glColor 0, 0, 0;
602 glVertex 0 , 0;
603 glVertex 0 , $h + 4;
604 glVertex $w + 4 , $h + 4;
605 glVertex $w + 4 , 0;
606 glEnd;
607
608 $chld->draw;
609}
610
611#############################################################################
612
613package CFClient::UI::FancyFrame;
614
615our @ISA = CFClient::UI::Bin::;
616
617use CFClient::OpenGL;
618
619my @tex =
620 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
621 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
622 872
623sub new { 873sub new {
624 my $class = shift; 874 my $class = shift;
625 875
626 # TODO: user_x, user_y, overwrite moveto?
627
628 $class->SUPER::new ( 876 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 877 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 878 scroll_y => 1,
631 border => 0.8,
632 @_ 879 @_,
633 ) 880 )
881}
882
883sub size_request {
884 my ($self) = @_;
885
886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887
888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
892}
893
894sub size_allocate {
895 my ($self, $w, $h) = @_;
896
897 my $child = $self->child;
898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
902 $self->child->configure (0, 0, $w, $h);
903 $self->update;
904}
905
906sub set_offset {
907 my ($self, $x, $y) = @_;
908
909 $self->{view_x} = int $x;
910 $self->{view_y} = int $y;
911
912 $self->update;
913}
914
915# hmm, this does not work for topleft of $self... but we should not ask for that
916sub coord2local {
917 my ($self, $x, $y) = @_;
918
919 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
920}
921
922sub coord2global {
923 my ($self, $x, $y) = @_;
924
925 $x = List::Util::min $self->{w}, $x - $self->{view_x};
926 $y = List::Util::min $self->{h}, $y - $self->{view_y};
927
928 $self->SUPER::coord2global ($x, $y)
929}
930
931sub find_widget {
932 my ($self, $x, $y) = @_;
933
934 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
936 ) {
937 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
938 } else {
939 $self->CFClient::UI::Base::find_widget ($x, $y)
940 }
941}
942
943sub _render {
944 my ($self) = @_;
945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950
951 $self->SUPER::_render;
952}
953
954#############################################################################
955
956package CFClient::UI::ScrolledWindow;
957
958our @ISA = CFClient::UI::HBox::;
959
960sub new {
961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
964
965 my $self;
966
967 my $slider = new CFClient::UI::Slider
968 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]);
972 },
973 ;
974
975 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1),
977 slider => $slider,
978 %arg,
979 );
980
981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
983
984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
991}
992
993sub update {
994 my ($self) = @_;
995
996 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001}
1002
1003sub size_allocate {
1004 my ($self, $w, $h) = @_;
1005
1006 $self->SUPER::size_allocate ($w, $h);
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014
1015#############################################################################
1016
1017package CFClient::UI::Frame;
1018
1019our @ISA = CFClient::UI::Bin::;
1020
1021use CFClient::OpenGL;
1022
1023sub new {
1024 my $class = shift;
1025
1026 $class->SUPER::new (
1027 bg => undef,
1028 @_,
1029 )
1030}
1031
1032sub _draw {
1033 my ($self) = @_;
1034
1035 if ($self->{bg}) {
1036 my ($w, $h) = @$self{qw(w h)};
1037
1038 glEnable GL_BLEND;
1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1040 glColor_premultiply @{ $self->{bg} };
1041
1042 glBegin GL_QUADS;
1043 glVertex 0 , 0;
1044 glVertex 0 , $h;
1045 glVertex $w, $h;
1046 glVertex $w, 0;
1047 glEnd;
1048
1049 glDisable GL_BLEND;
1050 }
1051
1052 $self->SUPER::_draw;
1053}
1054
1055#############################################################################
1056
1057package CFClient::UI::FancyFrame;
1058
1059our @ISA = CFClient::UI::Bin::;
1060
1061use CFClient::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070
1071sub new {
1072 my ($class, %arg) = @_;
1073
1074 my $title = delete $arg{title};
1075
1076 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1],
1079 border => 0.6,
1080 can_events => 1,
1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1084 );
1085
1086 $self->{title} = new CFClient::UI::Label
1087 align => 0,
1088 valign => 1,
1089 text => $title,
1090 fontsize => $self->{border}
1091 if defined $title;
1092
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};
634} 1101}
635 1102
636sub border { 1103sub border {
637 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
638} 1105}
639 1106
640sub size_request { 1107sub size_request {
641 my ($self) = @_; 1108 my ($self) = @_;
642 1109
643 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1110 $self->{title}->size_request
1111 if $self->{title};
644 1112
645 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
646 1114
647 ( 1115 (
648 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
651} 1119}
652 1120
653sub size_allocate { 1121sub size_allocate {
654 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
655 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
656 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
657 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
658 1134
659 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
660} 1136}
661 1137
662sub button_down { 1138sub button_down {
663 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
664 1140
1141 my ($w, $h) = @$self{qw(w h)};
665 my $border = $self->border; 1142 my $border = $self->border;
666 1143
667 if ($x < $self->{w} && $x >= $self->{w} - $border 1144 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
668 && $y < $self->{h} && $y >= $self->{h} - $border) { 1145 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
669 1146
1147 if ($lr & $td) {
1148 my ($wx, $wy) = ($self->{x}, $self->{y});
670 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1149 my ($ox, $oy) = ($ev->{x}, $ev->{y});
671 my ($bw, $bh) = ($self->{w}, $self->{h}); 1150 my ($bw, $bh) = ($self->{w}, $self->{h});
672 1151
1152 my $mx = $x < $border;
1153 my $my = $y < $border;
1154
673 $self->{motion} = sub { 1155 $self->{motion} = sub {
674 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
675 1157
676 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 my $dx = $ev->{x} - $ox;
1159 my $dy = $ev->{y} - $oy;
677 1160
678 $self->{user_w} = $bw + $x - $ox; 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
679 $self->{user_h} = $bh + $y - $oy; 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
680 $self->check_size; 1163
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc;
681 }; 1166 };
682 1167
683 } elsif ($x >= 0 && $x < $self->{w} 1168 } elsif ($lr ^ $td) {
684 && $y >= 0 && $y < $border) {
685
686 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
687 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
688 1171
689 $self->{motion} = sub { 1172 $self->{motion} = sub {
690 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
691 1174
692 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
693 1176
694 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
695 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
696 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
697 } 1185 1
698} 1186}
699 1187
700sub button_up { 1188sub button_up {
701 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
702 1190
703 delete $self->{motion}; 1191 !!delete $self->{motion}
704} 1192}
705 1193
706sub mouse_motion { 1194sub mouse_motion {
707 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
708 1196
709 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
710} 1200}
711 1201
712sub _draw { 1202sub _draw {
713 my ($self) = @_; 1203 my ($self) = @_;
714 1204
1205 my $child = $self->{children}[0];
1206
715 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
716 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
717 1209
718 glEnable GL_BLEND;
719 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
720 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
722 1212
723 my $border = $self->border; 1213 my $border = $self->border;
724 1214
725 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
726 $tex[1]->draw_quad (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
727 $tex[3]->draw_quad (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
728 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
729 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
730 1220
731 my $bg = $tex[0]; 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} };
732 1223
733 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
734 my $rep_x = $cw / $bg->{w}; 1225 # solve this better(?)
735 my $rep_y = $ch / $bg->{h}; 1226 $bg->{s} = $cw / $bg->{w};
736 1227 $bg->{t} = $ch / $bg->{h};
737 glColor @{ $self->{bg} };
738
739 $bg->{s} = $rep_x;
740 $bg->{t} = $rep_y;
741 $bg->{wrap_mode} = 1;
742 $bg->draw_quad ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1229 }
743 1230
744 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
745 glDisable GL_BLEND;
746 1232
747 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
748} 1239}
749 1240
750############################################################################# 1241#############################################################################
751 1242
752package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
760sub new { 1251sub new {
761 my $class = shift; 1252 my $class = shift;
762 1253
763 $class->SUPER::new ( 1254 $class->SUPER::new (
764 col_expand => [], 1255 col_expand => [],
765 @_ 1256 @_,
766 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
767} 1262}
768 1263
769sub add { 1264sub add {
770 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
771 1266
772 $child->set_parent ($self); 1267 $child->set_parent ($self);
773 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
774 1269
775 $child->check_size; 1270 $self->realloc;
776} 1271}
777 1272
778# 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?
779sub clear { 1274sub clear {
780 my ($self) = @_; 1275 my ($self) = @_;
781 1276
1277 my @children = $self->children;
782 delete $self->{children}; 1278 delete $self->{children};
783 $self->update; 1279
1280 for (@children) {
1281 delete $_->{parent};
1282 $_->hide;
1283 }
1284
1285 $self->realloc;
784} 1286}
785 1287
786sub get_wh { 1288sub get_wh {
787 my ($self) = @_; 1289 my ($self) = @_;
788 1290
… …
793 or next; 1295 or next;
794 1296
795 for my $x (0 .. $#$row) { 1297 for my $x (0 .. $#$row) {
796 my $widget = $row->[$x] 1298 my $widget = $row->[$x]
797 or next; 1299 or next;
798 my ($w, $h) = $widget->size_request; 1300 my ($w, $h) = @$widget{qw(req_w req_h)};
799 1301
800 $w[$x] = max $w[$x], $w; 1302 $w[$x] = max $w[$x], $w;
801 $h[$y] = max $h[$y], $h; 1303 $h[$y] = max $h[$y], $h;
802 } 1304 }
803 } 1305 }
… …
819sub size_allocate { 1321sub size_allocate {
820 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
821 1323
822 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
823 1325
824 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
825 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
826 1328
827 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
828 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
829 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
830 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
884 } 1386 }
885} 1387}
886 1388
887############################################################################# 1389#############################################################################
888 1390
889package CFClient::UI::HBox; 1391package CFClient::UI::Box;
890
891# TODO: wrap into common Box base class
892 1392
893our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
894 1394
895sub size_request { 1395sub size_request {
896 my ($self) = @_; 1396 my ($self) = @_;
897 1397
898 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
899 1399 ? (
900 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
901 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
902 (List::Util::max map $_->[1], @alloc), 1402 )
903 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
904} 1407}
905 1408
906sub size_allocate { 1409sub size_allocate {
907 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
908 1411
909 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
910
911 my $children = $self->{children}; 1413 my $children = $self->{children};
912 1414
913 my @h = map +($_->size_request)[0], @$children; 1415 my @req;
914 1416
915 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
916 1418 @req = ($space / (@$children || 1)) x @$children;
917 if ($req_h > $h) {
918 # ah well, not enough space
919 $_ *= $h / $req_h for @h;
920 } 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 {
921 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
922 $exp ||= 1;
923 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
924 for (0 .. $#$children) { 1432 for 0 .. $#$children;
925 my $child = $children->[$_];
926
927 my $alloc_h = $h[$_];
928 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
929 $h[$_] = $alloc_h;
930 } 1433 }
931 } 1434 }
932 1435
933 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
934 1437
935 my $y = 0; 1438 my $pos = 0;
936 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
937 my $child = $children->[$_];
938 my $h = $h[$_]; 1440 my $alloc = $req[$_];
939 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
940 1442
941 $y += $h; 1443 $pos += $alloc;
942 } 1444 }
943 1445
944 1 1446 1
945} 1447}
946 1448
947############################################################################# 1449#############################################################################
948 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
949package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
950 1467
951# TODO: wrap into common Box base class
952
953our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
954 1469
955sub size_request { 1470sub new {
956 my ($self) = @_; 1471 my $class = shift;
957 1472
958 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
959 1474 vertical => 1,
960 ( 1475 @_,
961 (List::Util::max map $_->[0], @alloc),
962 (List::Util::sum map $_->[1], @alloc),
963 ) 1476 )
964} 1477}
965 1478
966sub size_allocate {
967 my ($self, $w, $h) = @_;
968
969 my $children = $self->{children};
970
971 my @h = map +($_->size_request)[1], @$children;
972
973 my $req_h = List::Util::sum @h;
974
975 if ($req_h > $h) {
976 # ah well, not enough space
977 $_ *= $h / $req_h for @h;
978 } else {
979 my $exp = List::Util::sum map $_->{expand}, @$children;
980 $exp ||= 1;
981
982 for (0 .. $#$children) {
983 my $child = $children->[$_];
984
985 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
986 }
987 }
988
989 CFClient::UI::harmonize \@h;
990
991 my $y = 0;
992 for (0 .. $#$children) {
993 my $child = $children->[$_];
994 my $h = $h[$_];
995 $child->configure (0, $y, $w, $h);
996
997 $y += $h;
998 }
999
1000 1
1001}
1002
1003############################################################################# 1479#############################################################################
1004 1480
1005package CFClient::UI::Label; 1481package CFClient::UI::Label;
1006 1482
1007our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1008 1484
1009use CFClient::OpenGL; 1485use CFClient::OpenGL;
1010 1486
1011sub new { 1487sub new {
1012 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1013 1489
1014 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1015 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),
1016 fontsize => 1, 1500 fontsize => 1,
1017 text => "",
1018 align => -1, 1501 align => -1,
1019 valign => -1, 1502 valign => -1,
1020 padding => 2, 1503 padding_x => 2,
1021 layout => new CFClient::Layout, 1504 padding_y => 2,
1505 can_events => 0,
1022 %arg 1506 %arg
1023 ); 1507 );
1024 1508
1025 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1509 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout;
1511 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout;
1513 }
1026 1514
1027 $self->set_text (delete $self->{text}) if exists $self->{text}; 1515 if (exists $self->{markup}) {
1028 $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 }
1029 1520
1030 $self 1521 $self
1031} 1522}
1032 1523
1033sub escape_text { 1524sub escape($) {
1034 local $_ = $_[1]; 1525 local $_ = $_[0];
1035 1526
1036 s/&/&amp;/g; 1527 s/&/&amp;/g;
1037 s/>/&gt;/g; 1528 s/>/&gt;/g;
1038 s/</&lt;/g; 1529 s/</&lt;/g;
1039 1530
1040 $_[1] 1531 $_
1532}
1533
1534sub update {
1535 my ($self) = @_;
1536
1537 delete $self->{texture};
1538 $self->SUPER::update;
1041} 1539}
1042 1540
1043sub set_text { 1541sub set_text {
1044 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1045 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;
1046 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1047 1549
1048 delete $self->{texture}; 1550 $self->realloc;
1049 $self->update; 1551 $self->update;
1050} 1552}
1051 1553
1052sub set_markup { 1554sub set_markup {
1053 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1054 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;
1055 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1056 1564
1057 delete $self->{texture}; 1565 $self->realloc;
1058 $self->update; 1566 $self->update;
1059} 1567}
1060 1568
1061sub size_request { 1569sub size_request {
1062 my ($self) = @_; 1570 my ($self) = @_;
1063 1571
1064 $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});
1065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1066 1577
1067 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1068 1579
1580 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583
1584 my ($w2, $h2) = $self->{template}->size;
1585
1586 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2;
1069 ( 1588 }
1070 $w + $self->{padding} * 2, 1589
1071 $h + $self->{padding} * 2, 1590 ($w, $h)
1072 )
1073} 1591}
1074 1592
1075sub size_allocate { 1593sub size_allocate {
1076 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1077 1595
1596 delete $self->{ox};
1597
1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1600}
1601
1602sub set_fontsize {
1603 my ($self, $fontsize) = @_;
1604
1605 $self->{fontsize} = $fontsize;
1078 delete $self->{texture}; 1606 delete $self->{texture};
1607
1608 $self->realloc;
1079} 1609}
1080 1610
1081sub _draw { 1611sub _draw {
1082 my ($self) = @_; 1612 my ($self) = @_;
1083 1613
1614 $self->SUPER::_draw; # draw background, if applicable
1615
1084 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};
1085 $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});
1086 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623
1087 new_from_layout CFClient::Texture $self->{layout} 1624 new_from_layout CFClient::Texture $self->{layout}
1088 }; 1625 };
1089 1626
1090 glEnable GL_BLEND; 1627 unless (exists $self->{ox}) {
1091 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
1092 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1093 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1094 1639
1095 glColor @{$self->{fg}}; 1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1096 1642
1097 $self->{ox} = int (
1098 $self->{align} < 0 ? $self->{padding}
1099 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1100 : ($self->{w} - $tex->{w}) * 0.5
1101 );
1102
1103 $self->{oy} = int (
1104 $self->{valign} < 0 ? $self->{padding}
1105 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1106 : ($self->{h} - $tex->{h}) * 0.5
1107 );
1108
1109 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1110 1644
1111 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1112 glDisable GL_BLEND;
1113} 1646}
1114 1647
1115############################################################################# 1648#############################################################################
1116 1649
1117package CFClient::UI::EntryBase; 1650package CFClient::UI::EntryBase;
… …
1122 1655
1123sub new { 1656sub new {
1124 my $class = shift; 1657 my $class = shift;
1125 1658
1126 $class->SUPER::new ( 1659 $class->SUPER::new (
1127 fg => [1, 1, 1], 1660 fg => [1, 1, 1],
1128 bg => [0, 0, 0, 0.2], 1661 bg => [0, 0, 0, 0.2],
1129 active_bg => [1, 1, 1, 0.5], 1662 active_bg => [1, 1, 1, 0.5],
1130 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1131 can_hover => 1, 1664 can_hover => 1,
1132 can_focus => 1, 1665 can_focus => 1,
1133 valign => 0, 1666 valign => 0,
1667 can_events => 1,
1668 #text => ...
1134 @_ 1669 @_
1135 ) 1670 )
1136} 1671}
1137 1672
1138sub _set_text { 1673sub _set_text {
… …
1140 1675
1141 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1142 1677
1143 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1144 1679
1145 delete $self->{texture};
1146
1147 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1148 $self->{text} = $text; 1681 $self->{text} = $text;
1149 1682
1150 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1152 1685
1153 $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;
1154} 1697}
1155 1698
1156sub get_text { 1699sub get_text {
1157 $_[0]{text} 1700 $_[0]{text}
1158} 1701}
… …
1161 my ($self) = @_; 1704 my ($self) = @_;
1162 1705
1163 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1164 1707
1165 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1166}
1167
1168sub size_allocate {
1169 my ($self, $w, $h) = @_;
1170
1171 $self->_set_text ($self->{text});
1172}
1173
1174sub set_text {
1175 my ($self, $text) = @_;
1176
1177 $self->{cursor} = length $text;
1178 $self->_set_text ($text);
1179 $self->update;
1180} 1709}
1181 1710
1182sub key_down { 1711sub key_down {
1183 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1184 1713
… …
1186 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1187 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1188 1717
1189 my $text = $self->get_text; 1718 my $text = $self->get_text;
1190 1719
1191 if ($sym == 8) { 1720 if ($uni == 8) {
1192 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1193 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1194 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1195 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1196 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1197 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1198 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1199 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1200 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1201 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1202 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1203 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1204 $self->emit ('escape'); 1733 $self->_emit ('escape');
1205 } elsif ($uni) { 1734 } elsif ($uni) {
1206 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1207 } 1738 }
1208 1739
1209 $self->_set_text ($text); 1740 $self->_set_text ($text);
1210 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1211} 1745}
1212 1746
1213sub focus_in { 1747sub focus_in {
1214 my ($self) = @_; 1748 my ($self) = @_;
1215 1749
… …
1230 utf8::encode $text; 1764 utf8::encode $text;
1231 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1232 1766
1233 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1234 $self->update; 1768 $self->update;
1769
1770 1
1235} 1771}
1236 1772
1237sub mouse_motion { 1773sub mouse_motion {
1238 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1239# 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
1240} 1778}
1241 1779
1242sub _draw { 1780sub _draw {
1243 my ($self) = @_; 1781 my ($self) = @_;
1244 1782
1245 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1246 1784
1247 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1248 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1249 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1250 } else { 1788 } else {
1251 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1252 } 1790 }
1253 1791
1254 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1255 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1256 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1257 glVertex 0 , 0; 1795 glVertex 0 , 0;
1258 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1259 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1260 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1291 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1292 1830
1293 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1294 1832
1295 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} = '';
1296 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1297 $self->update; 1839 $self->update;
1298 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
1299 } else { 1863 } else {
1300 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1301 } 1867 1
1302
1303} 1868}
1304 1869
1305############################################################################# 1870#############################################################################
1306 1871
1307package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1309our @ISA = CFClient::UI::Label::; 1874our @ISA = CFClient::UI::Label::;
1310 1875
1311use CFClient::OpenGL; 1876use CFClient::OpenGL;
1312 1877
1313my @tex = 1878my @tex =
1314 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1315 qw(b1_button_active.png); 1880 qw(b1_button_active.png);
1316 1881
1317sub new { 1882sub new {
1318 my $class = shift; 1883 my $class = shift;
1319 1884
1320 $class->SUPER::new ( 1885 $class->SUPER::new (
1321 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1322 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1323 bg => [1, 1, 1, 0.2],
1324 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1325 can_hover => 1, 1890 can_hover => 1,
1326 align => 0, 1891 align => 0,
1327 valign => 0, 1892 valign => 0,
1893 can_events => 1,
1328 @_ 1894 @_
1329 ) 1895 )
1330} 1896}
1331 1897
1898sub activate { }
1899
1332sub button_up { 1900sub button_up {
1333 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1334 1902
1903 $self->emit ("activate")
1335 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1336 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1337 $self->emit ("activate"); 1906
1338 } 1907 1
1339} 1908}
1340 1909
1341sub _draw { 1910sub _draw {
1342 my ($self) = @_; 1911 my ($self) = @_;
1343 1912
1344 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1345 1914
1346 if ($GRAB == $self) {
1347 $self->{fg} = $self->{active_fg};
1348 }
1349
1350 glEnable GL_BLEND;
1351 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1352 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1353 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1354 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1355 1918
1356 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1357 1920
1358 glDisable GL_TEXTURE_2D; 1921 glDisable GL_TEXTURE_2D;
1359 glDisable GL_BLEND;
1360 1922
1361 $self->SUPER::_draw; 1923 $self->SUPER::_draw;
1362} 1924}
1363 1925
1364############################################################################# 1926#############################################################################
… …
1366package CFClient::UI::CheckBox; 1928package CFClient::UI::CheckBox;
1367 1929
1368our @ISA = CFClient::UI::DrawBG::; 1930our @ISA = CFClient::UI::DrawBG::;
1369 1931
1370my @tex = 1932my @tex =
1371 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1933 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1372 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1934 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1373 1935
1374use CFClient::OpenGL; 1936use CFClient::OpenGL;
1375 1937
1376sub new { 1938sub new {
1377 my $class = shift; 1939 my $class = shift;
1378 1940
1379 $class->SUPER::new ( 1941 $class->SUPER::new (
1380 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1381 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1382 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],
1383 state => 0, 1948 state => 0,
1384 can_hover => 1, 1949 can_hover => 1,
1385 @_ 1950 @_
1386 ) 1951 )
1387} 1952}
1388 1953
1389sub size_request { 1954sub size_request {
1390 my ($self) = @_; 1955 my ($self) = @_;
1391 1956
1392 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1393} 1958}
1394 1959
1395sub button_down { 1960sub button_down {
1396 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1397 1962
1398 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1399 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1400 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1401 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1402 } 1971 1
1403} 1972}
1404 1973
1405sub _draw { 1974sub _draw {
1406 my ($self) = @_; 1975 my ($self) = @_;
1407 1976
1408 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1409 1978
1410 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1411 1980
1412 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;
1413 1984
1414 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1415 1986
1416 glEnable GL_BLEND; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1988
1417 glEnable GL_TEXTURE_2D; 1989 glEnable GL_TEXTURE_2D;
1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1419
1420 my $tex = $self->{state} ? $tex[1] : $tex[0];
1421
1422 $tex->draw_quad (0, 0, $s, $s); 1990 $tex->draw_quad_alpha (0, 0, $s, $s);
1423
1424 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1425 glDisable GL_BLEND;
1426} 1992}
1427 1993
1428############################################################################# 1994#############################################################################
1429 1995
1996package CFClient::UI::Image;
1997
1998our @ISA = CFClient::UI::Base::;
1999
2000use CFClient::OpenGL;
2001use Carp qw/confess/;
2002
2003our %loaded_images;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (can_events => 0, @_);
2009
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2011
2012 $loaded_images{$self->{image}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2014
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2016
2017 Scalar::Util::weaken $loaded_images{$self->{image}};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020
2021 $self
2022}
2023
2024sub size_request {
2025 my ($self) = @_;
2026
2027 ($self->{tex}->{w}, $self->{tex}->{h})
2028}
2029
2030sub _draw {
2031 my ($self) = @_;
2032
2033 my $tex = $self->{tex};
2034
2035 my ($w, $h) = ($self->{w}, $self->{h});
2036
2037 if ($self->{rot90}) {
2038 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 }
2043
2044 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046
2047 $tex->draw_quad_alpha (0, 0, $w, $h);
2048
2049 glDisable GL_TEXTURE_2D;
2050}
2051
2052#############################################################################
2053
1430package CFClient::UI::VGauge; 2054package CFClient::UI::VGauge;
1431 2055
1432our @ISA = CFClient::UI::Base::; 2056our @ISA = CFClient::UI::Base::;
2057
2058use List::Util qw(min max);
1433 2059
1434use CFClient::OpenGL; 2060use CFClient::OpenGL;
1435 2061
1436my %tex = ( 2062my %tex = (
1437 food => [ 2063 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ], 2066 ],
1441 grace => [ 2067 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1443 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/
1444 ], 2070 ],
1445 hp => [ 2071 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ], 2074 ],
1449 mana => [ 2075 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1451 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/
1452 ], 2078 ],
1453); 2079);
1454 2080
1455# eg. VGauge->new (gauge => 'food'), default gauge: food 2081# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 2082sub new {
1457 my $class = shift; 2083 my $class = shift;
1458 2084
1459 my $self = $class->SUPER::new ( 2085 my $self = $class->SUPER::new (
1460 gauge => 'food', 2086 type => 'food',
1461 @_ 2087 @_
1462 ); 2088 );
1463 2089
1464 $self->{aspect} = $tex{$self->{gauge}}[0]{w} / $tex{$self->{gauge}}[0]{h}; 2090 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1465 2091
1466 $self 2092 $self
1467} 2093}
1468 2094
1469sub size_request { 2095sub size_request {
1470 my ($self) = @_; 2096 my ($self) = @_;
1471 2097
1472 my $tex = $tex{$self->{gauge}}[0]; 2098 #my $tex = $tex{$self->{type}}[0];
1473
1474 @$tex{qw(w h)} 2099 #@$tex{qw(w h)}
2100 (0, 0)
1475} 2101}
1476 2102
1477sub set_max { 2103sub set_max {
1478 my ($self, $max) = @_; 2104 my ($self, $max) = @_;
1479 2105
2106 return if $self->{max_val} == $max;
2107
1480 $self->{max_val} = $max; 2108 $self->{max_val} = $max;
2109 $self->update;
1481} 2110}
1482 2111
1483sub set_value { 2112sub set_value {
1484 my ($self, $val, $max) = @_; 2113 my ($self, $val, $max) = @_;
1485 2114
1486 $self->set_max ($max) 2115 $self->set_max ($max)
1487 if defined $max; 2116 if defined $max;
1488 2117
1489 $max = $self->{max_val}; 2118 return if $self->{val} == $val;
2119
1490 $self->{val} = $val; 2120 $self->{val} = $val;
1491
1492 $self->update; 2121 $self->update;
1493} 2122}
1494 2123
1495sub _draw { 2124sub _draw {
1496 my ($self) = @_; 2125 my ($self) = @_;
1497 2126
1498 my $tex = $tex{$self->{gauge}}; 2127 my $tex = $tex{$self->{type}};
2128 my ($t1, $t2, $t3) = @$tex;
1499 2129
1500 my ($w, $h) = ($self->{w}, $self->{h}); 2130 my ($w, $h) = ($self->{w}, $self->{h});
1501 2131
2132 if ($self->{vertical}) {
2133 glRotate 90, 0, 0, 1;
2134 glTranslate 0, -$self->{w}, 0;
2135
2136 ($w, $h) = ($h, $w);
2137 }
2138
1502 my $ycut = $self->{val} / ($self->{max_val} || 1); 2139 my $ycut = $self->{val} / ($self->{max_val} || 1);
1503 $ycut = 1 if $self->{val} > $self->{max_val};
1504 2140
1505 my $t1 = $tex->[0]; 2141 my $ycut1 = max 0, min 1, $ycut;
1506 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);
1507 2146
1508 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1509 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;
1510 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 2152
1513 my $h1 = $self->{h} - $ycut * $self->{h};
1514 my $h2 = $ycut * $self->{h};
1515
1516 my $yp = 0;
1517
1518 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1519 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
1520 glTexCoord 0 , 0; glVertex 0 , $yp; 2155 glTexCoord 0 , 0; glVertex 0 , 0;
1521 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 2156 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1522 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 2157 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1523 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 2158 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1524 glEnd; 2159 glEnd;
1525 2160
1526 $yp += $h1; 2161 my $ycut1 = List::Util::min 1, $ycut;
1527
1528 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t2->{name};
1529 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
1530 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 2164 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1531 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 2165 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1532 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1533 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 2166 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2167 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1534 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 }
1535 2179
1536 glDisable GL_BLEND; 2180 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D; 2181 glDisable GL_TEXTURE_2D;
2182}
2183
2184#############################################################################
2185
2186package CFClient::UI::Gauge;
2187
2188our @ISA = CFClient::UI::VBox::;
2189
2190sub new {
2191 my ($class, %arg) = @_;
2192
2193 my $self = $class->SUPER::new (
2194 tooltip => $arg{type},
2195 can_hover => 1,
2196 can_events => 1,
2197 %arg,
2198 );
2199
2200 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2201 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2202 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2203
2204 $self
2205}
2206
2207sub set_fontsize {
2208 my ($self, $fsize) = @_;
2209
2210 $self->{value}->set_fontsize ($fsize);
2211 $self->{max} ->set_fontsize ($fsize);
2212}
2213
2214sub set_max {
2215 my ($self, $max) = @_;
2216
2217 $self->{gauge}->set_max ($max);
2218 $self->{max}->set_text ($max);
2219}
2220
2221sub set_value {
2222 my ($self, $val, $max) = @_;
2223
2224 $self->set_max ($max)
2225 if defined $max;
2226
2227 $self->{gauge}->set_value ($val, $max);
2228 $self->{value}->set_text ($val);
1538} 2229}
1539 2230
1540############################################################################# 2231#############################################################################
1541 2232
1542package CFClient::UI::Slider; 2233package CFClient::UI::Slider;
… …
1552 qw(s1_slider.png s1_slider_bg.png); 2243 qw(s1_slider.png s1_slider_bg.png);
1553 2244
1554sub new { 2245sub new {
1555 my $class = shift; 2246 my $class = shift;
1556 2247
1557 # range [value, low, high, page] 2248 # range [value, low, high, page, unit]
1558 2249
1559 # TODO: 0-width page 2250 # TODO: 0-width page
1560 # TODO: req_w/h are wrong with vertical 2251 # TODO: req_w/h are wrong with vertical
1561 # TODO: calculations are off 2252 # TODO: calculations are off
1562 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
1563 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
1564 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],
1565 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
1566 req_w => 20, 2259 min_w => $::WIDTH / 80,
1567 req_h => 20, 2260 min_h => $::WIDTH / 80,
1568 vertical => 0, 2261 vertical => 0,
1569 can_hover => 1, 2262 can_hover => 1,
1570 inner_pad => 5, 2263 inner_pad => 0.02,
1571 @_ 2264 @_
1572 ); 2265 );
1573 2266
2267 $self->set_value ($self->{range}[0]);
2268 $self->update;
2269
1574 $self 2270 $self
1575} 2271}
1576 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
1577sub size_request { 2307sub size_request {
1578 my ($self) = @_; 2308 my ($self) = @_;
1579 2309
1580 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
1581 my $h = $self->{req_h};
1582
1583 $self->{vertical} ? ($h, $w) : ($w, $h)
1584} 2311}
1585 2312
1586sub button_down { 2313sub button_down {
1587 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
1588 2315
1589 $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
1590 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
1591} 2321}
1592 2322
1593sub mouse_motion { 2323sub mouse_motion {
1594 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
1595 2325
1596 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
1597 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
1598 2356
1599 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1600 2358
1601 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1602 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1603 2361
1604 $x -= $inner_pad_px; # substract the padding 2362 $value = ($value - $lo) / $range;
1605 $x = $x * ($hi - $lo) / $inner_w + $lo; 2363 $value = $value * $self->{scale} + $self->{offset};
1606 $x = $lo if $x < $lo;
1607 $x = $hi - $page if $x > $hi - $page;
1608 $self->{range}[0] = $x;
1609 2364
1610 $self->emit (changed => $x); 2365 $self->{knob_x} = $value - $knob_w * 0.5;
1611 $self->update; 2366 $self->{knob_w} = $knob_w;
1612 } 2367 }
1613}
1614
1615# the inner_* stuff is for generating a padding for the slider handle,
1616# so that the handle doesn't leave the texture. This calculation isn't 100%
1617# correct propably, but it does the job for now
1618sub _calc_inner_pad_px {
1619 my ($self, $w) = @_;
1620 ($w / 100) * $self->{inner_pad} # % to pixels
1621}
1622
1623sub _draw {
1624 my ($self) = @_;
1625 2368
1626 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
1627 2370
1628 my ($w, $h) = @$self{qw(w h)}; 2371 glScale $self->{w}, $self->{h};
1629 2372
1630 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
1631 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
1632 2375
2376 glTranslate 1, 0, 0;
1633 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
1634 glTranslate 0, -$self->{w}, 0;
1635
1636 ($w, $h) = ($h, $w);
1637 } 2378 }
1638 2379
1639 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1640 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1641 2382
1642 my ($value, $lo, $hi, $page) = @{$self->{range}};
1643
1644 $hi = $value + 1 if $lo == $hi;
1645
1646 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1647 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1648
1649 $page = int $page * $inner_w / ($hi - $lo);
1650 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1651
1652 $w -= $page;
1653 $page &= ~1;
1654 glTranslate $page * 0.5, 0, 0;
1655 $page ||= 2;
1656
1657 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1658 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1659
1660 glEnable GL_BLEND;
1661 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1662 glEnable GL_TEXTURE_2D; 2383 glEnable GL_TEXTURE_2D;
1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1664 2385
1665 # draw background 2386 # draw background
1666 $tex[1]->draw_quad (0, 0, $w, $h); 2387 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1667 2388
1668 # draw handle 2389 # draw handle
1669 $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);
1670 2391
1671 glDisable GL_BLEND;
1672 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
1673} 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 (@_) }
1674 2435
1675############################################################################# 2436#############################################################################
1676 2437
1677package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
1678 2439
… …
1682 2443
1683sub new { 2444sub new {
1684 my $class = shift; 2445 my $class = shift;
1685 2446
1686 my $self = $class->SUPER::new ( 2447 my $self = $class->SUPER::new (
1687 fontsize => 1, 2448 fontsize => 1,
2449 can_events => 0,
2450 #font => default_font
1688 @_, 2451 @_,
1689 2452
1690 layout => (new CFClient::Layout), 2453 layout => (new CFClient::Layout 1),
1691 par => [], 2454 par => [],
1692 height => 0, 2455 height => 0,
1693 children => [ 2456 children => [
1694 (new CFClient::UI::Empty expand => 1), 2457 (new CFClient::UI::Empty expand => 1),
1695 (new CFClient::UI::Slider vertical => 1), 2458 (new CFClient::UI::Slider vertical => 1),
1696 ], 2459 ],
1697 ); 2460 );
1698 2461
1699 $self->{children}[1]->connect (changed => sub { 2462 $self->{children}[1]->connect (changed => sub { $self->update });
1700 $self->update;
1701 });
1702 2463
1703 $self 2464 $self
1704} 2465}
1705 2466
1706sub set_fontsize { 2467sub set_fontsize {
… …
1708 2469
1709 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
1710 $self->reflow; 2471 $self->reflow;
1711} 2472}
1712 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
1713sub text_height { 2486sub text_size {
1714 my ($self, $text) = @_; 2487 my ($self, $text, $indent) = @_;
1715 2488
1716 my $layout = $self->{layout}; 2489 my $layout = $self->{layout};
1717 2490
1718 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1719 $layout->set_width ($self->{w}); 2492 $layout->set_width ($self->{children}[0]{w} - $indent);
1720 $layout->set_text ($text); 2493 $layout->set_markup ($text);
1721 2494
1722 ($layout->size)[1] 2495 $layout->size
1723} 2496}
1724 2497
1725sub reflow { 2498sub reflow {
1726 my ($self) = @_; 2499 my ($self) = @_;
1727 2500
1728 $self->{need_reflow}++; 2501 $self->{need_reflow}++;
1729 $self->update; 2502 $self->update;
1730} 2503}
1731 2504
1732sub 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 {
1733 my ($self, $w, $h) = @_; 2513 my ($self) = @_;
1734 2514
1735 $self->SUPER::size_allocate ($w, $h); 2515 $self->{par} = [];
1736 2516 $self->{height} = 0;
1737 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1738 $self->{layout}->set_width ($self->{children}[0]{w});
1739
1740 $self->reflow;
1741} 2518}
1742 2519
1743sub add_paragraph { 2520sub add_paragraph {
1744 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
1745 2522
1746 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
1747 2524 my ($w, $h) = $self->text_size ($line);
1748 my $height = $self->text_height ($text);
1749
1750 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
1751 2528
1752 push @{$self->{par}}, [$height, $color, $text];
1753
1754 $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]);
1755 $self->{children}[1]->update;
1756} 2530}
1757 2531
1758sub update { 2532sub update {
1759 my ($self) = @_; 2533 my ($self) = @_;
1760 2534
… …
1762 2536
1763 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
1764 2538
1765 delete $self->{texture}; 2539 delete $self->{texture};
1766 2540
1767 $ROOT->on_refresh ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
1768 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
1769 my $height = 0; 2545 my $height = 0;
1770 2546
1771 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
1772 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 }
1773 2562
1774 $self->{height} = $height; 2563 $self->{height} = $height;
1775 2564
1776 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1777 2566
1778 delete $self->{texture}; 2567 delete $self->{texture};
1779 } 2568 }
1780 2569
1781 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1782 glClearColor 0, 0, 0, 1; 2571 glClearColor 0, 0, 0, 0;
1783 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
1784 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
1785 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glEnable GL_TEXTURE_2D;
1788 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1789
1790 my $top = int $self->{children}[1]{range}[0];
1791
1792 my $y0 = $top;
1793 my $y1 = $top + $self->{h};
1794
1795 my $y = 0;
1796
1797 my $layout = $self->{layout};
1798 2588
1799 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
1800 my $h = $par->[0]; 2590 my $h = $par->[1];
1801 2591
1802 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]);
1803 $layout->set_text ($par->[2]); 2595 $layout->set_markup ($par->[4]);
1804 2596
1805 glColor @{ $par->[1] }; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1806 my ($W, $H) = $layout->size; 2598
1807 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;
1808 } 2601 }
1809 2602
1810 $y += $h; 2603 $y += $h;
1811 } 2604 }
1812 2605
1813 glDisable GL_TEXTURE_2D;
1814 glDisable GL_BLEND; 2606 glDisable GL_BLEND;
1815 }; 2607 };
1816 }); 2608 });
1817} 2609}
1818 2610
1819sub _draw { 2611sub _draw {
1820 my ($self) = @_; 2612 my ($self) = @_;
1821 2613
1822 if ($self->{texture}) {
1823 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
1824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1825 $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});
1826 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
1827 }
1828 2619
1829 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
1830 2621
1831} 2622}
1832 2623
… …
1880 2671
1881sub new { 2672sub new {
1882 my $class = shift; 2673 my $class = shift;
1883 2674
1884 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
1885 state => 0, 2676 state => 0,
1886 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
1887 @_ 2678 @_
1888 ); 2679 );
1889 2680
1890 if ($self->{state}) {
1891 $self->{state} = 0;
1892 $self->toggle_flopper;
1893 }
1894
1895 $self 2681 $self
1896} 2682}
1897 2683
1898sub toggle_flopper { 2684sub toggle_flopper {
1899 my ($self) = @_; 2685 my ($self) = @_;
1900 2686
1901 # TODO: use animation 2687 $self->{other}->toggle_visibility;
1902 if ($self->{state} = !$self->{state}) { 2688}
1903 $CFClient::UI::ROOT->add ($self->{other}); 2689
1904 $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
1905 $self->emit ("open"); 2946 $self->_emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover};
1906 } else { 2948 } else {
1907 $CFClient::UI::ROOT->remove ($self->{other}); 2949 return 0
1908 $self->emit ("close"); 2950 }
2951
1909 } 2952 1
1910
1911 $self->emit (changed => $self->{state});
1912} 2953}
1913 2954
1914############################################################################# 2955#############################################################################
1915 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
1916package CFClient::UI::Root; 3470package CFClient::UI::Root;
1917 3471
1918our @ISA = CFClient::UI::Container::; 3472our @ISA = CFClient::UI::Container::;
1919 3473
1920use CFClient::OpenGL; 3474use CFClient::OpenGL;
1921 3475
1922sub check_size { 3476sub new {
1923 my ($self) = @_; 3477 my $class = shift;
1924 3478
1925 $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
1926} 3487}
1927 3488
1928sub size_request { 3489sub size_request {
1929 ($::WIDTH, $::HEIGHT) 3490 my ($self) = @_;
1930}
1931 3491
1932sub 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 {
1933 my ($self, $x, $y, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
1934 3511
1935 $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)};
1936 3514
1937 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3515 $X = $child->{force_x} if exists $child->{force_x};
1938 for @{$self->{children}}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
1939}
1940 3517
1941sub _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 {
1942 my ($self, $x, $y) = @_; 3526 my ($self, $x, $y) = @_;
1943 3527
1944 ($x, $y) 3528 ($x, $y)
1945} 3529}
1946 3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
1947sub update { 3537sub update {
1948 my ($self) = @_; 3538 my ($self) = @_;
1949 3539
1950 $self->check_size; 3540 $::WANT_REFRESH++;
1951 ::refresh ();
1952} 3541}
1953 3542
1954sub add { 3543sub add {
1955 my ($self, $child) = @_; 3544 my ($self, @children) = @_;
1956 3545
3546 $_->{is_toplevel} = 1
3547 for @children;
3548
1957 $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 }
1958} 3565}
1959 3566
1960sub on_refresh { 3567sub on_refresh {
1961 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
1962 3569
1963 $self->{refresh_hook}{$id} = $cb; 3570 $self->{refresh_hook}{$id} = $cb;
1964} 3571}
1965 3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
1966sub draw { 3579sub draw {
1967 my ($self) = @_; 3580 my ($self) = @_;
1968 3581
1969 while (my $rcb = delete $self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
1970 $_->() for values %$rcb; 3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
1971 } 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
1972 3675
1973 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1974 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1975 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
1976 3679
1977 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
1978 glLoadIdentity; 3681 glLoadIdentity;
1979 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
1980 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
1981 glLoadIdentity; 3684 glLoadIdentity;
1982 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
1983 $self->_draw; 3693 $self->_draw;
1984} 3694}
1985 3695
1986############################################################################# 3696#############################################################################
1987 3697
1988package CFClient::UI; 3698package CFClient::UI;
1989 3699
1990$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
1991 3702
19921 37031
1993 3704

Diff Legend

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