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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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