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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC

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

Diff Legend

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