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

Diff Legend

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