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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

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

Diff Legend

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