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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
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 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 39 }
42 40
43 return; 41 return;
44 } 42 }
45 } 43 }
46 } 44 }
47 45
48 $TOOLTIP->hide; 46 $TOOLTIP->hide;
49 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;
50} 71}
51 72
52# class methods for events 73# class methods for events
53sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 76 if $FOCUS;
56} 77}
57 78
58sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 81 if $FOCUS;
61} 82}
62 83
63sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
64 my ($ev) = @_; 85 my ($ev) = @_;
… …
68 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
69 90
70 $GRAB = $widget; 91 $GRAB = $widget;
71 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
72 93
73 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
74 } 95 }
75 96
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 98
78 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 101}
83 102
84sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
85 my ($ev) = @_; 104 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
87 106
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 108
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 110
92 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 113
97 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 116 $grab->update if $grab;
100 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
101 118
102 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
103 } 120 }
104} 121}
105 122
106sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
107 my ($ev) = @_; 124 my ($ev) = @_;
… …
113 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
114 131
115 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 134
118 check_tooltip; 135 $TOOLTIP_WATCHER->start;
119 } 136 }
120 137
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 139 if $HOVER;
125} 140}
126 141
127# convert position array to integers 142# convert position array to integers
128sub harmonize { 143sub harmonize {
129 my ($vals) = @_; 144 my ($vals) = @_;
… …
135 $rem += $_ - $i; 150 $rem += $_ - $i;
136 $_ = $i; 151 $_ = $i;
137 } 152 }
138} 153}
139 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
140############################################################################# 196#############################################################################
141 197
142package CFClient::UI::Base; 198package CFClient::UI::Base;
143 199
144use strict; 200use strict;
… …
147 203
148sub new { 204sub new {
149 my $class = shift; 205 my $class = shift;
150 206
151 my $self = bless { 207 my $self = bless {
152 x => 0, 208 x => "center",
153 y => 0, 209 y => "center",
154 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
155 can_events => 1, 213 can_events => 1,
156 @_ 214 @_
157 }, $class; 215 }, $class;
158 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
159 for (keys %$self) { 219 for (keys %$self) {
160 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
162 } 222 }
163 } 223 }
164 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
165 $self 237 $self
166} 238}
167 239
168sub destroy { 240sub destroy {
169 my ($self) = @_; 241 my ($self) = @_;
… …
178 return if $self->{parent}; 250 return if $self->{parent};
179 251
180 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
181} 253}
182 254
183sub hide { 255sub set_visible {
184 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};
185 279
186 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
240 }
241}
242 363
243sub size_allocate { 364 $self->{alloc_w} = $w;
244 # nothing to be done 365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
368 }
245} 369}
246 370
247sub children { 371sub children {
372 # nop
248} 373}
249 374
250# call when resolution changes etc. 375sub visible_children {
251sub reconfigure { 376 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259} 377}
260 378
261sub set_max_size { 379sub set_max_size {
262 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
263 381
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
386}
387
388sub set_tooltip {
389 my ($self, $tooltip) = @_;
390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
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 }
266} 402}
267 403
268# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
269sub coord2local { 405sub coord2local {
270 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
278 414
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 416}
281 417
282sub focus_in { 418sub invoke_focus_in {
283 my ($self) = @_; 419 my ($self) = @_;
284 420
285 return if $FOCUS == $self; 421 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
287 423
288 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
289 425
290 $self->emit (focus_in => $focus);
291
292 $focus->update if $focus; 426 $focus->update if $focus;
293 $FOCUS->update; 427 $FOCUS->update;
294}
295 428
429 0
430}
431
296sub focus_out { 432sub invoke_focus_out {
297 my ($self) = @_; 433 my ($self) = @_;
298 434
299 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
300 436
301 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
302 438
303 $self->emit (focus_out => $focus);
304
305 $focus->update if $focus; #? 439 $focus->update if $focus; #?
306}
307 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
308sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
309sub button_up { } 454sub invoke_button_up { 1 }
310sub key_down { } 455sub invoke_key_down { 1 }
311sub key_up { } 456sub invoke_key_up { 1 }
312 457
313sub button_down { 458sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
315 460
316 $self->focus_in; 461 $self->grab_focus;
317}
318 462
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
323sub 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
324 530
325sub draw { 531sub draw {
326 my ($self) = @_; 532 my ($self) = @_;
327 533
328 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);
329 545
330 glPushMatrix; 546 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 548
335 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 551 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 553 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 554 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 555 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 556 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 557 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 572 glPopMatrix;
361 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;
362 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
363} 578}
364 579
365sub _draw { 580sub _draw {
366 my ($self) = @_; 581 my ($self) = @_;
367 582
368 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
369} 584}
370 585
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
392}
393
394sub check_size {
395 my ($self, $forced) = @_;
396
397 $self->{force_alloc} = 1 if $forced;
398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399}
400
401sub update {
402 my ($self) = @_;
403
404 $self->{parent}->update
405 if $self->{parent};
406}
407
408sub connect {
409 my ($self, $signal, $cb) = @_;
410
411 push @{ $self->{signal_cb}{$signal} }, $cb;
412}
413
414sub emit {
415 my ($self, $signal, @args) = @_;
416
417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
418}
419
420sub DESTROY { 586sub DESTROY {
421 my ($self) = @_; 587 my ($self) = @_;
422 588
423 #$self->deactivate; 589 delete $WIDGET{$self+0};
590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
424} 593}
425 594
426############################################################################# 595#############################################################################
427 596
428package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
436 my $class = shift; 605 my $class = shift;
437 606
438 # range [value, low, high, page] 607 # range [value, low, high, page]
439 608
440 $class->SUPER::new ( 609 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 610 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 611 #active_bg => [1, 1, 1, 0.5],
443 @_ 612 @_
444 ) 613 )
445} 614}
446 615
447sub _draw { 616sub _draw {
448 my ($self) = @_; 617 my ($self) = @_;
449 618
619 my $color = $FOCUS == $self && $self->{active_bg}
620 ? $self->{active_bg}
621 : $self->{bg};
622
623 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
451 625
452 glEnable GL_BLEND; 626 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 628 glColor_premultiply @$color;
455 629
456 glBegin GL_QUADS; 630 glBegin GL_QUADS;
457 glVertex 0 , 0; 631 glVertex 0 , 0;
458 glVertex 0 , $h; 632 glVertex 0 , $h;
459 glVertex $w, $h; 633 glVertex $w, $h;
460 glVertex $w, 0; 634 glVertex $w, 0;
461 glEnd; 635 glEnd;
462 636
463 glDisable GL_BLEND; 637 glDisable GL_BLEND;
638 }
464} 639}
465 640
466############################################################################# 641#############################################################################
467 642
468package CFClient::UI::Empty; 643package CFClient::UI::Empty;
… …
473 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
475} 650}
476 651
477sub size_request { 652sub size_request {
478 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
479} 656}
480 657
481sub draw { } 658sub draw { }
482 659
483############################################################################# 660#############################################################################
… …
487our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
488 665
489sub new { 666sub new {
490 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
491 668
492 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
493 670
494 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
495 children => [], 672 children => [],
496 can_events => 0, 673 can_events => 0,
497 %arg, 674 %arg,
498 ); 675 );
676
499 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
500 679
501 $self 680 $self
502} 681}
503 682
504sub add { 683sub add {
… …
512 $self->{children} = [ 691 $self->{children} = [
513 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
514 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
515 ]; 694 ];
516 695
517 $self->check_size (1); 696 $self->realloc;
518 $self->update;
519} 697}
520 698
521sub children { 699sub children {
522 @{ $_[0]{children} } 700 @{ $_[0]{children} }
523} 701}
… …
528 delete $child->{parent}; 706 delete $child->{parent};
529 $child->hide; 707 $child->hide;
530 708
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 710
533 $self->check_size; 711 $self->realloc;
534 $self->update;
535} 712}
536 713
537sub clear { 714sub clear {
538 my ($self) = @_; 715 my ($self) = @_;
539 716
… …
543 for (@$children) { 720 for (@$children) {
544 delete $_->{parent}; 721 delete $_->{parent};
545 $_->hide; 722 $_->hide;
546 } 723 }
547 724
548 $self->check_size; 725 $self->realloc;
549 $self->update;
550} 726}
551 727
552sub find_widget { 728sub find_widget {
553 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
554 730
555 $x -= $self->{x}; 731 $x -= $self->{x};
556 $y -= $self->{y}; 732 $y -= $self->{y};
557 733
558 my $res; 734 my $res;
559 735
560 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
561 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
562 and return $res; 738 and return $res;
563 } 739 }
564 740
565 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
586} 762}
587 763
588sub add { 764sub add {
589 my ($self, $child) = @_; 765 my ($self, $child) = @_;
590 766
591 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
592
593 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
594} 769}
595 770
596sub remove { 771sub remove {
597 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
606 781
607sub size_request { 782sub size_request {
608 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
609} 784}
610 785
611sub size_allocate { 786sub invoke_size_allocate {
612 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
613 788
614 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
615} 792}
616 793
617############################################################################# 794#############################################################################
795
796# back-buffered drawing area
618 797
619package CFClient::UI::Window; 798package CFClient::UI::Window;
620 799
621our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
622 801
… …
633 812
634 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
635 $self->SUPER::update; 814 $self->SUPER::update;
636} 815}
637 816
638sub size_allocate { 817sub invoke_size_allocate {
639 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
640 819
641 $self->SUPER::size_allocate ($w, $h);
642 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
643} 823}
644 824
645sub _render { 825sub _render {
826 my ($self) = @_;
827
646 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
647} 829}
648 830
649sub render_child { 831sub render_child {
650 my ($self) = @_; 832 my ($self) = @_;
651 833
652 $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 {
653 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
655 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
656 $self->_render; 845 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 846 };
665} 847}
666 848
667sub _draw { 849sub _draw {
668 my ($self) = @_; 850 my ($self) = @_;
669 851
670 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
671 853
672 my $tex = $self->{texture} 854 my $tex = $self->{texture}
673 or return; 855 or return;
674 856
675 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
685 867
686package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
687 869
688our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
689 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
690sub size_request { 882sub size_request {
691 my ($self) = @_; 883 my ($self) = @_;
692 884
693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 886
696 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
697} 888 $h = 10 if $self->{scroll_y};
698 889
890 ($w, $h)
891}
892
699sub size_allocate { 893sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
701 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);
702 $self->update; 902 $self->update;
903
904 1
703} 905}
704 906
705sub set_offset { 907sub set_offset {
706 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
707 909
… …
740} 942}
741 943
742sub _render { 944sub _render {
743 my ($self) = @_; 945 my ($self) = @_;
744 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
745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
746 951
747 $self->SUPER::_render; 952 $self->SUPER::_render;
748} 953}
749 954
750############################################################################# 955#############################################################################
751 956
752package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
753 958
754our @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;
755 1023
756sub new { 1024sub new {
757 my $class = shift; 1025 my $class = shift;
758 1026
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
769 $self = $class->SUPER::new ( 1027 $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 1028 bg => undef,
771 slider => $slider,
772 @_, 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,
773 ); 1083 );
774 1084
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
779 $self
780}
781
782#TODO# update range on size_allocate depeneing on child
783# update viewport offset on scroll
784
785#############################################################################
786
787package CFClient::UI::Frame;
788
789our @ISA = CFClient::UI::Bin::;
790
791use CFClient::OpenGL;
792
793#############################################################################
794
795package CFClient::UI::FancyFrame;
796
797our @ISA = CFClient::UI::Bin::;
798
799use CFClient::OpenGL;
800
801my @tex =
802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
803 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804
805sub new {
806 my $class = shift;
807
808 # TODO: user_x, user_y, overwrite moveto?
809
810 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1],
813 border => 0.6,
814 can_events => 1,
815 @_
816 );
817
818 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
819 align => 0, 1086 align => 0,
820 valign => 1, 1087 valign => 1,
821 text => $self->{title}, 1088 text => $self->{title},
822 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 }
823 1100
824 $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};
825} 1110}
826 1111
827sub border { 1112sub border {
828 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
829} 1114}
830 1115
831sub size_request { 1116sub size_request {
832 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};
833 1124
834 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
835 1126
836 ( 1127 (
837 $w + $self->border * 2, 1128 $w + $self->border * 2,
838 $h + $self->border * 2, 1129 $h + $self->border * 2,
839 ) 1130 )
840} 1131}
841 1132
842sub size_allocate { 1133sub invoke_size_allocate {
843 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
844 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
845 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
847 1146
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
849 if $self->{title};
850
851 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
852}
853 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
854sub button_down { 1155sub invoke_button_down {
855 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
856 1157
857 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
858 my $border = $self->border; 1159 my $border = $self->border;
859 1160
… …
872 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
873 1174
874 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
876 1177
877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
880 $self->check_size; 1182 $self->realloc;
881 }; 1183 };
882 1184
883 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
884 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
885 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
887 $self->{motion} = sub { 1189 $self->{motion} = sub {
888 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
889 1191
890 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
891 1193
892 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
893 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
894 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
895 } 1202 1
896} 1203}
897 1204
898sub button_up { 1205sub invoke_button_up {
899 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
900 1207
901 delete $self->{motion}; 1208 ! ! delete $self->{motion}
902} 1209}
903 1210
904sub mouse_motion { 1211sub invoke_mouse_motion {
905 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
906 1213
907 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
908} 1217}
909 1218
910sub _draw { 1219sub _draw {
911 my ($self) = @_; 1220 my ($self) = @_;
912 1221
1222 my $child = $self->{children}[0];
1223
913 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
915 1226
916 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
918 1229
919 my $border = $self->border; 1230 my $border = $self->border;
920 1231
921 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
922 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
926 1237
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
928 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
929 1240
930 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
931 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
932 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
933
934 glColor @{ $self->{bg} };
935
936 $bg->{s} = $rep_x;
937 $bg->{t} = $rep_y;
938 $bg->{wrap_mode} = 1;
939 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 } 1246 }
941 1247
942 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
943 1249
944 $self->{title}->draw if $self->{title};
945
946 $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};
947} 1261}
948 1262
949############################################################################# 1263#############################################################################
950 1264
951package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
959sub new { 1273sub new {
960 my $class = shift; 1274 my $class = shift;
961 1275
962 $class->SUPER::new ( 1276 $class->SUPER::new (
963 col_expand => [], 1277 col_expand => [],
964 @_ 1278 @_,
965 ) 1279 )
1280}
1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
966} 1284}
967 1285
968sub add { 1286sub add {
969 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
970 1288
971 $child->set_parent ($self); 1289 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
973 1291
974 $child->check_size; 1292 $self->realloc;
975} 1293}
976 1294
977sub children { 1295sub remove {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
979}
980 1297
1298 # TODO: not yet implemented
1299}
1300
981# 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?
982sub clear { 1302sub clear {
983 my ($self) = @_; 1303 my ($self) = @_;
984 1304
985 my @children = $self->children; 1305 my @children = $self->children;
986 delete $self->{children}; 1306 delete $self->{children};
… …
988 for (@children) { 1308 for (@children) {
989 delete $_->{parent}; 1309 delete $_->{parent};
990 $_->hide; 1310 $_->hide;
991 } 1311 }
992 1312
993 $self->update; 1313 $self->realloc;
994} 1314}
995 1315
996sub get_wh { 1316sub get_wh {
997 my ($self) = @_; 1317 my ($self) = @_;
998 1318
… …
1024 (sum @$ws), 1344 (sum @$ws),
1025 (sum @$hs), 1345 (sum @$hs),
1026 ) 1346 )
1027} 1347}
1028 1348
1029sub size_allocate { 1349sub invoke_size_allocate {
1030 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1031 1351
1032 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1033 1353
1034 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1036 1356
1037 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1066 } 1386 }
1067 1387
1068 $y += $row_h; 1388 $y += $row_h;
1069 } 1389 }
1070 1390
1391 1
1071} 1392}
1072 1393
1073sub find_widget { 1394sub find_widget {
1074 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1075 1396
… …
1094 } 1415 }
1095} 1416}
1096 1417
1097############################################################################# 1418#############################################################################
1098 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
1099package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1100 1481
1101# TODO: wrap into common Box base class
1102
1103our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1104 1483
1105sub size_request { 1484sub new {
1106 my ($self) = @_; 1485 my $class = shift;
1107 1486
1108 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1109 1488 vertical => 0,
1110 ( 1489 @_,
1111 (List::Util::sum map $_->[0], @alloc),
1112 (List::Util::max map $_->[1], @alloc),
1113 ) 1490 )
1114} 1491}
1115 1492
1116sub size_allocate {
1117 my ($self, $w, $h) = @_;
1118
1119 ($h, $w) = ($w, $h);
1120
1121 my $children = $self->{children};
1122
1123 my @h = map $_->{req_w}, @$children;
1124
1125 my $req_h = List::Util::sum @h;
1126
1127 if ($req_h > $h) {
1128 # ah well, not enough space
1129 $_ *= $h / $req_h for @h;
1130 } else {
1131 my $exp = List::Util::sum map $_->{expand}, @$children;
1132 $exp ||= 1;
1133
1134 for (0 .. $#$children) {
1135 my $child = $children->[$_];
1136
1137 my $alloc_h = $h[$_];
1138 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1139 $h[$_] = $alloc_h;
1140 }
1141 }
1142
1143 CFClient::UI::harmonize \@h;
1144
1145 my $y = 0;
1146 for (0 .. $#$children) {
1147 my $child = $children->[$_];
1148 my $h = $h[$_];
1149 $child->configure ($y, 0, $h, $w);
1150
1151 $y += $h;
1152 }
1153
1154 1
1155}
1156
1157############################################################################# 1493#############################################################################
1158 1494
1159package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1160 1496
1161# TODO: wrap into common Box base class
1162
1163our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1164 1498
1165sub size_request { 1499sub new {
1166 my ($self) = @_; 1500 my $class = shift;
1167 1501
1168 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1169 1503 vertical => 1,
1170 ( 1504 @_,
1171 (List::Util::max map $_->[0], @alloc),
1172 (List::Util::sum map $_->[1], @alloc),
1173 ) 1505 )
1174} 1506}
1175 1507
1176sub size_allocate {
1177 my ($self, $w, $h) = @_;
1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1181 my $children = $self->{children};
1182
1183 my @h = map $_->{req_h}, @$children;
1184
1185 my $req_h = List::Util::sum @h;
1186
1187 if ($req_h > $h) {
1188 # ah well, not enough space
1189 $_ *= $h / $req_h for @h;
1190 } else {
1191 my $exp = List::Util::sum map $_->{expand}, @$children;
1192 $exp ||= 1;
1193
1194 for (0 .. $#$children) {
1195 my $child = $children->[$_];
1196
1197 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1198 }
1199 }
1200
1201 CFClient::UI::harmonize \@h;
1202
1203 my $y = 0;
1204 for (0 .. $#$children) {
1205 my $child = $children->[$_];
1206 my $h = $h[$_];
1207 $child->configure (0, $y, $w, $h);
1208
1209 $y += $h;
1210 }
1211
1212 1
1213}
1214
1215############################################################################# 1508#############################################################################
1216 1509
1217package CFClient::UI::Label; 1510package CFClient::UI::Label;
1218 1511
1219our @ISA = CFClient::UI::Base::; 1512our @ISA = CFClient::UI::DrawBG::;
1220 1513
1221use CFClient::OpenGL; 1514use CFClient::OpenGL;
1222 1515
1223sub new { 1516sub new {
1224 my ($class, %arg) = @_; 1517 my ($class, %arg) = @_;
1225 1518
1226 my $self = $class->SUPER::new ( 1519 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1521 #bg => none
1522 #active_bg => none
1228 #font => default_font 1523 #font => default_font
1229 #text => initial text 1524 #text => initial text
1230 #markup => initial narkup 1525 #markup => initial narkup
1526 #max_w => maximum pixel width
1527 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1232 fontsize => 1, 1529 fontsize => 1,
1233 align => -1, 1530 align => -1,
1234 valign => -1, 1531 valign => -1,
1235 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1236 can_events => 0, 1534 can_events => 0,
1237 %arg 1535 %arg
1238 ); 1536 );
1239 1537
1240 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1250 } 1548 }
1251 1549
1252 $self 1550 $self
1253} 1551}
1254 1552
1255sub escape { 1553sub escape($) {
1256 local $_ = $_[1]; 1554 local $_ = $_[0];
1257 1555
1258 s/&/&amp;/g; 1556 s/&/&amp;/g;
1259 s/>/&gt;/g; 1557 s/>/&gt;/g;
1260 s/</&lt;/g; 1558 s/</&lt;/g;
1261 1559
1262 $_[1] 1560 $_
1263} 1561}
1264 1562
1265sub update { 1563sub update {
1266 my ($self) = @_; 1564 my ($self) = @_;
1267 1565
1268 delete $self->{texture}; 1566 delete $self->{texture};
1269 $self->SUPER::update; 1567 $self->SUPER::update;
1270} 1568}
1271 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1272sub set_text { 1577sub set_text {
1273 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1274 1579
1275 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1277 1582
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1279 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1280 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1281 $self->update; 1588 $self->update;
1282 $self->check_size;
1283} 1589}
1284 1590
1285sub set_markup { 1591sub set_markup {
1286 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1287 1593
… …
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292 1598
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1294 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1295 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1296 $self->update; 1604 $self->update;
1297 $self->check_size;
1298} 1605}
1299 1606
1300sub size_request { 1607sub size_request {
1301 my ($self) = @_; 1608 my ($self) = @_;
1302 1609
1610 $self->{size_req} ||= do {
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1616
1307 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1308 1618
1309 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1310 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1312 1622
1313 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1314 1624
1315 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1317 } 1630 };
1318 1631
1319 ( 1632 @{ $self->{size_req} }
1320 $w + $self->{padding} * 2,
1321 $h + $self->{padding} * 2,
1322 )
1323} 1633}
1324 1634
1325sub size_allocate { 1635sub invoke_size_allocate {
1326 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1327 1637
1638 delete $self->{ox};
1639
1328 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1329} 1644}
1330 1645
1331sub set_fontsize { 1646sub set_fontsize {
1332 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1333 1648
1334 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1335 delete $self->{texture}; 1650 delete $self->{texture};
1336 1651
1337 $self->update; 1652 $self->realloc;
1338 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1339} 1661}
1340 1662
1341sub _draw { 1663sub _draw {
1342 my ($self) = @_; 1664 my ($self) = @_;
1665
1666 $self->SUPER::_draw; # draw background, if applicable
1343 1667
1344 my $tex = $self->{texture} ||= do { 1668 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1669 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1670 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1675
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1361 }; 1677 };
1362 1678
1679 unless (exists $self->{ox}) {
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
1363 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1365 1693
1366 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1367 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1369 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1371 } 1701 }
1372 1702
1373 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1374} 1704}
1375 1705
… …
1391 active_fg => [0, 0, 0], 1721 active_fg => [0, 0, 0],
1392 can_hover => 1, 1722 can_hover => 1,
1393 can_focus => 1, 1723 can_focus => 1,
1394 valign => 0, 1724 valign => 0,
1395 can_events => 1, 1725 can_events => 1,
1726 #text => ...
1727 #hidden => "*",
1396 @_ 1728 @_
1397 ) 1729 )
1398} 1730}
1399 1731
1400sub _set_text { 1732sub _set_text {
… …
1402 1734
1403 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1404 1736
1405 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1406 1738
1407 delete $self->{texture};
1408
1409 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1410 $self->{text} = $text; 1740 $self->{text} = $text;
1411 1741
1412 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1414 1745
1415 $self->emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1416} 1750}
1417 1751
1418sub set_text { 1752sub set_text {
1419 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1420 1754
1421 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1756 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425} 1757}
1426 1758
1427sub get_text { 1759sub get_text {
1428 $_[0]{text} 1760 $_[0]{text}
1429} 1761}
… …
1434 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1435 1767
1436 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1437} 1769}
1438 1770
1439sub size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443}
1444
1445sub key_down { 1771sub invoke_key_down {
1446 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1447 1773
1448 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1449 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
1451 1777
1452 my $text = $self->get_text; 1778 my $text = $self->get_text;
1453 1779
1454 if ($sym == 8) { 1780 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1782 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1783 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1784 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1785 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1786 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1787 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1792 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1793 $self->emit ('escape');
1468 } elsif ($uni) { 1794 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1470 } 1798 }
1471 1799
1472 $self->_set_text ($text); 1800 $self->_set_text ($text);
1473 $self->update;
1474}
1475 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1476sub focus_in { 1807sub invoke_focus_in {
1477 my ($self) = @_; 1808 my ($self) = @_;
1478 1809
1479 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1480 1811
1481 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1482} 1813}
1483 1814
1484sub button_down { 1815sub invoke_button_down {
1485 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1486 1817
1487 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1488 1819
1489 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1490 1821
1491 # byte-index to char-index 1822 # byte-index to char-index
1492 my $text = $self->{text}; 1823 my $text = $self->{text};
1493 utf8::encode $text; 1824 utf8::encode $text;
1494 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1495 1826
1496 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1497 $self->update; 1828 $self->update;
1829
1830 1
1498} 1831}
1499 1832
1500sub mouse_motion { 1833sub invoke_mouse_motion {
1501 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1502# 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
1503} 1838}
1504 1839
1505sub _draw { 1840sub _draw {
1506 my ($self) = @_; 1841 my ($self) = @_;
1507 1842
1508 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1509 1844
1510 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1511 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1512 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1513 } else { 1848 } else {
1514 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1515 } 1850 }
1516 1851
1517 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1519 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1520 glVertex 0 , 0; 1855 glVertex 0 , 0;
1521 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1522 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1523 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1548 1883
1549our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1550 1885
1551use CFClient::OpenGL; 1886use CFClient::OpenGL;
1552 1887
1553sub key_down { 1888sub invoke_key_down {
1554 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1555 1890
1556 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1557 1892
1558 if ($sym == 13) { 1893 if ($sym == 13) {
… …
1584 } else { 1919 } else {
1585 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1586 } 1921 }
1587 1922
1588 } else { 1923 } else {
1589 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1590 } 1927 1
1591
1592} 1928}
1593 1929
1594############################################################################# 1930#############################################################################
1595 1931
1596package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1605 1941
1606sub new { 1942sub new {
1607 my $class = shift; 1943 my $class = shift;
1608 1944
1609 $class->SUPER::new ( 1945 $class->SUPER::new (
1610 padding => 4, 1946 padding_x => 4,
1947 padding_y => 4,
1611 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1949 active_fg => [0, 0, 1],
1614 can_hover => 1, 1950 can_hover => 1,
1615 align => 0, 1951 align => 0,
1616 valign => 0, 1952 valign => 0,
1617 can_events => 1, 1953 can_events => 1,
1618 @_ 1954 @_
1619 ) 1955 )
1620} 1956}
1621 1957
1622sub button_up { 1958sub invoke_button_up {
1623 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1624 1960
1961 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 1963 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate"); 1964
1628 } 1965 1
1629} 1966}
1630 1967
1631sub _draw { 1968sub _draw {
1632 my ($self) = @_; 1969 my ($self) = @_;
1633 1970
1634 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1635
1636 if ($GRAB == $self) {
1637 $self->{fg} = $self->{active_fg};
1638 }
1639 1972
1640 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1642 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1643 1976
… …
1648 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1649} 1982}
1650 1983
1651############################################################################# 1984#############################################################################
1652 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
2018}
2019
2020#############################################################################
2021
1653package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
1654 2023
1655our @ISA = CFClient::UI::DrawBG::; 2024our @ISA = CFClient::UI::DrawBG::;
1656 2025
1657my @tex = 2026my @tex =
… …
1662 2031
1663sub new { 2032sub new {
1664 my $class = shift; 2033 my $class = shift;
1665 2034
1666 $class->SUPER::new ( 2035 $class->SUPER::new (
1667 padding => 2, 2036 padding_x => 2,
2037 padding_y => 2,
1668 fg => [1, 1, 1], 2038 fg => [1, 1, 1],
1669 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],
1670 state => 0, 2042 state => 0,
1671 can_hover => 1, 2043 can_hover => 1,
1672 @_ 2044 @_
1673 ) 2045 )
1674} 2046}
1675 2047
1676sub size_request { 2048sub size_request {
1677 my ($self) = @_; 2049 my ($self) = @_;
1678 2050
1679 ($self->{padding} * 2 + 6) x 2 2051 (6) x 2
1680} 2052}
1681 2053
1682sub button_down { 2054sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1684 2056
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1687 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1688 $self->emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1689 } 2065 1
1690} 2066}
1691 2067
1692sub _draw { 2068sub _draw {
1693 my ($self) = @_; 2069 my ($self) = @_;
1694 2070
1695 $self->SUPER::_draw; 2071 $self->SUPER::_draw;
1696 2072
1697 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1698 2074
1699 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;
1700 2078
1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1702 2080
1703 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704 2082
… …
1859 2237
1860 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
1861 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
1862 2240
1863 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
1864 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;
1865 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1867 2246
1868 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
1869 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2337 qw(s1_slider.png s1_slider_bg.png);
1959 2338
1960sub new { 2339sub new {
1961 my $class = shift; 2340 my $class = shift;
1962 2341
1963 # range [value, low, high, page] 2342 # range [value, low, high, page, unit]
1964 2343
1965 # TODO: 0-width page 2344 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2345 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2346 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2347 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2348 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2352 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2353 min_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2354 min_h => $::WIDTH / 80,
1974 vertical => 0, 2355 vertical => 0,
1975 can_hover => 1, 2356 can_hover => 1,
1976 inner_pad => 5, 2357 inner_pad => 0.02,
1977 @_ 2358 @_
1978 ); 2359 );
1979 2360
2361 $self->set_value ($self->{range}[0]);
2362 $self->update;
2363
1980 $self 2364 $self
1981} 2365}
1982 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
1983sub size_request { 2401sub size_request {
1984 my ($self) = @_; 2402 my ($self) = @_;
1985 2403
1986 my $w = $self->{req_w}; 2404 ($self->{req_w}, $self->{req_h})
1987 my $h = $self->{req_h};
1988
1989 $self->{vertical} ? ($h, $w) : ($w, $h)
1990} 2405}
1991 2406
1992sub button_down { 2407sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
1994 2409
1995 $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
1996 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
1997} 2415}
1998 2416
1999sub mouse_motion { 2417sub invoke_mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2001 2419
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2449 my $range = ($hi - $page - $lo) || 1e-100;
2004 2450
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2452
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2453 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2454 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2455
2010 $x -= $inner_pad_px; # substract the padding 2456 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2457 $value = $value * $self->{scale} + $self->{offset};
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2458
2016 $self->emit (changed => $x); 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2460 $self->{knob_w} = $knob_w;
2018 } 2461 }
2019}
2020
2021# the inner_* stuff is for generating a padding for the slider handle,
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027}
2028
2029sub _draw {
2030 my ($self) = @_;
2031 2462
2032 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2033 2464
2034 my ($w, $h) = @$self{qw(w h)}; 2465 glScale $self->{w}, $self->{h};
2035 2466
2036 if ($self->{vertical}) { 2467 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2468 # draw a vertical slider like a rotated horizontal slider
2038 2469
2470 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2471 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2472 }
2044 2473
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2474 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2475 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2476
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2477 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2478 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2479
2069 # draw background 2480 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2481 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2482
2072 # draw handle 2483 # draw handle
2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2484 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074 2485
2075 glDisable GL_TEXTURE_2D; 2486 glDisable GL_TEXTURE_2D;
2076} 2487}
2077 2488
2078############################################################################# 2489#############################################################################
2079 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
2080package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2081 2533
2082our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2083 2535
2084use CFClient::OpenGL; 2536use CFClient::OpenGL;
2085 2537
… …
2087 my $class = shift; 2539 my $class = shift;
2088 2540
2089 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2090 fontsize => 1, 2542 fontsize => 1,
2091 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2092 #font => default_font 2545 #font => default_font
2093 @_, 2546 @_,
2094 2547
2095 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2096 par => [], 2549 par => [],
… …
2111 2564
2112 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2566 $self->reflow;
2114} 2567}
2115 2568
2116sub text_height {
2117 my ($self, $text) = @_;
2118
2119 my $layout = $self->{layout};
2120
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w});
2123 $layout->set_markup ($text);
2124
2125 ($layout->size)[1]
2126}
2127
2128sub reflow {
2129 my ($self) = @_;
2130
2131 $self->{need_reflow}++;
2132 $self->update;
2133}
2134
2135sub size_allocate { 2569sub invoke_size_allocate {
2136 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2137
2138 $self->SUPER::size_allocate ($w, $h);
2139 2571
2140 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2142 $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});
2143 2576
2144 $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]);
2145} 2615}
2146 2616
2147sub add_paragraph { 2617sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2618 my ($self, $color, $text, $indent) = @_;
2149 2619
2150 #TODO: intelligently "reformat" paragraph 2620 for my $line (split /\n/, $text) {
2151 2621 my ($w, $h) = $self->text_size ($line);
2152 my $height = $self->text_height ($text);
2153
2154 $self->{height} += $height; 2622 $self->{height} += $h;
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2624 }
2155 2625
2156 push @{$self->{par}}, [$height, $color, $text];
2157
2158 $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]);
2159 $self->{children}[1]->update;
2160} 2627}
2161 2628
2162sub update { 2629sub update {
2163 my ($self) = @_; 2630 my ($self) = @_;
2164 2631
… …
2166 2633
2167 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2168 2635
2169 delete $self->{texture}; 2636 delete $self->{texture};
2170 2637
2171 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640
2172 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2642 my $height = 0;
2174 2643
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2176 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 }
2177 2660
2178 $self->{height} = $height; 2661 $self->{height} = $height;
2179 2662
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181 2664
2182 delete $self->{texture}; 2665 delete $self->{texture};
2183 } 2666 }
2184 2667
2185 $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 {
2186 glClearColor 0, 0, 0, 0; 2669 glClearColor 0, 0, 0, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2188 2671
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2193 2673
2194 my $y0 = $top; 2674 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2675 my $y1 = $top + $H;
2196 2676
2197 my $y = 0; 2677 my $y = 0;
2198 2678
2199 my $layout = $self->{layout}; 2679 my $layout = $self->{layout};
2200 2680
2201 $layout->set_font ($self->{font}) if $self->{font}; 2681 $layout->set_font ($self->{font}) if $self->{font};
2202 2682
2683 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off
2685 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2203 for my $par (@{$self->{par}}) { 2687 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2688 my $h = $par->[1];
2205 2689
2206 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2691 $layout->set_foreground (@{ $par->[2] });
2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2208 $layout->set_markup ($par->[2]); 2694 $layout->set_markup ($par->[4]);
2209 2695
2210 my ($W, $H) = $layout->size; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2697
2698 glRasterPos $par->[3], $y - $y0;
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2212 } 2700 }
2213 2701
2214 $y += $h; 2702 $y += $h;
2215 } 2703 }
2216 2704
2217 glDisable GL_TEXTURE_2D; 2705 glDisable GL_BLEND;
2218 }; 2706 };
2219 }); 2707 });
2220} 2708}
2221 2709
2222sub _draw { 2710sub _draw {
2223 my ($self) = @_; 2711 my ($self) = @_;
2224 2712
2225 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (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});
2229 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2230 2718
2231 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2232 2720
… …
2282 2770
2283sub new { 2771sub new {
2284 my $class = shift; 2772 my $class = shift;
2285 2773
2286 my $self = $class->SUPER::new ( 2774 my $self = $class->SUPER::new (
2287 state => 0, 2775 state => 0,
2288 connect_activate => \&toggle_flopper, 2776 on_activate => \&toggle_flopper,
2289 @_ 2777 @_
2290 ); 2778 );
2291 2779
2292 if ($self->{state}) {
2293 $self->{state} = 0;
2294 $self->toggle_flopper;
2295 }
2296
2297 $self 2780 $self
2298} 2781}
2299 2782
2300sub toggle_flopper { 2783sub toggle_flopper {
2301 my ($self) = @_; 2784 my ($self) = @_;
2302 2785
2303 # TODO: use animation 2786 $self->{other}->toggle_visibility;
2304 if ($self->{state} = !$self->{state}) {
2305 $CFClient::UI::ROOT->add ($self->{other});
2306 $self->{other}->move ($self->coord2global (0, $self->{h}));
2307 $self->emit ("open");
2308 } else {
2309 $CFClient::UI::ROOT->remove ($self->{other});
2310 $self->emit ("close");
2311 }
2312
2313 $self->emit (changed => $self->{state});
2314} 2787}
2315 2788
2316############################################################################# 2789#############################################################################
2317 2790
2318package CFClient::UI::Tooltip; 2791package CFClient::UI::Tooltip;
… …
2331} 2804}
2332 2805
2333sub set_tooltip_from { 2806sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2807 my ($self, $widget) = @_;
2335 2808
2809 my $tooltip = $widget->{tooltip};
2810
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
2336 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2822 markup => $tooltip,
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2824 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2825 fg => [0, 0, 0, 1],
2826 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2827 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2828 );
2343} 2829}
2344 2830
2345sub size_request { 2831sub size_request {
2346 my ($self) = @_; 2832 my ($self) = @_;
… …
2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2349 2835
2350 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2351} 2837}
2352 2838
2353sub size_allocate { 2839sub invoke_size_allocate {
2354 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2355 2841
2356 $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 });
2357} 2861}
2358 2862
2359sub _draw { 2863sub _draw {
2360 my ($self) = @_; 2864 my ($self) = @_;
2361 2865
… …
2378 glVertex $w, $h; 2882 glVertex $w, $h;
2379 glVertex $w, 0; 2883 glVertex $w, 0;
2380 glEnd; 2884 glEnd;
2381 2885
2382 glTranslate 2 - 0.375, 2 - 0.375; 2886 glTranslate 2 - 0.375, 2 - 0.375;
2887
2383 $self->SUPER::_draw; 2888 $self->SUPER::_draw;
2384} 2889}
2385 2890
2386############################################################################# 2891#############################################################################
2387 2892
… …
2392use CFClient::OpenGL; 2897use CFClient::OpenGL;
2393 2898
2394sub new { 2899sub new {
2395 my $class = shift; 2900 my $class = shift;
2396 2901
2397 $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2398 aspect => 1, 2903 aspect => 1,
2904 can_events => 0,
2399 @_, 2905 @_,
2400 ) 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
2401} 2923}
2402 2924
2403sub size_request { 2925sub size_request {
2404 (32, 8) 2926 (32, 8)
2405} 2927}
2406 2928
2929sub update {
2930 my ($self) = @_;
2931
2932 return unless $self->{visible};
2933
2934 $self->SUPER::update;
2935}
2936
2407sub _draw { 2937sub _draw {
2408 my ($self) = @_; 2938 my ($self) = @_;
2409 2939
2410 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
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2952
2413 # TODO animation
2414 if ($tex) { 2953 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2420 } 2959 }
2421} 2960}
2422 2961
2962sub destroy {
2963 my ($self) = @_;
2964
2965 $self->{timer}->cancel
2966 if $self->{timer};
2967
2968 $self->SUPER::destroy;
2969}
2970
2423############################################################################# 2971#############################################################################
2424 2972
2425package CFClient::UI::InventoryItem; 2973package CFClient::UI::Buttonbar;
2426 2974
2427our @ISA = CFClient::UI::HBox::; 2975our @ISA = CFClient::UI::HBox::;
2428 2976
2429sub new { 2977# TODO: should actualyl wrap buttons and other goodies.
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531 2978
2532############################################################################# 2979#############################################################################
2533 2980
2534package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2535 2982
… …
2547 ); 2994 );
2548 2995
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2550 2997
2551 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2553 3000
2554 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2555 if (!ref $widget) { 3002 if (!ref $widget) {
2556 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2557 can_hover => 1, 3004 can_hover => 1,
2558 can_events => 1, 3005 can_events => 1,
2559 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2560 } 3008 }
2561 3009
2562 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2563 3011
2564 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2576 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 3025 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2579 3027
2580 $self->show; 3028 $self->show;
2581 $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);
2582} 3030}
2583 3031
2584sub mouse_motion { 3032sub invoke_mouse_motion {
2585 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2586 3034
2587 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2590}
2591 3038
3039 0
3040}
3041
2592sub button_up { 3042sub invoke_button_up {
2593 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2594 3044
2595 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 3046 undef $GRAB;
2597 $self->hide; 3047 $self->hide;
2598 3048
2599 $self->emit ("popdown"); 3049 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2601 } 3055 1
2602} 3056}
2603 3057
2604############################################################################# 3058#############################################################################
2605 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
2606package CFClient::UI::Statusbox; 3226package CFClient::UI::Statusbox;
2607 3227
2608our @ISA = CFClient::UI::VBox::; 3228our @ISA = CFClient::UI::VBox::;
2609 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
2610sub reorder { 3245sub reorder {
2611 my ($self) = @_; 3246 my ($self) = @_;
2612 my $NOW = time; 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} };
2613 3253
2614 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 } 3256 }
2617 3257
… …
2620 my @items = sort { 3260 my @items = sort {
2621 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
2624 3264
3265 $self->{timer}->interval (1);
3266
2625 my $count = 10 + 1; 3267 my $count = 10 + 1;
2626 for my $item (@items) { 3268 for my $item (@items) {
2627 last unless --$count; 3269 last unless --$count;
2628 3270
2629 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 3275 : $item->{text};
2634 3276
2635 for ($short) { 3277 for ($short) {
2636 s/^\s+//; 3278 s/^\s+//;
2637 s/\012.*/…/s; 3279 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 3280 }
2641 3281
2642 new CFClient::UI::Label 3282 new CFClient::UI::Label
2643 markup => $short, 3283 markup => $short,
2644 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
2648 color => $item->{color}, 3288 max_w => $::WIDTH * 0.44,
3289 fg => [@{ $item->{fg} }],
2649 can_events => 1, 3290 can_events => 1,
2650 can_hover => 1 3291 can_hover => 1
2651 }; 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;
2652 } 3305 }
2653 3306
2654 $self->clear; 3307 $self->clear;
2655 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
2656} 3309}
… …
2659 my ($self, $text, %arg) = @_; 3312 my ($self, $text, %arg) = @_;
2660 3313
2661 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
2663 3316
3317 return unless $text;
3318
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2665 3320
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 3322
2668 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
2670 $item->{count}++; 3325 $item->{count}++;
2671 } else { 3326 } else {
2672 $item->{count} = 1; 3327 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
2674 } 3329 }
2675 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
2676 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
2677 delete $item->{label}; 3332 delete $item->{label};
2678 } else { 3333 } else {
2679 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
2680 id => ++$self->{id}, 3335 id => ++$self->{id},
2681 text => $text, 3336 text => $text,
2682 timeout => $timeout, 3337 timeout => $timeout,
2683 tooltip => $text, 3338 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 3339 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 3340 pri => 0,
2687 count => 1, 3341 count => 1,
2688 %arg, 3342 %arg,
2689 }; 3343 };
2690 } 3344 }
2691 3345
2692 $self->reorder; 3346 $self->reorder;
2693} 3347}
2694 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
2695############################################################################# 3367#############################################################################
2696 3368
2697package CFClient::UI::Root; 3369package CFClient::UI::Inventory;
2698 3370
2699our @ISA = CFClient::UI::Container::; 3371our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701use CFClient::OpenGL;
2702 3372
2703sub new { 3373sub new {
2704 my $class = shift; 3374 my $class = shift;
2705 3375
2706 $class->SUPER::new ( 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 => [],
2707 @_, 3619 @_,
2708 ) 3620 )
2709} 3621}
2710 3622
2711sub configure { 3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2712 my ($self, $x, $y, $w, $h) = @_;
2713 3624
2714 $self->{w} = $w; 3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2715 $self->{h} = $h; 3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2716} 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");
2717 3635
2718sub check_size { 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 {
2719 my ($self) = @_; 3709 my ($self, $spell) = @_;
2720 3710
2721 $self->size_allocate ($self->{w}, $self->{h}) 3711 $self->{spell}->{$spell->{name}} = $spell;
2722 if $self->{w}; 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
3731package CFClient::UI::Root;
3732
3733our @ISA = CFClient::UI::Container::;
3734
3735use List::Util qw(min max);
3736
3737use CFClient::OpenGL;
3738
3739sub new {
3740 my $class = shift;
3741
3742 my $self = $class->SUPER::new (
3743 visible => 1,
3744 @_,
3745 );
3746
3747 Scalar::Util::weaken ($self->{root} = $self);
3748
3749 $self
2723} 3750}
2724 3751
2725sub size_request { 3752sub size_request {
2726 my ($self) = @_; 3753 my ($self) = @_;
2727 3754
2728 ($self->{w}, $self->{h}) 3755 ($self->{w}, $self->{h})
2729} 3756}
2730 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
2731sub size_allocate { 3772sub invoke_size_allocate {
2732 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 3774
2750 for my $child ($self->children) { 3775 for my $child ($self->children) {
2751 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)};
2752 3777
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3778 $X = $child->{force_x} if exists $child->{force_x};
2754 $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
2755 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
2756 } 3785 }
2757 3786
2758 $self->{old_w} = $w; 3787 1
2759 $self->{old_h} = $h;
2760} 3788}
2761 3789
2762sub coord2local { 3790sub coord2local {
2763 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
2764 3792
… …
2772} 3800}
2773 3801
2774sub update { 3802sub update {
2775 my ($self) = @_; 3803 my ($self) = @_;
2776 3804
2777 $self->check_size;
2778 $::WANT_REFRESH++; 3805 $::WANT_REFRESH++;
2779} 3806}
2780 3807
2781sub add { 3808sub add {
2782 my ($self, $child) = @_; 3809 my ($self, @children) = @_;
2783 3810
2784 # integerise window positions 3811 $_->{is_toplevel} = 1
2785 $child->{x} = int $child->{x}; 3812 for @children;
2786 $child->{y} = int $child->{y};
2787 3813
2788 $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 }
2789} 3830}
2790 3831
2791sub on_refresh { 3832sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3833 my ($self, $id, $cb) = @_;
2793 3834
… …
2806 while ($self->{refresh_hook}) { 3847 while ($self->{refresh_hook}) {
2807 $_->() 3848 $_->()
2808 for values %{delete $self->{refresh_hook}}; 3849 for values %{delete $self->{refresh_hook}};
2809 } 3850 }
2810 3851
2811 if ($self->{check_size}) { 3852 if ($self->{realloc}) {
2812 my @queue = ([], []); 3853 my %queue;
3854 my @queue;
3855 my $widget;
2813 3856
2814 for (;;) { 3857 outer:
2815 if ($self->{check_size}) { 3858 while () {
2816 # heuristic: check containers last 3859 if (my $realloc = delete $self->{realloc}) {
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3860 for $widget (values %$realloc) {
2818 for values %{delete $self->{check_size}} 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 }
2819 } 3867 }
2820 3868
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3869 while () {
3870 @queue or last outer;
2822 3871
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3872 $widget = pop @{ $queue[-1] || [] }
2824 ? @$widget{qw(user_w user_h)} 3873 and last;
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830 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}) {
2831 $widget->{req_w} = $w; 3893 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h; 3894 $widget->{req_h} = $h;
2833 3895
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3896 $self->{size_alloc}{$widget+0} = $widget;
2835 3897
2836 $widget->{parent}->check_size
2837 if $widget->{parent}; 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 }
2838 } 3905 }
3906
3907 delete $self->{realloc}{$widget+0};
2839 } 3908 }
2840 } 3909 }
2841 3910
2842 while ($self->{size_alloc}) { 3911 while (my $size_alloc = delete $self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) { 3912 my @queue = sort { $b->{visible} <=> $a->{visible} }
2844 my ($widget, $w, $h) = @$_; 3913 values %$size_alloc;
3914
3915 while () {
3916 my $widget = pop @queue || last;
3917
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2845 3919
2846 $w = 0 if $w < 0; 3920 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3921 $h = 0 if $h < 0;
2848 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
2849 $widget->{w} = $w; 3930 $widget->{w} = $w;
2850 $widget->{h} = $h; 3931 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h); 3932
2852 $widget->emit (size_allocate => $w, $h); 3933 $widget->emit (size_allocate => $w, $h);
3934 }
2853 } 3935 }
2854 } 3936 }
2855 3937
2856 while ($self->{post_alloc_hook}) { 3938 while ($self->{post_alloc_hook}) {
2857 $_->() 3939 $_->()
2858 for values %{delete $self->{post_alloc_hook}}; 3940 for values %{delete $self->{post_alloc_hook}};
2859 } 3941 }
2860 3942
3943
2861 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3944 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3945 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3946 glClear GL_COLOR_BUFFER_BIT;
2864 3947
2865 glMatrixMode GL_PROJECTION; 3948 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3949 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3951 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3952 glLoadIdentity;
2870 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
2871 $self->_draw; 3961 $self->_draw;
2872} 3962}
2873 3963
2874############################################################################# 3964#############################################################################
2875 3965
2876package CFClient::UI; 3966package CFClient::UI;
2877 3967
2878$ROOT = new CFClient::UI::Root; 3968$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3969$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3970
28811 39711
2882 3972

Diff Legend

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