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

Diff Legend

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