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.209 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.432 by root, Tue Aug 21 23:42:02 2007 UTC

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

Diff Legend

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