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.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.426 by root, Sat Aug 11 12:07:54 2007 UTC

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

Diff Legend

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