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

Diff Legend

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