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

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

Diff Legend

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