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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

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

Diff Legend

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