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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.479 by root, Thu Feb 4 20:01:09 2010 UTC

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

Diff Legend

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