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.67 by root, Tue Apr 11 14:36:59 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:43:51 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
107}
108 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
109# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
112 141
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
118 150
119 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 152 $focus->update if $focus;
121 $FOCUS->update; 153 $FOCUS->update;
122} 154}
… …
130 $focus->update if $focus; #? 162 $focus->update if $focus; #?
131} 163}
132 164
133sub mouse_motion { } 165sub mouse_motion { }
134sub button_up { } 166sub button_up { }
135sub button_down { }
136sub key_down { } 167sub key_down { }
137sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
138 175
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 181
145sub draw { 182sub draw {
146 my ($self) = @_; 183 my ($self) = @_;
147 184
185 return unless $self->{h} && $self->{w};
186
148 glPushMatrix; 187 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 189 $self->_draw;
151 if ($self == $HOVER) { 190 glPopMatrix;
152 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 198 glBegin GL_QUADS;
155 glVertex 0 , 0; 199 glVertex $x , $y;
156 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
159 glEnd; 203 glEnd;
160 glDisable GL_BLEND; 204 glDisable GL_BLEND;
161 } 205 }
162 glPopMatrix;
163} 206}
164 207
165sub _draw { 208sub _draw {
166 my ($self) = @_; 209 my ($self) = @_;
167 210
168 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 212}
181 213
182sub find_widget { 214sub find_widget {
183 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
184 216
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 220
189 () 221 ()
190} 222}
191 223
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 224sub set_parent {
195 my ($self, $par) = @_; 225 my ($self, $par) = @_;
196 226
197 $self->{parent} = $par; 227 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
207 237
208 $self->{parent}->update 238 $self->{parent}->update
209 if $self->{parent}; 239 if $self->{parent};
210} 240}
211 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
212sub DESTROY { 255sub DESTROY {
213 my ($self) = @_; 256 my ($self) = @_;
214 257
215 #$self->deactivate; 258 #$self->deactivate;
216} 259}
217 260
218############################################################################# 261#############################################################################
219 262
263package CFClient::UI::DrawBG;
264
265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
269
270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
220package CFClient::Widget::Empty; 303package CFClient::UI::Empty;
221 304
222our @ISA = CFClient::Widget::; 305our @ISA = CFClient::UI::Base::;
223 306
224sub size_request { 307sub size_request {
225 (0, 0) 308 (0, 0)
226} 309}
227 310
228sub draw { } 311sub draw { }
229 312
230############################################################################# 313#############################################################################
231 314
232package CFClient::Widget::Container; 315package CFClient::UI::Container;
233 316
234our @ISA = CFClient::Widget::; 317our @ISA = CFClient::UI::Base::;
235 318
236sub new { 319sub new {
237 my ($class, %arg) = @_; 320 my ($class, %arg) = @_;
238 321
239 my $children = delete $arg{children} || []; 322 my $children = delete $arg{children} || [];
… …
243 326
244 $self 327 $self
245} 328}
246 329
247sub add { 330sub add {
248 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
249 332
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self); 333 $chld->set_parent ($self);
252 334
253 $self->{children} = [ 335 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
256 ]; 338 ];
257 339
258 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
259 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
260} 342}
261 343
262sub remove { 344sub remove {
263 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
264 346
265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266 348
267 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
268} 350}
269 351
270sub find_widget { 352sub find_widget {
271 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
272 354
… …
289 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
290} 372}
291 373
292############################################################################# 374#############################################################################
293 375
294package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
295 377
296our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
297 379
298sub new { 380sub new {
299 my ($class, %arg) = @_; 381 my ($class, %arg) = @_;
300 382
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
302 384
303 $class->SUPER::new (children => [$child], %arg) 385 $class->SUPER::new (children => [$child], %arg)
304} 386}
305 387
306sub add { 388sub add {
… …
314sub remove { 396sub remove {
315 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
316 398
317 $self->SUPER::remove ($widget); 399 $self->SUPER::remove ($widget);
318 400
319 $self->{children} = [new CFClient::Widget::Empty] 401 $self->{children} = [new CFClient::UI::Empty]
320 unless @{$self->{children}}; 402 unless @{$self->{children}};
321} 403}
322 404
323sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
324 406
325sub size_request { 407sub size_request {
326 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
327} 409}
328 410
329sub size_allocate { 411sub size_allocate {
330 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
331 413
332 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
333 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
334 if $self->{children}[0]
335} 417}
336 418
337############################################################################# 419#############################################################################
338 420
339package CFClient::Widget::Window; 421package CFClient::UI::Window;
340 422
341our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
342 424
343use SDL::OpenGL; 425use SDL::OpenGL;
344 426
345sub new { 427sub new {
346 my ($class, %arg) = @_; 428 my ($class, %arg) = @_;
… …
364 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
365 ); 447 );
366} 448}
367 449
368sub size_allocate { 450sub size_allocate {
369 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
370 452
371 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 454
374 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
375 456
376 $self->render_chld; 457 $self->render_chld;
377} 458}
378 459
379sub _draw { 460sub _draw {
… …
383 464
384 my $tex = $self->{texture} 465 my $tex = $self->{texture}
385 or return; 466 or return;
386 467
387 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
390 472
391 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
392 474
… …
394 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
395} 477}
396 478
397############################################################################# 479#############################################################################
398 480
399package CFClient::Widget::Frame; 481package CFClient::UI::Frame;
400 482
401our @ISA = CFClient::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
402 484
403use SDL::OpenGL; 485use SDL::OpenGL;
404 486
405sub size_request { 487sub size_request {
406 my ($self) = @_; 488 my ($self) = @_;
… …
411 493
412 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
413} 495}
414 496
415sub size_allocate { 497sub size_allocate {
416 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
417 499
418 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
419 $self->{h} = $h;
420 501
421 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
422 $self->child->move (2, 2);
423} 503}
424 504
425sub _draw { 505sub _draw {
426 my ($self) = @_; 506 my ($self) = @_;
427 507
… …
440 $chld->draw; 520 $chld->draw;
441} 521}
442 522
443############################################################################# 523#############################################################################
444 524
445package CFClient::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
446 526
447our @ISA = CFClient::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
448 528
449use SDL::OpenGL; 529use SDL::OpenGL;
450 530
451my @tex = 531my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
454 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
455sub size_request { 548sub size_request {
456 my ($self) = @_; 549 my ($self) = @_;
457 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
458 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
459 554
460 $h += $tex[1]->{height}; 555 (
461 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
462 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
463 $w += $tex[3]->{width}; 558 )
464
465 ($w, $h)
466} 559}
467 560
468sub size_allocate { 561sub size_allocate {
469 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
470 563
471 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
472 565
473 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
474 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
475 $w -= $tex[2]->{width};
476 $w -= $tex[3]->{width};
477 568
478 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
479 $w = $w < 0 ? 0 : $w; 570}
480 571
481 my $child = $self->child; 572sub button_down {
573 my ($self, $ev, $x, $y) = @_;
482 574
483 $child->size_allocate ($w, $h); 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
484 $child->move ($tex[3]->{width}, $tex[1]->{height}); 576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
485} 618}
486 619
487sub _draw { 620sub _draw {
488 my ($self) = @_; 621 my ($self) = @_;
489 622
490 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492 625
493 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
494 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
497 630
498 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
499 $top->draw_quad (0, 0, $w, $top->{height}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
500 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
501 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
503
504 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
506
507 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
509 636
510 my $bg = $tex[0]; 637 my $bg = $tex[0];
511 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515 638
639 # TODO: repeat texture not scale
516 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
517 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
518 642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
520 649
650 glDisable GL_TEXTURE_2D;
521 glDisable GL_BLEND; 651 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523 652
524 $self->child->draw; 653 $self->child->draw;
525
526} 654}
527 655
528############################################################################# 656#############################################################################
529 657
530package CFClient::Widget::Table; 658package CFClient::UI::Table;
531 659
532our @ISA = CFClient::Widget::Bin::; 660our @ISA = CFClient::UI::Base::;
661
662use List::Util qw(max sum);
533 663
534use SDL::OpenGL; 664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
535 674
536sub add { 675sub add {
537 my ($self, $x, $y, $chld) = @_; 676 my ($self, $x, $y, $chld) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539 677
540 $self->{children}[$y][$x] = $chld; 678 $self->{children}[$y][$x] = $chld;
541 $chld->set_parent ($self); 679 $chld->set_parent ($self);
680
681 $self->{w} = $self->{h} = -1;
542 $self->update; 682 $self->update;
543} 683}
544 684
545sub max_row_height { 685sub get_wh {
546 my ($self, $row) = @_; 686 my ($self) = @_;
547 687
548 my $hs = 0; 688 my (@w, @h);
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 689
690 for my $y (0 .. $#{$self->{children}}) {
550 my $c = $self->{children}->[$row]->[$xi]; 691 my $row = $self->{children}[$y]
551 if ($c) { 692 or next;
693
694 for my $x (0 .. $#$row) {
695 my $widget = $row->[$x]
696 or next;
552 my ($w, $h) = $c->size_request; 697 my ($w, $h) = $widget->size_request;
553 if ($hs < $h) { $hs = $h } 698
699 $w[$x] = max $w[$x], $w;
700 $h[$y] = max $h[$y], $h;
554 } 701 }
555 } 702 }
556 return $hs;
557}
558 703
559sub max_col_width { 704 (\@w, \@h)
705}
706
707sub size_request {
560 my ($self, $col) = @_; 708 my ($self) = @_;
561 709
710 my ($ws, $hs) = $self->get_wh;
711
712 (
713 (sum @$ws),
714 (sum @$hs),
715 )
716}
717
718sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722
723 my ($ws, $hs) = $self->get_wh;
724
725 my $req_w = sum @$ws;
726 my $req_h = sum @$hs;
727
728 # TODO: nicer code && do row_expand
729 my @col_expand = @{$self->{col_expand}};
730 @col_expand = (1) x @$ws unless @col_expand;
731 my $col_expand = (sum @col_expand) || 1;
732
733 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
736
737 my $y;
738
739 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r]
741 or next;
742
562 my $ws = 0; 743 my $x = 0;
563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 744 my $row_h = $hs->[$r];
564 my $c = ($self->{children}->[$yi] || [])->[$col]; 745
565 if ($c) { 746 for my $c (0 .. $#$row) {
566 my ($w, $h) = $c->size_request; 747 my $col_w = $ws->[$c];
567 if ($ws < $w) { $ws = $w } 748
749 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
752
753 $x += $col_w;
568 } 754 }
755
756 $y += $row_h;
569 } 757 }
570 return $ws; 758
571} 759}
760
761sub find_widget {
762 my ($self, $x, $y) = @_;
763
764 $x -= $self->{x};
765 $y -= $self->{y};
766
767 my $res;
768
769 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
770 $res = $_->find_widget ($x, $y)
771 and return $res;
772 }
773
774 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
775}
776
777sub _draw {
778 my ($self) = @_;
779
780 for (grep $_, @{$self->{children}}) {
781 $_->draw for grep $_, @$_;
782 }
783}
784
785#############################################################################
786
787package CFClient::UI::HBox;
788
789# TODO: wrap into common Box base class
790
791our @ISA = CFClient::UI::Container::;
572 792
573sub size_request { 793sub size_request {
574 my ($self) = @_; 794 my ($self) = @_;
575 795
796 my @alloc = map [$_->size_request], @{$self->{children}};
797
798 (
799 (List::Util::sum map $_->[0], @alloc),
800 (List::Util::max map $_->[1], @alloc),
801 )
802}
803
804sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808
576 my ($hs, $ws) = (0, 0); 809 ($h, $w) = ($w, $h);
577 810
578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 811 my $children = $self->{children};
579 $hs += $self->max_row_height ($yi);
580 }
581 812
582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 813 my @h = map +($_->size_request)[0], @$children;
583 my $wm = 0; 814
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 815 my $req_h = List::Util::sum @h;
585 $wm += $self->max_col_width ($xi) 816
817 if ($req_h > $h) {
818 # ah well, not enough space
819 $_ *= $h / $req_h for @h;
820 } else {
821 my $exp = List::Util::sum map $_->{expand}, @$children;
822 $exp ||= 1;
823
824 for (0 .. $#$children) {
825 my $child = $children->[$_];
826
827 my $alloc_h = $h[$_];
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h;
586 } 830 }
587 if ($ws < $wm) { $ws = $wm }
588 } 831 }
589
590 return ($ws, $hs);
591}
592
593sub _draw {
594 my ($self) = @_;
595 832
596 my $y = 0; 833 my $y = 0;
597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 834 for (0 .. $#$children) {
835 my $child = $children->[$_];
598 my $x = 0; 836 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w);
599 838
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 839 $y += $h;
601
602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
605 $c->draw if $c;
606 }
607
608 $x += $self->max_col_width ($xi);
609 }
610
611 $y += $self->max_row_height ($yi);
612 } 840 }
613} 841}
614 842
615############################################################################# 843#############################################################################
616 844
617package CFClient::Widget::VBox; 845package CFClient::UI::VBox;
618 846
847# TODO: wrap into common Box base class
848
619our @ISA = CFClient::Widget::Container::; 849our @ISA = CFClient::UI::Container::;
620
621use SDL::OpenGL;
622 850
623sub size_request { 851sub size_request {
624 my ($self) = @_; 852 my ($self) = @_;
625 853
626 my @alloc = map [$_->size_request], @{$self->{children}}; 854 my @alloc = map [$_->size_request], @{$self->{children}};
… …
630 (List::Util::sum map $_->[1], @alloc), 858 (List::Util::sum map $_->[1], @alloc),
631 ) 859 )
632} 860}
633 861
634sub size_allocate { 862sub size_allocate {
635 my ($self, $w, $h) = @_; 863 my ($self, $x, $y, $w, $h) = @_;
636 864
637 $self->w ($w); 865 $self->_size_allocate ($x, $y, $w, $h);
638 $self->h ($h);
639 866
640 my $exp; 867 my $children = $self->{children};
641 my @oth; 868
642 # find expand widget 869 my @h = map +($_->size_request)[1], @$children;
643 for (@{$self->{children}}) { 870
644 if ($_->{expand}) { 871 my $req_h = List::Util::sum @h;
872
873 if ($req_h > $h) {
874 # ah well, not enough space
875 $_ *= $h / $req_h for @h;
876 } else {
877 my $exp = List::Util::sum map $_->{expand}, @$children;
645 $exp = $_; 878 $exp ||= 1;
646 last; 879
880 for (0 .. $#$children) {
881 my $child = $children->[$_];
882
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
647 } 884 }
648 push @oth, $_;
649 }
650
651 my ($ow, $oh);
652
653 # get sizes of other widgets
654 for (@oth) {
655 my ($w, $h) = $_->size_request;
656 $oh += $h;
657 if ($ow < $w) { $ow = $w }
658 } 885 }
659 886
660 my $y = 0; 887 my $y = 0;
661 for (@{$self->{children}}) { 888 for (0 .. $#$children) {
662 $_->move (0, $y); 889 my $child = $children->[$_];
663 890 my $h = $h[$_];
664 if ($_ == $exp) {
665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h); 891 $child->size_allocate (0, $y, $w, $h);
892
670 $y += $h; 893 $y += $h;
671 }
672 } 894 }
673} 895}
674 896
675############################################################################# 897#############################################################################
676 898
677package CFClient::Widget::Label; 899package CFClient::UI::Label;
678 900
679our @ISA = CFClient::Widget::; 901our @ISA = CFClient::UI::Base::;
680 902
681use SDL::OpenGL; 903use SDL::OpenGL;
682 904
683sub new { 905sub new {
684 my ($class, %arg) = @_; 906 my ($class, %arg) = @_;
685 907
686 # TODO: color, and make height, xyz etc. optional
687 my $self = $class->SUPER::new ( 908 my $self = $class->SUPER::new (
688 color => [1, 1, 1], 909 fg => [1, 1, 1],
689 height => $::FONTSIZE, 910 height => $::FONTSIZE,
690 text => "", 911 text => "",
912 align => -1,
913 padding => 2,
691 layout => new CFClient::Layout, 914 layout => new CFClient::Layout,
692 %arg 915 %arg
693 ); 916 );
694 917
695 $self->set_text ($self->{text}); 918 $self->set_text ($self->{text});
696 919
697 $self 920 $self
698} 921}
699 922
923sub escape_text {
924 local $_ = $_[1];
925
926 s/&/&amp;/g;
927 s/>/&gt;/g;
928 s/</&lt;/g;
929
930 $_[1]
931}
932
700sub set_text { 933sub set_text {
701 my ($self, $text) = @_; 934 my ($self, $text) = @_;
702 935
703 $self->{text} = $text; 936 $self->{text} = $text;
704 $self->{layout}->set_markup ($text); 937 $self->{layout}->set_markup ($text);
705 938
706 delete $self->{texture}; 939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update;
707} 942}
708 943
709sub get_text { 944sub get_text {
710 my ($self, $text) = @_; 945 my ($self, $text) = @_;
711 946
… …
715sub size_request { 950sub size_request {
716 my ($self) = @_; 951 my ($self) = @_;
717 952
718 $self->{layout}->set_width; 953 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height}); 954 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size 955 my ($w, $h) = $self->{layout}->size;
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 956
722# ( 957 (
723# $self->{texture}{width}, 958 $w + $self->{padding} * 2,
724# $self->{texture}{height}, 959 $h + $self->{padding} * 2,
725# ) 960 )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731} 961}
732 962
733sub size_allocate { 963sub size_allocate {
734 my ($self, $w, $h) = @_; 964 my ($self, $x, $y, $w, $h) = @_;
735 965
736 $self->SUPER::size_allocate ($w, $h); 966 $self->_size_allocate ($x, $y, $w, $h) or return;
967
737 delete $self->{texture}; 968 delete $self->{texture};
969}
970
971sub update {
972 my ($self) = @_;
973
974 delete $self->{texture};
975 $self->SUPER::update;
738} 976}
739 977
740sub _draw { 978sub _draw {
741 my ($self) = @_; 979 my ($self) = @_;
742 980
743 my $tex = $self->{texture} ||= do { 981 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w}); 982 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
745 new_from_layout CFClient::Texture $self->{layout}; 984 new_from_layout CFClient::Texture $self->{layout}
746 }; 985 };
986
987 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991
992 glColor @{$self->{fg}};
993
994 my $x =
995 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5;
998
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1000 $tex->draw_quad (0, 0);
1001
1002 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND;
1004}
1005
1006#############################################################################
1007
1008package CFClient::UI::Entry;
1009
1010our @ISA = CFClient::UI::Label::;
1011
1012use SDL;
1013use SDL::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1025 @_
1026 )
1027}
1028
1029sub _set_text {
1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051}
1052
1053sub size_request {
1054 my ($self) = @_;
1055
1056 my ($w, $h) = $self->SUPER::size_request;
1057
1058 ($w + 1, $h) # add 1 for cursor
1059}
1060
1061sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065
1066 $self->_set_text ($self->{text});
1067}
1068
1069sub set_text {
1070 my ($self, $text) = @_;
1071
1072 $self->{cursor} = length $text;
1073 $self->_set_text ($text);
1074 $self->update;
1075}
1076
1077sub key_down {
1078 my ($self, $ev) = @_;
1079
1080 my $mod = $ev->key_mod;
1081 my $sym = $ev->key_sym;
1082
1083 my $uni = $ev->key_unicode;
1084
1085 my $text = $self->get_text;
1086
1087 if ($sym == SDLK_BACKSPACE) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) {
1090 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1101 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni;
1103 }
1104
1105 $self->_set_text ($text);
1106 $self->update;
1107}
1108
1109sub focus_in {
1110 my ($self) = @_;
1111
1112 $self->{last_activity} = $::NOW;
1113
1114 $self->SUPER::focus_in;
1115}
1116
1117sub button_down {
1118 my ($self, $ev, $x, $y) = @_;
1119
1120 $self->SUPER::button_down ($ev, $x, $y);
1121
1122 my $idx = $self->{layout}->xy_to_index ($x, $y);
1123
1124 # byte-index to char-index
1125 my $text = $self->{text};
1126 utf8::encode $text;
1127 $self->{cursor} = length substr $text, 0, $idx;
1128
1129 $self->_set_text ($self->{text});
1130 $self->update;
1131}
1132
1133sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_;
1135# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1136}
1137
1138sub _draw {
1139 my ($self) = @_;
1140
1141 local $self->{fg} = $self->{fg};
1142
1143 if ($FOCUS == $self) {
1144 glColor @{$self->{active_bg}};
1145 $self->{fg} = $self->{active_fg};
1146 } else {
1147 glColor @{$self->{bg}};
1148 }
1149
1150 glEnable GL_BLEND;
1151 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1152 glBegin GL_QUADS;
1153 glVertex 0 , 0;
1154 glVertex 0 , $self->{h};
1155 glVertex $self->{w}, $self->{h};
1156 glVertex $self->{w}, 0;
1157 glEnd;
1158 glDisable GL_BLEND;
1159
1160 $self->SUPER::_draw;
1161
1162 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1164 glColor @{$self->{fg}};
1165 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1168 glEnd;
1169 }
1170}
1171
1172package CFClient::UI::LineEntry;
1173
1174our @ISA = CFClient::UI::Entry::;
1175
1176use SDL;
1177use SDL::OpenGL;
1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1206
1207sub new {
1208 my $class = shift;
1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
1217 )
1218}
1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
1227}
1228
1229sub _draw {
1230 my ($self) = @_;
1231
1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
747 1234
748 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
749 glEnable GL_TEXTURE_2D; 1236 glEnable GL_TEXTURE_2D;
750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 1245
753 glColor @{$self->{color}}; 1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
754 1247
1248 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND;
1250
1251 $self->SUPER::_draw;
1252}
1253
1254#############################################################################
1255
1256package CFClient::UI::CheckBox;
1257
1258our @ISA = CFClient::UI::DrawBG::;
1259
1260use SDL;
1261use SDL::OpenGL;
1262
1263sub new {
1264 my $class = shift;
1265
1266 $class->SUPER::new (
1267 padding => 2,
1268 fg => [1, 1, 1],
1269 active_fg => [1, 1, 0],
1270 state => 0,
1271 can_hover => 1,
1272 @_
1273 )
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{padding} * 2 + 6) x 2
1280}
1281
1282sub size_allocate {
1283 my ($self, $x, $y, $w, $h) = @_;
1284
1285 $self->_size_allocate ($x, $y, $w, $h);
1286}
1287
1288sub button_down {
1289 my ($self, $ev, $x, $y) = @_;
1290
1291 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1292 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1293 $self->{state} = !$self->{state};
1294 $self->emit (changed => $self->{state});
1295 }
1296}
1297
1298sub _draw {
1299 my ($self) = @_;
1300
1301 $self->SUPER::_draw;
1302
1303 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1304
1305 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1306
1307 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1308
1309 glBegin GL_LINE_LOOP;
1310 glVertex 0 , 0;
1311 glVertex 0 , $s;
1312 glVertex $s, $s;
1313 glVertex $s, 0;
1314 glEnd;
1315
1316 if ($self->{state}) {
1317 glBegin GL_LINES;
1318 glVertex 0 , 0;
1319 glVertex $s, $s;
1320 glVertex $s, 0;
1321 glVertex 0 , $s;
1322 glEnd;
1323 }
1324}
1325
1326#############################################################################
1327
1328package CFClient::UI::Slider;
1329
1330use strict;
1331
1332use SDL::OpenGL;
1333
1334our @ISA = CFClient::UI::DrawBG::;
1335
1336my @tex =
1337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1338 qw(s1_slider.png s1_slider_bg.png);
1339
1340sub new {
1341 my $class = shift;
1342
1343 # range [value, low, high, page]
1344
1345 # TODO: 0-width page
1346 # TODO: req_w/h are wrong with vertical
1347 # TODO: calculations are off
1348 my $self = $class->SUPER::new (
1349 fg => [1, 1, 1],
1350 active_fg => [0, 0, 0],
1351 range => [0, 0, 100, 10],
1352 req_w => 40,
1353 req_h => 13,
1354 vertical => 0,
1355 can_hover => 1,
1356 @_
1357 );
1358
1359 $self
1360}
1361
1362sub size_request {
1363 my ($self) = @_;
1364
1365 my $w = $self->{req_w};
1366 my $h = $self->{req_h};
1367
1368 $self->{vertical} ? ($h, $w) : ($w, $h)
1369}
1370
1371sub button_down {
1372 my ($self, $ev, $x, $y) = @_;
1373
1374 $self->SUPER::button_down ($ev, $x, $y);
1375 $self->mouse_motion ($ev, $x, $y);
1376}
1377
1378sub mouse_motion {
1379 my ($self, $ev, $x, $y) = @_;
1380
1381 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385
1386 $x = $x * ($hi - $lo) / $w + $lo;
1387 $x = $lo if $x < $lo;
1388 $x = $hi - $page if $x > $hi - $page;
1389 $self->{range}[0] = $x;
1390
1391 $self->emit (changed => $x);
1392 $self->update;
1393 }
1394}
1395
1396sub _draw {
1397 my ($self) = @_;
1398
1399 $self->SUPER::_draw ();
1400
1401 my ($w, $h) = @$self{qw(w h)};
1402
1403 if ($self->{vertical}) {
1404 # draw a vertical slider like a rotated horizontal slider
1405
1406 glRotate 90, 0, 0, 1;
1407 glTranslate 0, -$self->{w}, 0;
1408
1409 ($w, $h) = ($h, $w);
1410 }
1411
1412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1414
1415 my ($value, $lo, $hi, $page) = @{$self->{range}};
1416
1417 # the inner_* stuff is for generating a padding for the slider handle,
1418 # so that the handle doesn't leave the texture. This calculation isn't 100%
1419 # correct propably, but it does the job for now
1420 my $inner_pad = 5; # 5% of width for slider bg texture border
1421 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1422 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1423
1424 $page = int $page * $inner_w / ($hi - $lo);
1425 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1426
1427 $w -= $page;
1428 $page &= ~1;
1429 glTranslate $page * 0.5, 0, 0;
1430 $page ||= 2;
1431
1432 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1433 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1434
1435 glEnable GL_BLEND;
1436 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1437 glEnable GL_TEXTURE_2D;
1438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1439
1440 # draw background
755 $tex->draw_quad (0, 0); 1441 $tex[1]->draw_quad (0, 0, $w, $h);
1442
1443 # draw handle
1444 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
756 1445
757 glDisable GL_BLEND; 1446 glDisable GL_BLEND;
758 glDisable GL_TEXTURE_2D; 1447 glDisable GL_TEXTURE_2D;
759} 1448}
760 1449
761############################################################################# 1450#############################################################################
762 1451
1452package CFClient::UI::TextView;
1453
1454our @ISA = CFClient::UI::HBox::;
1455
1456use SDL::OpenGL;
1457
1458sub new {
1459 my $class = shift;
1460
1461 my $self = $class->SUPER::new (
1462 par => [],
1463 @_,
1464 children => [
1465 (new CFClient::UI::Empty expand => 1),
1466 (new CFClient::UI::Slider vertical => 1),
1467 ],
1468 );
1469
1470 $self
1471}
1472
1473sub add_paragraph {
1474 my ($self, $color, $text) = @_;
1475
1476 push @{$self->{par}}, [$color, $text];
1477 my $count = scalar @{$self->{par}};
1478 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1479 $self->{children}[1]->update;
1480}
1481
1482sub _draw {
1483 my ($self) = @_;
1484
1485 my $par = $self->{par};
1486
1487 my $bottom = (scalar @$par) - 1;
1488
1489 my $w = $self->{children}[0]{w};
1490 my $y = $self->{h};
1491
1492 glEnable GL_BLEND;
1493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1494 glEnable GL_TEXTURE_2D;
1495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496
1497 # TODO: everything!
1498 while ($y > 0 && $bottom >= 0) {
1499 my $par = $par->[$bottom--];
1500
1501 my $layout = new CFClient::Layout;
1502
1503 $layout->set_height ($::FONTSIZE);
1504 $layout->set_width ($w);
1505 $layout->set_text ($par->[1]);
1506 my $tex = new_from_layout CFClient::Texture $layout;
1507 $y -= $tex->{h};
1508
1509 glColor @{ $par->[0] };
1510 $tex->draw_quad (0, $y);
1511 }
1512
1513 glDisable GL_TEXTURE_2D;
1514 glDisable GL_BLEND;
1515}
1516
1517#############################################################################
1518
763package CFClient::Widget::Entry; 1519package CFClient::UI::MapWidget;
764 1520
765our @ISA = CFClient::Widget::Label::; 1521use strict;
1522
1523use List::Util qw(min max);
766 1524
767use SDL; 1525use SDL;
768use SDL::OpenGL; 1526use SDL::OpenGL;
769 1527
770sub key_down {
771 my ($self, $ev) = @_;
772
773 my $mod = $ev->key_mod;
774 my $sym = $ev->key_sym;
775
776 my $uni = $ev->key_unicode;
777
778 my $text = $self->get_text;
779
780 if ($sym == SDLK_BACKSPACE) {
781 substr $text, -1, 1, '';
782 } elsif ($uni) {
783 $text .= chr $uni;
784 }
785
786 $self->set_text ($text);
787}
788
789sub button_down {
790 my ($self, $ev) = @_;
791
792 $self->focus_in;
793}
794
795sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798}
799
800sub _draw {
801 my ($self) = @_;
802
803 if ($FOCUS == $self) {
804 glColor 1, 1, 1;
805 } else {
806 glColor 0.7, 0.7, 0.7;
807 }
808
809 glBegin GL_QUADS;
810 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1;
812 glVertex $self->{w} - 1, $self->{h} - 1;
813 glVertex $self->{w} - 1, 0;
814 glEnd;
815
816 $self->SUPER::_draw;
817}
818
819#############################################################################
820
821package CFClient::Widget::MapWidget;
822
823use strict;
824
825use List::Util qw(min max);
826
827use SDL;
828use SDL::OpenGL;
829use SDL::OpenGL::Constants;
830
831our @ISA = CFClient::Widget::; 1528our @ISA = CFClient::UI::Base::;
832 1529
833sub new { 1530sub new {
834 my $class = shift; 1531 my $class = shift;
835 1532
836 $class->SUPER::new ( 1533 $class->SUPER::new (
837 z => -1, 1534 z => -1,
1535 can_focus => 1,
838 list => (glGenLists 1), 1536 list => (glGenLists 1),
839 @_ 1537 @_
840 ) 1538 )
841} 1539}
842 1540
843sub key_down { 1541sub key_down {
… …
847sub key_up { 1545sub key_up {
848} 1546}
849 1547
850sub size_request { 1548sub size_request {
851 ( 1549 (
852 1 + int $::WIDTH / 32, 1550 1 + 32 * int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32, 1551 1 + 32 * int $::HEIGHT / 32,
854 ) 1552 )
855} 1553}
856 1554
857sub update { 1555sub update {
858 my ($self) = @_; 1556 my ($self) = @_;
859 1557
860 $self->{need_update} = 1; 1558 $self->{need_update} = 1;
1559 $self->SUPER::update;
861} 1560}
862 1561
863sub _draw { 1562sub draw {
864 my ($self) = @_; 1563 my ($self) = @_;
865 1564
1565 $self->{need_update}++;#d#
866 if (delete $self->{need_update}) { 1566 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE; 1567 glNewList $self->{list}, GL_COMPILE;
868 1568
869 my $mx = $::CONN->{mapx};
870 my $my = $::CONN->{mapy};
871
872 my $map = $::CONN->{map};
873
874 my ($xofs, $yofs);
875
876 my $sw = 1 + int $::WIDTH / 32; 1569 my $sw = int $::WIDTH / 32;
877 my $sh = 1 + int $::HEIGHT / 32; 1570 my $sh = int $::HEIGHT / 32;
878 1571
879 if ($::CONN->{mapw} > $sw) { 1572 if ($::MAP) {
880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1573 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
881 } else {
882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
883 }
884 1574
885 if ($::CONN->{maph} > $sh) { 1575 if ($::CFG->{fow_enable}) {
886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1576 if ($::CFG->{fow_smooth}) { # smooth fog of war
887 } else { 1577 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1578 glConvolutionFilter2D
889 } 1579 GL_CONVOLUTION_2D,
890 1580 GL_ALPHA,
891 glEnable GL_TEXTURE_2D; 1581 3, 3,
892 glEnable GL_BLEND; 1582 GL_ALPHA, GL_FLOAT,
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1583 pack "f*",
894 1584 0.1, 0.1, 0.1,
895 my $sw4 = ($sw + 3) & ~3; 1585 0.1, 0.2, 0.1,
896 my $darkness = "\x00" x ($sw4 * $sh); 1586 0.1, 0.1, 0.1,
897
898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
900 for my $y (0 .. $sh - 1) {
901
902 my $cell = $row->[$y + $yofs]
903 or next; 1587 ;
904 1588 glEnable GL_CONVOLUTION_2D;
905 my $dark = $cell->[0];
906 if ($dark < 0) {
907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
908 } else {
909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
910 } 1589 }
911 1590
912 for my $num (grep $_, @$cell[1,2,3]) { 1591 my $tex = new CFClient::Texture
913 my $tex = $::CONN->{face}[$num]{texture} || next; 1592 w => $w,
914 1593 h => $h,
915 my $w = $tex->{width}; 1594 data => $data,
916 my $h = $tex->{height}; 1595 internalformat => GL_ALPHA,
1596 format => GL_ALPHA;
917 1597
918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1598 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
919 } 1599
1600 glEnable GL_BLEND;
1601 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1603
1604 glColor +($::CFG->{fow_intensity}) x 3, 1;
1605 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1606
1607 glDisable GL_TEXTURE_2D;
1608 glDisable GL_BLEND;
920 } 1609 }
921 } 1610 }
922 1611
923# if (1) { # higher quality darkness
924# $lighting =~ s/(.)/$1$1$1/gs;
925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
926#
927# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
928#
929# $lighting = $pb->get_pixels;
930# $lighting =~ s/(.)../$1/gs;
931# }
932
933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
946 glDisable GL_TEXTURE_2D;
947 glDisable GL_BLEND;
948
949 glEndList; 1612 glEndList;
950 } 1613 }
951 1614
952 glCallList $self->{list}; 1615 glCallList $self->{list};
1616
1617 if ($FOCUS != $self) {
1618 glColor 64/255, 64/255, 64/255;
1619 glLogicOp GL_AND;
1620 glEnable GL_COLOR_LOGIC_OP;
1621 glBegin GL_QUADS;
1622 glVertex 0, 0;
1623 glVertex 0, $::HEIGHT;
1624 glVertex $::WIDTH, $::HEIGHT;
1625 glVertex $::WIDTH, 0;
1626 glEnd;
1627 glDisable GL_COLOR_LOGIC_OP;
1628 }
953} 1629}
954 1630
955my %DIR = ( 1631my %DIR = (
956 SDLK_KP8, [1, "north"], 1632 SDLK_KP8, [1, "north"],
957 SDLK_KP9, [2, "northeast"], 1633 SDLK_KP9, [2, "northeast"],
… …
973 1649
974 my $mod = $ev->key_mod; 1650 my $mod = $ev->key_mod;
975 my $sym = $ev->key_sym; 1651 my $sym = $ev->key_sym;
976 1652
977 if ($sym == SDLK_KP5) { 1653 if ($sym == SDLK_KP5) {
978 $::CONN->send ("command stay fire"); 1654 $::CONN->user_send ("command stay fire");
1655 } elsif ($sym == SDLK_a) {
1656 $::CONN->user_send ("command apply");
1657 } elsif ($sym == SDLK_QUOTE) {
1658 $self->emit ('activate_console');
979 } elsif (exists $DIR{$sym}) { 1659 } elsif (exists $DIR{$sym}) {
980 if ($mod & KMOD_SHIFT) { 1660 if ($mod & KMOD_SHIFT) {
981 $self->{shft}++; 1661 $self->{shft}++;
982 $::CONN->send ("command fire $DIR{$sym}[0]"); 1662 $::CONN->user_send ("command fire $DIR{$sym}[0]");
983 } elsif ($mod & KMOD_CTRL) { 1663 } elsif ($mod & KMOD_CTRL) {
984 $self->{ctrl}++; 1664 $self->{ctrl}++;
985 $::CONN->send ("command run $DIR{$sym}[0]"); 1665 $::CONN->user_send ("command run $DIR{$sym}[0]");
986 } else { 1666 } else {
987 $::CONN->send ("command $DIR{$sym}[1]"); 1667 $::CONN->user_send ("command $DIR{$sym}[1]");
988 } 1668 }
989 } 1669 }
990} 1670}
991 1671
992sub key_up { 1672sub key_up {
… …
994 1674
995 my $mod = $ev->key_mod; 1675 my $mod = $ev->key_mod;
996 my $sym = $ev->key_sym; 1676 my $sym = $ev->key_sym;
997 1677
998 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1678 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
999 $::CONN->send ("command fire_stop"); 1679 $::CONN->user_send ("command fire_stop");
1000 } 1680 }
1001 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1681 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1002 $::CONN->send ("command run_stop"); 1682 $::CONN->user_send ("command run_stop");
1003 } 1683 }
1004} 1684}
1005 1685
1006############################################################################# 1686#############################################################################
1007 1687
1008package CFClient::Widget::Animator; 1688package CFClient::UI::Animator;
1009 1689
1010use SDL::OpenGL; 1690use SDL::OpenGL;
1011 1691
1012our @ISA = CFClient::Widget::Bin::; 1692our @ISA = CFClient::UI::Bin::;
1013 1693
1014sub moveto { 1694sub moveto {
1015 my ($self, $x, $y) = @_; 1695 my ($self, $x, $y) = @_;
1016 1696
1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1697 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1045 glPopMatrix; 1725 glPopMatrix;
1046} 1726}
1047 1727
1048############################################################################# 1728#############################################################################
1049 1729
1730package CFClient::UI::Flopper;
1731
1732our @ISA = CFClient::UI::Button::;
1733
1734sub new {
1735 my $class = shift;
1736
1737 my $self = $class->SUPER::new (
1738 state => 0,
1739 connect_activate => \&toggle_flopper,
1740 @_
1741 );
1742
1743 if ($self->{state}) {
1744 $self->{state} = 0;
1745 $self->toggle_flopper;
1746 }
1747
1748 $self
1749}
1750
1751sub toggle_flopper {
1752 my ($self) = @_;
1753
1754 # TODO: use animation
1755 if ($self->{state} = !$self->{state}) {
1756 $CFClient::UI::TOPLEVEL->add ($self->{other});
1757 $self->{other}->move (
1758 ($::WIDTH - $self->{other}{w}) * 0.5,
1759 ($::HEIGHT - $self->{other}{h}) * 0.5,
1760 );
1761 } else {
1762 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1763 }
1764}
1765
1766#############################################################################
1767
1050package CFClient::Widget::Toplevel; 1768package CFClient::UI::Toplevel;
1051 1769
1052our @ISA = CFClient::Widget::Container::; 1770our @ISA = CFClient::UI::Container::;
1053 1771
1054sub size_request { 1772sub size_request {
1055 ($::WIDTH, $::HEIGHT) 1773 ($::WIDTH, $::HEIGHT)
1056} 1774}
1057 1775
1058sub size_allocate { 1776sub size_allocate {
1059 my ($self, $w, $h) = @_; 1777 my ($self, $x, $y, $w, $h) = @_;
1060 1778
1061 $self->SUPER::size_allocate ($w, $h); 1779 $self->_size_allocate ($x, $y, $w, $h);
1062 1780
1063 $_->size_allocate ($_->size_request) 1781 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1064 for @{$self->{children}}; 1782 for @{$self->{children}};
1065} 1783}
1066 1784
1067sub translate { 1785sub translate {
1068 my ($self, $x, $y) = @_; 1786 my ($self, $x, $y) = @_;
… …
1071} 1789}
1072 1790
1073sub update { 1791sub update {
1074 my ($self) = @_; 1792 my ($self) = @_;
1075 1793
1076 $self->size_allocate ($self->size_request); 1794 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1077 ::refresh (); 1795 ::refresh ();
1078} 1796}
1079 1797
1080sub add { 1798sub add {
1081 my ($self, $widget) = @_; 1799 my ($self, $widget) = @_;
1082 1800
1083 $self->SUPER::add ($widget); 1801 $self->SUPER::add ($widget);
1084 1802
1085 $widget->size_allocate ($widget->size_request); 1803 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1086} 1804}
1087 1805
1088sub draw { 1806sub draw {
1089 my ($self) = @_; 1807 my ($self) = @_;
1090 1808
1091 $self->_draw; 1809 $self->_draw;
1092} 1810}
1093 1811
1094############################################################################# 1812#############################################################################
1095 1813
1096package CFClient::Widget; 1814package CFClient::UI;
1097 1815
1098$TOPLEVEL = new CFClient::Widget::Toplevel; 1816$TOPLEVEL = new CFClient::UI::Toplevel;
1099 1817
11001 18181
1101 1819

Diff Legend

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