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

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

Diff Legend

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