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.201 by root, Sat May 13 23:17:49 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 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 586sub DESTROY {
420 my ($self) = @_; 587 my ($self) = @_;
421 588
422 #$self->deactivate; 589 delete $WIDGET{$self+0};
590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
423} 593}
424 594
425############################################################################# 595#############################################################################
426 596
427package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
435 my $class = shift; 605 my $class = shift;
436 606
437 # range [value, low, high, page] 607 # range [value, low, high, page]
438 608
439 $class->SUPER::new ( 609 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 610 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 611 #active_bg => [1, 1, 1, 0.5],
442 @_ 612 @_
443 ) 613 )
444} 614}
445 615
446sub _draw { 616sub _draw {
447 my ($self) = @_; 617 my ($self) = @_;
448 618
619 my $color = $FOCUS == $self && $self->{active_bg}
620 ? $self->{active_bg}
621 : $self->{bg};
622
623 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
450 625
451 glEnable GL_BLEND; 626 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 628 glColor_premultiply @$color;
454 629
455 glBegin GL_QUADS; 630 glBegin GL_QUADS;
456 glVertex 0 , 0; 631 glVertex 0 , 0;
457 glVertex 0 , $h; 632 glVertex 0 , $h;
458 glVertex $w, $h; 633 glVertex $w, $h;
459 glVertex $w, 0; 634 glVertex $w, 0;
460 glEnd; 635 glEnd;
461 636
462 glDisable GL_BLEND; 637 glDisable GL_BLEND;
638 }
463} 639}
464 640
465############################################################################# 641#############################################################################
466 642
467package CFClient::UI::Empty; 643package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
474} 650}
475 651
476sub size_request { 652sub size_request {
477 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
478} 656}
479 657
480sub draw { } 658sub draw { }
481 659
482############################################################################# 660#############################################################################
… …
486our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
487 665
488sub new { 666sub new {
489 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
490 668
491 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
492 670
493 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
494 children => [], 672 children => [],
495 can_events => 0, 673 can_events => 0,
496 %arg, 674 %arg,
497 ); 675 );
676
498 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
499 679
500 $self 680 $self
501} 681}
502 682
503sub add { 683sub add {
… …
511 $self->{children} = [ 691 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
514 ]; 694 ];
515 695
516 $self->check_size (1); 696 $self->realloc;
517 $self->update;
518} 697}
519 698
520sub children { 699sub children {
521 @{ $_[0]{children} } 700 @{ $_[0]{children} }
522} 701}
… …
527 delete $child->{parent}; 706 delete $child->{parent};
528 $child->hide; 707 $child->hide;
529 708
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 710
532 $self->check_size; 711 $self->realloc;
533 $self->update;
534} 712}
535 713
536sub clear { 714sub clear {
537 my ($self) = @_; 715 my ($self) = @_;
538 716
… …
542 for (@$children) { 720 for (@$children) {
543 delete $_->{parent}; 721 delete $_->{parent};
544 $_->hide; 722 $_->hide;
545 } 723 }
546 724
547 $self->check_size; 725 $self->realloc;
548 $self->update;
549} 726}
550 727
551sub find_widget { 728sub find_widget {
552 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
553 730
554 $x -= $self->{x}; 731 $x -= $self->{x};
555 $y -= $self->{y}; 732 $y -= $self->{y};
556 733
557 my $res; 734 my $res;
558 735
559 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
560 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
561 and return $res; 738 and return $res;
562 } 739 }
563 740
564 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
585} 762}
586 763
587sub add { 764sub add {
588 my ($self, $child) = @_; 765 my ($self, $child) = @_;
589 766
590 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
591
592 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
593} 769}
594 770
595sub remove { 771sub remove {
596 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
605 781
606sub size_request { 782sub size_request {
607 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
608} 784}
609 785
610sub size_allocate { 786sub invoke_size_allocate {
611 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
612 788
613 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
614} 792}
615 793
616############################################################################# 794#############################################################################
795
796# back-buffered drawing area
617 797
618package CFClient::UI::Window; 798package CFClient::UI::Window;
619 799
620our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
621 801
… …
632 812
633 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 814 $self->SUPER::update;
635} 815}
636 816
637sub size_allocate { 817sub invoke_size_allocate {
638 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
639 819
640 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
642} 823}
643 824
644sub _render { 825sub _render {
826 my ($self) = @_;
827
645 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
646} 829}
647 830
648sub render_child { 831sub render_child {
649 my ($self) = @_; 832 my ($self) = @_;
650 833
651 $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 {
652 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
654 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
655 $self->_render; 845 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 846 };
664} 847}
665 848
666sub _draw { 849sub _draw {
667 my ($self) = @_; 850 my ($self) = @_;
668 851
669 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
670 853
671 my $tex = $self->{texture} 854 my $tex = $self->{texture}
672 or return; 855 or return;
673 856
674 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
684 867
685package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
686 869
687our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
688 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
689sub size_request { 882sub size_request {
690 my ($self) = @_; 883 my ($self) = @_;
691 884
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 886
695 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
696} 888 $h = 10 if $self->{scroll_y};
697 889
890 ($w, $h)
891}
892
698sub size_allocate { 893sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 902 $self->update;
903
904 1
702} 905}
703 906
704sub set_offset { 907sub set_offset {
705 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
706 909
… …
739} 942}
740 943
741sub _render { 944sub _render {
742 my ($self) = @_; 945 my ($self) = @_;
743 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
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 951
746 $self->SUPER::_render; 952 $self->SUPER::_render;
747} 953}
748 954
… …
751package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
752 958
753our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
754 960
755sub new { 961sub new {
756 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
757 965
758 my $self; 966 my $self;
759 967
760 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
761 vertical => 1, 969 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 971 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
765 }, 973 },
766 ; 974 ;
767 975
768 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 977 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 978 slider => $slider,
771 @_, 979 %arg,
772 ); 980 );
773 981
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
777 984
778 $self 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)
779} 1011}
780 1012
781#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 1014# update viewport offset on scroll
783 1015
… …
803 1035
804 if ($self->{bg}) { 1036 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
806 1038
807 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
809 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
810 1042
811 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
812 glVertex 0 , 0; 1044 glVertex 0 , 0;
813 glVertex 0 , $h; 1045 glVertex 0 , $h;
814 glVertex $w, $h; 1046 glVertex $w, $h;
… …
827 1059
828our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
829 1061
830use CFClient::OpenGL; 1062use CFClient::OpenGL;
831 1063
832my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835 1071
836sub new { 1072sub new {
837 my $class = shift; 1073 my ($class, %arg) = @_;
838
839 # TODO: user_x, user_y, overwrite moveto?
840 1074
841 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1078 border => 0.6,
845 can_events => 1, 1079 can_events => 1,
846 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
847 ); 1083 );
848 1084
849 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
850 align => 0, 1086 align => 0,
851 valign => 1, 1087 valign => 1,
852 text => $self->{title}, 1088 text => $self->{title},
853 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 }
854 1100
855 $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};
856} 1110}
857 1111
858sub border { 1112sub border {
859 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
860} 1114}
861 1115
862sub size_request { 1116sub size_request {
863 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};
864 1124
865 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
866 1126
867 ( 1127 (
868 $w + $self->border * 2, 1128 $w + $self->border * 2,
869 $h + $self->border * 2, 1129 $h + $self->border * 2,
870 ) 1130 )
871} 1131}
872 1132
873sub size_allocate { 1133sub invoke_size_allocate {
874 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
875 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
876 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
878 1146
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
882 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
883}
884 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
885sub button_down { 1155sub invoke_button_down {
886 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
887 1157
888 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
889 my $border = $self->border; 1159 my $border = $self->border;
890 1160
… …
903 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
904 1174
905 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
907 1177
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size; 1182 $self->realloc;
912 }; 1183 };
913 1184
914 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1189 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
920 1191
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
922 1193
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
925 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
926 } 1202 1
927} 1203}
928 1204
929sub button_up { 1205sub invoke_button_up {
930 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
931 1207
932 delete $self->{motion}; 1208 ! ! delete $self->{motion}
933} 1209}
934 1210
935sub mouse_motion { 1211sub invoke_mouse_motion {
936 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
937 1213
938 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
939} 1217}
940 1218
941sub _draw { 1219sub _draw {
942 my ($self) = @_; 1220 my ($self) = @_;
943 1221
1222 my $child = $self->{children}[0];
1223
944 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
946 1226
947 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1229
950 my $border = $self->border; 1230 my $border = $self->border;
951 1231
952 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1237
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
960 1240
961 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1246 }
972 1247
973 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
974 1249
975 $self->{title}->draw if $self->{title};
976
977 $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};
978} 1261}
979 1262
980############################################################################# 1263#############################################################################
981 1264
982package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
990sub new { 1273sub new {
991 my $class = shift; 1274 my $class = shift;
992 1275
993 $class->SUPER::new ( 1276 $class->SUPER::new (
994 col_expand => [], 1277 col_expand => [],
995 @_ 1278 @_,
996 ) 1279 )
1280}
1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1284}
998 1285
999sub add { 1286sub add {
1000 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1001 1288
1002 $child->set_parent ($self); 1289 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1004 1291
1005 $child->check_size; 1292 $self->realloc;
1006} 1293}
1007 1294
1008sub children { 1295sub remove {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
1010}
1011 1297
1298 # TODO: not yet implemented
1299}
1300
1012# 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?
1013sub clear { 1302sub clear {
1014 my ($self) = @_; 1303 my ($self) = @_;
1015 1304
1016 my @children = $self->children; 1305 my @children = $self->children;
1017 delete $self->{children}; 1306 delete $self->{children};
… …
1019 for (@children) { 1308 for (@children) {
1020 delete $_->{parent}; 1309 delete $_->{parent};
1021 $_->hide; 1310 $_->hide;
1022 } 1311 }
1023 1312
1024 $self->update; 1313 $self->realloc;
1025} 1314}
1026 1315
1027sub get_wh { 1316sub get_wh {
1028 my ($self) = @_; 1317 my ($self) = @_;
1029 1318
… …
1055 (sum @$ws), 1344 (sum @$ws),
1056 (sum @$hs), 1345 (sum @$hs),
1057 ) 1346 )
1058} 1347}
1059 1348
1060sub size_allocate { 1349sub invoke_size_allocate {
1061 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1062 1351
1063 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1064 1353
1065 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1067 1356
1068 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1097 } 1386 }
1098 1387
1099 $y += $row_h; 1388 $y += $row_h;
1100 } 1389 }
1101 1390
1391 1
1102} 1392}
1103 1393
1104sub find_widget { 1394sub find_widget {
1105 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1106 1396
… …
1125 } 1415 }
1126} 1416}
1127 1417
1128############################################################################# 1418#############################################################################
1129 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
1130package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1131 1481
1132# TODO: wrap into common Box base class
1133
1134our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1135 1483
1136sub size_request { 1484sub new {
1137 my ($self) = @_; 1485 my $class = shift;
1138 1486
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1140 1488 vertical => 0,
1141 ( 1489 @_,
1142 (List::Util::sum map $_->[0], @alloc),
1143 (List::Util::max map $_->[1], @alloc),
1144 ) 1490 )
1145} 1491}
1146 1492
1147sub size_allocate {
1148 my ($self, $w, $h) = @_;
1149
1150 ($h, $w) = ($w, $h);
1151
1152 my $children = $self->{children};
1153
1154 my @h = map $_->{req_w}, @$children;
1155
1156 my $req_h = List::Util::sum @h;
1157
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children;
1163 $exp ||= 1;
1164
1165 for (0 .. $#$children) {
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 }
1172 }
1173
1174 CFClient::UI::harmonize \@h;
1175
1176 my $y = 0;
1177 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_];
1180 $child->configure ($y, 0, $h, $w);
1181
1182 $y += $h;
1183 }
1184
1185 1
1186}
1187
1188############################################################################# 1493#############################################################################
1189 1494
1190package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1191 1496
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1195 1498
1196sub size_request { 1499sub new {
1197 my ($self) = @_; 1500 my $class = shift;
1198 1501
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1200 1503 vertical => 1,
1201 ( 1504 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1505 )
1205} 1506}
1206 1507
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1508#############################################################################
1247 1509
1248package CFClient::UI::Label; 1510package CFClient::UI::Label;
1249 1511
1250our @ISA = CFClient::UI::Base::; 1512our @ISA = CFClient::UI::DrawBG::;
1251 1513
1252use CFClient::OpenGL; 1514use CFClient::OpenGL;
1253 1515
1254sub new { 1516sub new {
1255 my ($class, %arg) = @_; 1517 my ($class, %arg) = @_;
1256 1518
1257 my $self = $class->SUPER::new ( 1519 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1521 #bg => none
1522 #active_bg => none
1259 #font => default_font 1523 #font => default_font
1260 #text => initial text 1524 #text => initial text
1261 #markup => initial narkup 1525 #markup => initial narkup
1526 #max_w => maximum pixel width
1527 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1263 fontsize => 1, 1529 fontsize => 1,
1264 align => -1, 1530 align => -1,
1265 valign => -1, 1531 valign => -1,
1266 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1267 can_events => 0, 1534 can_events => 0,
1268 %arg 1535 %arg
1269 ); 1536 );
1270 1537
1271 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1281 } 1548 }
1282 1549
1283 $self 1550 $self
1284} 1551}
1285 1552
1286sub escape { 1553sub escape($) {
1287 local $_ = $_[1]; 1554 local $_ = $_[0];
1288 1555
1289 s/&/&amp;/g; 1556 s/&/&amp;/g;
1290 s/>/&gt;/g; 1557 s/>/&gt;/g;
1291 s/</&lt;/g; 1558 s/</&lt;/g;
1292 1559
1293 $_[1] 1560 $_
1294} 1561}
1295 1562
1296sub update { 1563sub update {
1297 my ($self) = @_; 1564 my ($self) = @_;
1298 1565
1299 delete $self->{texture}; 1566 delete $self->{texture};
1300 $self->SUPER::update; 1567 $self->SUPER::update;
1301} 1568}
1302 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1303sub set_text { 1577sub set_text {
1304 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1305 1579
1306 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1308 1582
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1311 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1312 $self->update; 1588 $self->update;
1313 $self->check_size;
1314} 1589}
1315 1590
1316sub set_markup { 1591sub set_markup {
1317 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1318 1593
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1598
1324 $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;
1325 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1326 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1327 $self->update; 1604 $self->update;
1328 $self->check_size;
1329} 1605}
1330 1606
1331sub size_request { 1607sub size_request {
1332 my ($self) = @_; 1608 my ($self) = @_;
1333 1609
1610 $self->{size_req} ||= do {
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $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});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1616
1338 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1339 1618
1340 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1622
1344 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1345 1624
1346 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1348 } 1630 };
1349 1631
1350 ( 1632 @{ $self->{size_req} }
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1633}
1355 1634
1356sub size_allocate { 1635sub invoke_size_allocate {
1357 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1358 1637
1638 delete $self->{ox};
1639
1359 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1360} 1644}
1361 1645
1362sub set_fontsize { 1646sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1364 1648
1365 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1650 delete $self->{texture};
1367 1651
1368 $self->update; 1652 $self->realloc;
1369 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1370} 1661}
1371 1662
1372sub _draw { 1663sub _draw {
1373 my ($self) = @_; 1664 my ($self) = @_;
1665
1666 $self->SUPER::_draw; # draw background, if applicable
1374 1667
1375 my $tex = $self->{texture} ||= do { 1668 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1669 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1670 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $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});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1675
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1392 }; 1677 };
1393 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
1394 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1395 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};
1396 1693
1397 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1398 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1400 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1402 } 1701 }
1403 1702
1404 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1405} 1704}
1406 1705
… …
1422 active_fg => [0, 0, 0], 1721 active_fg => [0, 0, 0],
1423 can_hover => 1, 1722 can_hover => 1,
1424 can_focus => 1, 1723 can_focus => 1,
1425 valign => 0, 1724 valign => 0,
1426 can_events => 1, 1725 can_events => 1,
1726 #text => ...
1727 #hidden => "*",
1427 @_ 1728 @_
1428 ) 1729 )
1429} 1730}
1430 1731
1431sub _set_text { 1732sub _set_text {
… …
1433 1734
1434 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1435 1736
1436 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1437 1738
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 1740 $self->{text} = $text;
1442 1741
1443 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1445 1745
1446 $self->emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1447} 1750}
1448 1751
1449sub set_text { 1752sub set_text {
1450 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1451 1754
1452 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1756 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456} 1757}
1457 1758
1458sub get_text { 1759sub get_text {
1459 $_[0]{text} 1760 $_[0]{text}
1460} 1761}
… …
1465 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1466 1767
1467 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1468} 1769}
1469 1770
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474}
1475
1476sub key_down { 1771sub invoke_key_down {
1477 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1478 1773
1479 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1480 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1496 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1497 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1793 $self->emit ('escape');
1499 } elsif ($uni) { 1794 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1501 } 1798 }
1502 1799
1503 $self->_set_text ($text); 1800 $self->_set_text ($text);
1504 $self->update;
1505}
1506 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1507sub focus_in { 1807sub invoke_focus_in {
1508 my ($self) = @_; 1808 my ($self) = @_;
1509 1809
1510 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1511 1811
1512 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1513} 1813}
1514 1814
1515sub button_down { 1815sub invoke_button_down {
1516 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1517 1817
1518 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1519 1819
1520 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1521 1821
1522 # byte-index to char-index 1822 # byte-index to char-index
1523 my $text = $self->{text}; 1823 my $text = $self->{text};
1524 utf8::encode $text; 1824 utf8::encode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1526 1826
1527 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1528 $self->update; 1828 $self->update;
1829
1830 1
1529} 1831}
1530 1832
1531sub mouse_motion { 1833sub invoke_mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1533# 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
1534} 1838}
1535 1839
1536sub _draw { 1840sub _draw {
1537 my ($self) = @_; 1841 my ($self) = @_;
1538 1842
1539 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1540 1844
1541 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1542 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1543 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1544 } else { 1848 } else {
1545 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1546 } 1850 }
1547 1851
1548 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1549 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1550 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1551 glVertex 0 , 0; 1855 glVertex 0 , 0;
1552 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1553 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1554 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1579 1883
1580our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1581 1885
1582use CFClient::OpenGL; 1886use CFClient::OpenGL;
1583 1887
1584sub key_down { 1888sub invoke_key_down {
1585 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1586 1890
1587 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1588 1892
1589 if ($sym == 13) { 1893 if ($sym == 13) {
… …
1615 } else { 1919 } else {
1616 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1617 } 1921 }
1618 1922
1619 } else { 1923 } else {
1620 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1621 } 1927 1
1622
1623} 1928}
1624 1929
1625############################################################################# 1930#############################################################################
1626 1931
1627package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1636 1941
1637sub new { 1942sub new {
1638 my $class = shift; 1943 my $class = shift;
1639 1944
1640 $class->SUPER::new ( 1945 $class->SUPER::new (
1641 padding => 4, 1946 padding_x => 4,
1947 padding_y => 4,
1642 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1949 active_fg => [0, 0, 1],
1645 can_hover => 1, 1950 can_hover => 1,
1646 align => 0, 1951 align => 0,
1647 valign => 0, 1952 valign => 0,
1648 can_events => 1, 1953 can_events => 1,
1649 @_ 1954 @_
1650 ) 1955 )
1651} 1956}
1652 1957
1653sub button_up { 1958sub invoke_button_up {
1654 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1655 1960
1961 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1963 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 1964
1659 } 1965 1
1660} 1966}
1661 1967
1662sub _draw { 1968sub _draw {
1663 my ($self) = @_; 1969 my ($self) = @_;
1664 1970
1665 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1666
1667 if ($GRAB == $self) {
1668 $self->{fg} = $self->{active_fg};
1669 }
1670 1972
1671 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1673 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1674 1976
… …
1679 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1680} 1982}
1681 1983
1682############################################################################# 1984#############################################################################
1683 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
1684package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
1685 2023
1686our @ISA = CFClient::UI::DrawBG::; 2024our @ISA = CFClient::UI::DrawBG::;
1687 2025
1688my @tex = 2026my @tex =
… …
1693 2031
1694sub new { 2032sub new {
1695 my $class = shift; 2033 my $class = shift;
1696 2034
1697 $class->SUPER::new ( 2035 $class->SUPER::new (
1698 padding => 2, 2036 padding_x => 2,
2037 padding_y => 2,
1699 fg => [1, 1, 1], 2038 fg => [1, 1, 1],
1700 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],
1701 state => 0, 2042 state => 0,
1702 can_hover => 1, 2043 can_hover => 1,
1703 @_ 2044 @_
1704 ) 2045 )
1705} 2046}
1706 2047
1707sub size_request { 2048sub size_request {
1708 my ($self) = @_; 2049 my ($self) = @_;
1709 2050
1710 ($self->{padding} * 2 + 6) x 2 2051 (6) x 2
1711} 2052}
1712 2053
1713sub button_down { 2054sub invoke_button_down {
1714 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1715 2056
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1720 } 2065 1
1721} 2066}
1722 2067
1723sub _draw { 2068sub _draw {
1724 my ($self) = @_; 2069 my ($self) = @_;
1725 2070
1726 $self->SUPER::_draw; 2071 $self->SUPER::_draw;
1727 2072
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 2074
1730 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;
1731 2078
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 2080
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 2082
… …
1890 2237
1891 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
1893 2240
1894 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
1895 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;
1896 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1898 2246
1899 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
1900 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2337 qw(s1_slider.png s1_slider_bg.png);
1990 2338
1991sub new { 2339sub new {
1992 my $class = shift; 2340 my $class = shift;
1993 2341
1994 # range [value, low, high, page] 2342 # range [value, low, high, page, unit]
1995 2343
1996 # TODO: 0-width page 2344 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2345 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2346 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2347 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2348 fg => [1, 1, 1],
2001 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],
2002 range => [0, 0, 100, 10], 2352 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2353 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2354 min_h => $::WIDTH / 80,
2005 vertical => 0, 2355 vertical => 0,
2006 can_hover => 1, 2356 can_hover => 1,
2007 inner_pad => 5, 2357 inner_pad => 0.02,
2008 @_ 2358 @_
2009 ); 2359 );
2010 2360
2361 $self->set_value ($self->{range}[0]);
2362 $self->update;
2363
2011 $self 2364 $self
2012} 2365}
2013 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
2014sub size_request { 2401sub size_request {
2015 my ($self) = @_; 2402 my ($self) = @_;
2016 2403
2017 my $w = $self->{req_w}; 2404 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2405}
2022 2406
2023sub button_down { 2407sub invoke_button_down {
2024 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2025 2409
2026 $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
2027 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
2028} 2415}
2029 2416
2030sub mouse_motion { 2417sub invoke_mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2032 2419
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2449 my $range = ($hi - $page - $lo) || 1e-100;
2035 2450
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2452
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2453 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2454 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2455
2041 $x -= $inner_pad_px; # substract the padding 2456 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2457 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2458
2047 $self->emit (changed => $x); 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2460 $self->{knob_w} = $knob_w;
2049 } 2461 }
2050}
2051
2052# the inner_* stuff is for generating a padding for the slider handle,
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058}
2059
2060sub _draw {
2061 my ($self) = @_;
2062 2462
2063 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2064 2464
2065 my ($w, $h) = @$self{qw(w h)}; 2465 glScale $self->{w}, $self->{h};
2066 2466
2067 if ($self->{vertical}) { 2467 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2468 # draw a vertical slider like a rotated horizontal slider
2069 2469
2470 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2471 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2472 }
2075 2473
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2474 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2475 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2476
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2477 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2478 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2479
2100 # draw background 2480 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2481 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2482
2103 # draw handle 2483 # draw handle
2104 $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);
2105 2485
2106 glDisable GL_TEXTURE_2D; 2486 glDisable GL_TEXTURE_2D;
2107} 2487}
2108 2488
2109############################################################################# 2489#############################################################################
2110 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
2111package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2112 2533
2113our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2114 2535
2115use CFClient::OpenGL; 2536use CFClient::OpenGL;
2116 2537
… …
2118 my $class = shift; 2539 my $class = shift;
2119 2540
2120 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2121 fontsize => 1, 2542 fontsize => 1,
2122 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2123 #font => default_font 2545 #font => default_font
2124 @_, 2546 @_,
2125 2547
2126 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2127 par => [], 2549 par => [],
… …
2142 2564
2143 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2566 $self->reflow;
2145} 2567}
2146 2568
2147sub text_height {
2148 my ($self, $text) = @_;
2149
2150 my $layout = $self->{layout};
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157}
2158
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2569sub invoke_size_allocate {
2167 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2168
2169 $self->SUPER::size_allocate ($w, $h);
2170 2571
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $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});
2174 2576
2175 $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]);
2176} 2615}
2177 2616
2178sub add_paragraph { 2617sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2618 my ($self, $color, $text, $indent) = @_;
2180 2619
2181 #TODO: intelligently "reformat" paragraph 2620 for my $line (split /\n/, $text) {
2182 2621 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2622 $self->{height} += $h;
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2624 }
2186 2625
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $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]);
2190 $self->{children}[1]->update;
2191} 2627}
2192 2628
2193sub update { 2629sub update {
2194 my ($self) = @_; 2630 my ($self) = @_;
2195 2631
… …
2197 2633
2198 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2199 2635
2200 delete $self->{texture}; 2636 delete $self->{texture};
2201 2637
2202 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640
2203 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2642 my $height = 0;
2205 2643
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2207 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 }
2208 2660
2209 $self->{height} = $height; 2661 $self->{height} = $height;
2210 2662
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2664
2213 delete $self->{texture}; 2665 delete $self->{texture};
2214 } 2666 }
2215 2667
2216 $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 {
2217 glClearColor 0, 0, 0, 0; 2669 glClearColor 0, 0, 0, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2219 2671
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2224 2673
2225 my $y0 = $top; 2674 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2675 my $y1 = $top + $H;
2227 2676
2228 my $y = 0; 2677 my $y = 0;
2229 2678
2230 my $layout = $self->{layout}; 2679 my $layout = $self->{layout};
2231 2680
2232 $layout->set_font ($self->{font}) if $self->{font}; 2681 $layout->set_font ($self->{font}) if $self->{font};
2233 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
2234 for my $par (@{$self->{par}}) { 2687 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2688 my $h = $par->[1];
2236 2689
2237 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2238 $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});
2239 $layout->set_markup ($par->[2]); 2694 $layout->set_markup ($par->[4]);
2240 2695
2241 my ($W, $H) = $layout->size; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 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;
2243 } 2700 }
2244 2701
2245 $y += $h; 2702 $y += $h;
2246 } 2703 }
2247 2704
2248 glDisable GL_TEXTURE_2D; 2705 glDisable GL_BLEND;
2249 }; 2706 };
2250 }); 2707 });
2251} 2708}
2252 2709
2253sub _draw { 2710sub _draw {
2254 my ($self) = @_; 2711 my ($self) = @_;
2255 2712
2256 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2259 $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});
2260 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2261 2718
2262 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2263 2720
… …
2313 2770
2314sub new { 2771sub new {
2315 my $class = shift; 2772 my $class = shift;
2316 2773
2317 my $self = $class->SUPER::new ( 2774 my $self = $class->SUPER::new (
2318 state => 0, 2775 state => 0,
2319 connect_activate => \&toggle_flopper, 2776 on_activate => \&toggle_flopper,
2320 @_ 2777 @_
2321 ); 2778 );
2322 2779
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2780 $self
2329} 2781}
2330 2782
2331sub toggle_flopper { 2783sub toggle_flopper {
2332 my ($self) = @_; 2784 my ($self) = @_;
2333 2785
2334 # TODO: use animation 2786 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2787}
2346 2788
2347############################################################################# 2789#############################################################################
2348 2790
2349package CFClient::UI::Tooltip; 2791package CFClient::UI::Tooltip;
… …
2362} 2804}
2363 2805
2364sub set_tooltip_from { 2806sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2807 my ($self, $widget) = @_;
2366 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
2367 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2822 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2824 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2825 fg => [0, 0, 0, 1],
2826 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2827 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2828 );
2374} 2829}
2375 2830
2376sub size_request { 2831sub size_request {
2377 my ($self) = @_; 2832 my ($self) = @_;
… …
2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2380 2835
2381 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2382} 2837}
2383 2838
2384sub size_allocate { 2839sub invoke_size_allocate {
2385 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2386 2841
2387 $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 });
2388} 2861}
2389 2862
2390sub _draw { 2863sub _draw {
2391 my ($self) = @_; 2864 my ($self) = @_;
2392 2865
… …
2409 glVertex $w, $h; 2882 glVertex $w, $h;
2410 glVertex $w, 0; 2883 glVertex $w, 0;
2411 glEnd; 2884 glEnd;
2412 2885
2413 glTranslate 2 - 0.375, 2 - 0.375; 2886 glTranslate 2 - 0.375, 2 - 0.375;
2887
2414 $self->SUPER::_draw; 2888 $self->SUPER::_draw;
2415} 2889}
2416 2890
2417############################################################################# 2891#############################################################################
2418 2892
… …
2423use CFClient::OpenGL; 2897use CFClient::OpenGL;
2424 2898
2425sub new { 2899sub new {
2426 my $class = shift; 2900 my $class = shift;
2427 2901
2428 $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2429 aspect => 1, 2903 aspect => 1,
2904 can_events => 0,
2430 @_, 2905 @_,
2431 ) 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
2432} 2923}
2433 2924
2434sub size_request { 2925sub size_request {
2435 (32, 8) 2926 (32, 8)
2436} 2927}
2437 2928
2929sub update {
2930 my ($self) = @_;
2931
2932 return unless $self->{visible};
2933
2934 $self->SUPER::update;
2935}
2936
2438sub _draw { 2937sub _draw {
2439 my ($self) = @_; 2938 my ($self) = @_;
2440 2939
2441 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
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2952
2444 # TODO animation
2445 if ($tex) { 2953 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2451 } 2959 }
2452} 2960}
2453 2961
2962sub destroy {
2963 my ($self) = @_;
2964
2965 $self->{timer}->cancel
2966 if $self->{timer};
2967
2968 $self->SUPER::destroy;
2969}
2970
2454############################################################################# 2971#############################################################################
2455 2972
2456package CFClient::UI::InventoryItem; 2973package CFClient::UI::Buttonbar;
2457 2974
2458our @ISA = CFClient::UI::HBox::; 2975our @ISA = CFClient::UI::HBox::;
2459 2976
2460sub new { 2977# TODO: should actualyl wrap buttons and other goodies.
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567 2978
2568############################################################################# 2979#############################################################################
2569 2980
2570package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2571 2982
… …
2583 ); 2994 );
2584 2995
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586 2997
2587 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2589 3000
2590 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2591 if (!ref $widget) { 3002 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2593 can_hover => 1, 3004 can_hover => 1,
2594 can_events => 1, 3005 can_events => 1,
2595 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2596 } 3008 }
2597 3009
2598 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2599 3011
2600 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2612 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self; 3025 $GRAB = $self;
2614 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2615 3027
2616 $self->show; 3028 $self->show;
2617 $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);
2618} 3030}
2619 3031
2620sub mouse_motion { 3032sub invoke_mouse_motion {
2621 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2622 3034
2623 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2626}
2627 3038
3039 0
3040}
3041
2628sub button_up { 3042sub invoke_button_up {
2629 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2630 3044
2631 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB; 3046 undef $GRAB;
2633 $self->hide; 3047 $self->hide;
2634 3048
2635 $self->emit ("popdown"); 3049 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2637 } 3055 1
2638} 3056}
2639 3057
2640############################################################################# 3058#############################################################################
2641 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
2642package CFClient::UI::Statusbox; 3226package CFClient::UI::Statusbox;
2643 3227
2644our @ISA = CFClient::UI::VBox::; 3228our @ISA = CFClient::UI::VBox::;
2645 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
2646sub reorder { 3245sub reorder {
2647 my ($self) = @_; 3246 my ($self) = @_;
2648 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} };
2649 3253
2650 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 } 3256 }
2653 3257
… …
2656 my @items = sort { 3260 my @items = sort {
2657 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
2660 3264
3265 $self->{timer}->interval (1);
3266
2661 my $count = 10 + 1; 3267 my $count = 10 + 1;
2662 for my $item (@items) { 3268 for my $item (@items) {
2663 last unless --$count; 3269 last unless --$count;
2664 3270
2665 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 3275 : $item->{text};
2670 3276
2671 for ($short) { 3277 for ($short) {
2672 s/^\s+//; 3278 s/^\s+//;
2673 s/\012.*/…/s; 3279 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 3280 }
2677 3281
2678 new CFClient::UI::Label 3282 new CFClient::UI::Label
2679 markup => $short, 3283 markup => $short,
2680 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
2684 color => $item->{color}, 3288 max_w => $::WIDTH * 0.44,
3289 fg => [@{ $item->{fg} }],
2685 can_events => 1, 3290 can_events => 1,
2686 can_hover => 1 3291 can_hover => 1
2687 }; 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;
2688 } 3305 }
2689 3306
2690 $self->clear; 3307 $self->clear;
2691 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
2692} 3309}
… …
2695 my ($self, $text, %arg) = @_; 3312 my ($self, $text, %arg) = @_;
2696 3313
2697 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
2699 3316
3317 return unless $text;
3318
2700 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2701 3320
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703 3322
2704 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
2706 $item->{count}++; 3325 $item->{count}++;
2707 } else { 3326 } else {
2708 $item->{count} = 1; 3327 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
2710 } 3329 }
2711 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
2712 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
2713 delete $item->{label}; 3332 delete $item->{label};
2714 } else { 3333 } else {
2715 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
2716 id => ++$self->{id}, 3335 id => ++$self->{id},
2717 text => $text, 3336 text => $text,
2718 timeout => $timeout, 3337 timeout => $timeout,
2719 tooltip => $text, 3338 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 3339 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 3340 pri => 0,
2723 count => 1, 3341 count => 1,
2724 %arg, 3342 %arg,
2725 }; 3343 };
2726 } 3344 }
2727 3345
2728 $self->reorder; 3346 $self->reorder;
2729} 3347}
2730 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
2731############################################################################# 3367#############################################################################
2732 3368
2733package CFClient::UI::Root; 3369package CFClient::UI::Inventory;
2734 3370
2735our @ISA = CFClient::UI::Container::; 3371our @ISA = CFClient::UI::ScrolledWindow::;
2736
2737use CFClient::OpenGL;
2738 3372
2739sub new { 3373sub new {
2740 my $class = shift; 3374 my $class = shift;
2741 3375
2742 $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 => [],
2743 @_, 3619 @_,
2744 ) 3620 )
2745} 3621}
2746 3622
2747sub configure { 3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2748 my ($self, $x, $y, $w, $h) = @_;
2749 3624
2750 $self->{w} = $w; 3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2751 $self->{h} = $h; 3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2752} 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");
2753 3635
2754sub 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 {
2755 my ($self) = @_; 3709 my ($self, $spell) = @_;
2756 3710
2757 $self->size_allocate ($self->{w}, $self->{h}) 3711 $self->{spell}->{$spell->{name}} = $spell;
2758 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
2759} 3750}
2760 3751
2761sub size_request { 3752sub size_request {
2762 my ($self) = @_; 3753 my ($self) = @_;
2763 3754
2764 ($self->{w}, $self->{h}) 3755 ($self->{w}, $self->{h})
2765} 3756}
2766 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
2767sub size_allocate { 3772sub invoke_size_allocate {
2768 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785 3774
2786 for my $child ($self->children) { 3775 for my $child ($self->children) {
2787 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)};
2788 3777
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3778 $X = $child->{force_x} if exists $child->{force_x};
2790 $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
2791 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
2792 } 3785 }
2793 3786
2794 $self->{old_w} = $w; 3787 1
2795 $self->{old_h} = $h;
2796} 3788}
2797 3789
2798sub coord2local { 3790sub coord2local {
2799 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
2800 3792
… …
2808} 3800}
2809 3801
2810sub update { 3802sub update {
2811 my ($self) = @_; 3803 my ($self) = @_;
2812 3804
2813 $self->check_size;
2814 $::WANT_REFRESH++; 3805 $::WANT_REFRESH++;
2815} 3806}
2816 3807
2817sub add { 3808sub add {
2818 my ($self, $child) = @_; 3809 my ($self, @children) = @_;
2819 3810
2820 # integerise window positions 3811 $_->{is_toplevel} = 1
2821 $child->{x} = int $child->{x}; 3812 for @children;
2822 $child->{y} = int $child->{y};
2823 3813
2824 $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 }
2825} 3830}
2826 3831
2827sub on_refresh { 3832sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3833 my ($self, $id, $cb) = @_;
2829 3834
… …
2842 while ($self->{refresh_hook}) { 3847 while ($self->{refresh_hook}) {
2843 $_->() 3848 $_->()
2844 for values %{delete $self->{refresh_hook}}; 3849 for values %{delete $self->{refresh_hook}};
2845 } 3850 }
2846 3851
2847 if ($self->{check_size}) { 3852 if ($self->{realloc}) {
2848 my @queue = ([], []); 3853 my %queue;
3854 my @queue;
3855 my $widget;
2849 3856
2850 for (;;) { 3857 outer:
2851 if ($self->{check_size}) { 3858 while () {
2852 # heuristic: check containers last 3859 if (my $realloc = delete $self->{realloc}) {
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3860 for $widget (values %$realloc) {
2854 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 }
2855 } 3867 }
2856 3868
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3869 while () {
3870 @queue or last outer;
2858 3871
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3872 $widget = pop @{ $queue[-1] || [] }
2860 ? @$widget{qw(user_w user_h)} 3873 and last;
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866 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}) {
2867 $widget->{req_w} = $w; 3893 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h; 3894 $widget->{req_h} = $h;
2869 3895
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3896 $self->{size_alloc}{$widget+0} = $widget;
2871 3897
2872 $widget->{parent}->check_size
2873 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 }
2874 } 3905 }
3906
3907 delete $self->{realloc}{$widget+0};
2875 } 3908 }
2876 } 3909 }
2877 3910
2878 while ($self->{size_alloc}) { 3911 while (my $size_alloc = delete $self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) { 3912 my @queue = sort { $b->{visible} <=> $a->{visible} }
2880 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)};
2881 3919
2882 $w = 0 if $w < 0; 3920 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0; 3921 $h = 0 if $h < 0;
2884 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
2885 $widget->{w} = $w; 3930 $widget->{w} = $w;
2886 $widget->{h} = $h; 3931 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h); 3932
2888 $widget->emit (size_allocate => $w, $h); 3933 $widget->emit (size_allocate => $w, $h);
3934 }
2889 } 3935 }
2890 } 3936 }
2891 3937
2892 while ($self->{post_alloc_hook}) { 3938 while ($self->{post_alloc_hook}) {
2893 $_->() 3939 $_->()
2894 for values %{delete $self->{post_alloc_hook}}; 3940 for values %{delete $self->{post_alloc_hook}};
2895 } 3941 }
2896 3942
3943
2897 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3944 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3945 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 3946 glClear GL_COLOR_BUFFER_BIT;
2900 3947
2901 glMatrixMode GL_PROJECTION; 3948 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 3949 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 3951 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 3952 glLoadIdentity;
2906 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
2907 $self->_draw; 3961 $self->_draw;
2908} 3962}
2909 3963
2910############################################################################# 3964#############################################################################
2911 3965
2912package CFClient::UI; 3966package CFClient::UI;
2913 3967
2914$ROOT = new CFClient::UI::Root; 3968$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 3969$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 3970
29171 39711
2918 3972

Diff Legend

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