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

Diff Legend

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