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.348 by root, Thu Aug 17 01:27:28 2006 UTC

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

Diff Legend

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