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

Diff Legend

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