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

Diff Legend

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