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

Diff Legend

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