ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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