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

Diff Legend

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