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

Diff Legend

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