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

Diff Legend

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