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

Diff Legend

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