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.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.47 by root, Sun Apr 9 22:24:43 2006 UTC

5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use Crossfire::Client;
11our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 22}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $::FOCUS = $widget;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 1;
86 glBegin GL_LINES;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glVertex 0, 0;
92 glEnd;
93 }
89 glPopMatrix; 94 glPopMatrix;
90} 95}
91 96
92sub _draw { 97sub _draw {
93 my ($widget) = @_; 98 my ($self) = @_;
99
100 warn "no draw defined for $self\n";
94} 101}
95 102
96sub bbox { 103sub bbox {
97 my ($widget) = @_; 104 my ($self) = @_;
105 my ($w, $h) = $self->size_request;
106 (
107 $self->{x},
108 $self->{y},
109 $self->{x} = $w,
110 $self->{y} = $h
111 )
112}
113
114sub find_widget {
115 my ($self, $x, $y) = @_;
116
117 return $self
118 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
119 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
120
121 ()
122}
123
124sub del_parent { $_[0]->{parent} = undef }
125
126sub set_parent {
127 my ($self, $par) = @_;
128
129 $self->{parent} = $par;
130 Scalar::Util::weaken $self->{parent};
131}
132
133sub get_parent {
134 $_[0]->{parent}
135}
136
137sub update {
138 my ($self) = @_;
139
140 $self->{parent}->update
141 if $self->{parent};
98} 142}
99 143
100sub DESTROY { 144sub DESTROY {
101 my ($self) = @_; 145 my ($self) = @_;
102 146
103 $self->deactivate; 147 #$self->deactivate;
104} 148}
149
150#############################################################################
105 151
106package Crossfire::Client::Widget::Container; 152package Crossfire::Client::Widget::Container;
107 153
108our @ISA = Crossfire::Client::Widget::; 154our @ISA = Crossfire::Client::Widget::;
109 155
156sub new {
157 my ($class, @widgets) = @_;
158
159 my $self = $class->SUPER::new (children => []);
160 $self->add ($_) for @widgets;
161
162 $self
163}
164
165sub add {
166 my ($self, $chld, $expand) = @_;
167
168 $chld->{expand} = $expand;
169 $chld->set_parent ($self);
170
171 @{$self->{children}} =
172 sort { $a->{z} <=> $b->{z} }
173 @{$self->{children}}, $chld;
174
175 $self->size_allocate ($self->{w}, $self->{h})
176 if $self->{w}; #TODO: check for "realised state"
177}
178
179sub remove {
180 my ($self, $widget) = @_;
181
182 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
183
184 $self->size_allocate ($self->{w}, $self->{h});
185}
186
187sub find_widget {
188 my ($self, $x, $y) = @_;
189
190 $x -= $self->{x};
191 $y -= $self->{y};
192
193 my $res;
194
195 for (reverse @{ $self->{children} }) {
196 $res = $_->find_widget ($x, $y)
197 and return $res;
198 }
199
200 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
201}
202
203sub _draw {
204 my ($self) = @_;
205
206 $_->draw for @{$self->{children}};
207}
208
209#############################################################################
210
211package Crossfire::Client::Widget::Bin;
212
213our @ISA = Crossfire::Client::Widget::Container::;
214
215sub child { $_[0]->{children}[0] }
216
217sub size_request {
218 $_[0]{children}[0]->size_request if $_[0]{children}[0];
219}
220
221sub size_allocate {
222 my ($self, $w, $h) = @_;
223
224 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h)
226 if $self->{children}[0]
227}
228
229#############################################################################
230
231package Crossfire::Client::Widget::Toplevel;
232
233our @ISA = Crossfire::Client::Widget::Container::;
234
235sub update {
236 my ($self) = @_;
237
238 ::refresh ();
239}
240
241sub add {
242 my ($self, $widget) = @_;
243
244 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247}
248
249#############################################################################
250
251package Crossfire::Client::Widget::Window;
252
253our @ISA = Crossfire::Client::Widget::Bin::;
254
110use SDL::OpenGL; 255use SDL::OpenGL;
111 256
112sub add { $_[0]->{child} = $_[1] } 257sub new {
113sub get { $_[0]->{child} } 258 my ($class, $x, $y, $z, $w, $h) = @_;
114 259
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 260 my $self = $class->SUPER::new;
116 261
117sub _draw { die "Containers can't be drawn!" } 262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
263}
118 264
119package Crossfire::Client::Widget::Window; 265sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 266 my ($self) = @_;
127 $self->SUPER::add ($chld); 267
128 $self->render_chld; #TODO: Move this to the size_request event propably? 268 $self->render_chld;
269 $self->SUPER::update;
129} 270}
130 271
131sub render_chld { 272sub render_chld {
132 my ($self) = @_; 273 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 274
136 $self->{texture} = 275 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 276 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 277 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 278 );
140 $self->{texture}->upload;
141} 279}
142 280
143sub size_request { 281sub size_allocate {
144 my ($self) = @_; 282 my ($self, $w, $h) = @_;
145 my $chld = $self->get 283
146 or return (0, 0); 284 $self->{w} = $w;
147 $chld->size_request 285 $self->{h} = $h;
286
287 $self->child->size_allocate ($w, $h);
288
289 $self->render_chld;
148} 290}
149 291
150sub _draw { 292sub _draw {
151 my ($self) = @_; 293 my ($self) = @_;
152 294
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 295 my ($w, $h) = ($self->w, $self->h);
296
154 my $tex = $self->{texture} 297 my $tex = $self->{texture}
155 or return; 298 or return;
156 299
157 glEnable GL_BLEND; 300 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 301 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name}; 303 glBindTexture GL_TEXTURE_2D, $tex->{name};
161
162 glColor 1, 1, 1;
163 304
164 glBegin GL_QUADS; 305 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0; 306 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h; 307 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h; 308 glTexCoord 1, 1; glVertex $w, $h;
170 311
171 glDisable GL_BLEND; 312 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 313 glDisable GL_TEXTURE_2D;
173} 314}
174 315
316#############################################################################
317
175package Crossfire::Client::Widget::Frame; 318package Crossfire::Client::Widget::Frame;
176 319
177our @ISA = Crossfire::Client::Widget::Container::; 320our @ISA = Crossfire::Client::Widget::Bin::;
178 321
179use SDL::OpenGL; 322use SDL::OpenGL;
180 323
181sub size_request { 324sub size_request {
182 my ($self) = @_; 325 my ($self) = @_;
183 my $chld = $self->get 326 my $chld = $self->child
184 or return (0, 0); 327 or return (0, 0);
328
329 $chld->move (2, 2);
330
185 map { $_ + 4 } $chld->size_request; 331 map { $_ + 4 } $chld->size_request;
186} 332}
187 333
334sub size_allocate {
335 my ($self, $w, $h) = @_;
336
337 $self->{w} = $w;
338 $self->{h} = $h;
339
340 $self->child->size_allocate ($w - 4, $h - 4);
341 $self->child->move (2, 2);
342}
343
188sub _draw { 344sub _draw {
189 my ($self) = @_; 345 my ($self) = @_;
190 346
191 my $chld = $self->get; 347 my $chld = $self->child;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
194 348
195 my ($w, $h) = $chld->size_request; 349 my ($w, $h) = $chld->size_request;
196 350
197 glColor 1, 0, 0;
198 glBegin GL_QUADS; 351 glBegin GL_QUADS;
352 glColor 0, 0, 0;
199 glTexCoord 0, 0; glVertex 0 , 0; 353 glTexCoord 0, 0; glVertex 0 , 0;
200 glTexCoord 0, 1; glVertex 0 , $h + 4; 354 glTexCoord 0, 1; glVertex 0 , $h + 4;
201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 355 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
202 glTexCoord 1, 0; glVertex $w + 4 , 0; 356 glTexCoord 1, 0; glVertex $w + 4 , 0;
203 glEnd; 357 glEnd;
204 358
205 $chld->draw; 359 $chld->draw;
206} 360}
207 361
362#############################################################################
363
364package Crossfire::Client::Widget::FancyFrame;
365
366our @ISA = Crossfire::Client::Widget::Bin::;
367
368use SDL::OpenGL;
369
370my @tex =
371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
372 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
373
374sub size_request {
375 my ($self) = @_;
376
377 my ($w, $h) = $self->SUPER::size_request;
378
379 $h += $tex[1]->{height};
380 $h += $tex[4]->{height};
381 $w += $tex[2]->{width};
382 $w += $tex[3]->{width};
383
384 ($w, $h)
385}
386
387sub size_allocate {
388 my ($self, $w, $h) = @_;
389
390 $self->SUPER::size_allocate ($w, $h);
391
392 $h -= $tex[1]->{height};
393 $h -= $tex[4]->{height};
394 $w -= $tex[2]->{width};
395 $w -= $tex[3]->{width};
396
397 $h = $h < 0 ? 0 : $h;
398 $w = $w < 0 ? 0 : $w;
399
400 $self->child->size_allocate ($w, $h);
401 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
402}
403
404sub _draw {
405 my ($self) = @_;
406
407 my ($w, $h) = ($self->{w}, $self->{h});
408 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
409
410 glEnable GL_BLEND;
411 glEnable GL_TEXTURE_2D;
412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
414
415 my $top = $tex[1];
416 glBindTexture GL_TEXTURE_2D, $top->{name};
417
418 glBegin GL_QUADS;
419 glTexCoord 0, 0; glVertex 0 , 0;
420 glTexCoord 0, 1; glVertex 0 , $top->{height};
421 glTexCoord 1, 1; glVertex $w , $top->{height};
422 glTexCoord 1, 0; glVertex $w , 0;
423 glEnd;
424
425 my $left = $tex[3];
426 glBindTexture GL_TEXTURE_2D, $left->{name};
427
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , $top->{height};
430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
433 glEnd;
434
435 my $right = $tex[2];
436 glBindTexture GL_TEXTURE_2D, $right->{name};
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $w , $top->{height};
443 glEnd;
444
445 my $bottom = $tex[4];
446 glBindTexture GL_TEXTURE_2D, $bottom->{name};
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
450 glTexCoord 0, 1; glVertex 0 , $h;
451 glTexCoord 1, 1; glVertex $w , $h;
452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
453 glEnd;
454
455 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460
461 my $rep_x = $cw / $bg->{width};
462 my $rep_y = $ch / $bg->{height};
463
464 glBegin GL_QUADS;
465 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
466 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
467 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
468 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
469 glEnd;
470
471 glDisable GL_BLEND;
472 glDisable GL_TEXTURE_2D;
473
474 $self->child->draw;
475
476}
477
478#############################################################################
479
208package Crossfire::Client::Widget::Table; 480package Crossfire::Client::Widget::Table;
209 481
210our @ISA = Crossfire::Client::Widget::Container::; 482our @ISA = Crossfire::Client::Widget::Bin::;
211 483
212use SDL::OpenGL; 484use SDL::OpenGL;
213 485
214sub add { 486sub add {
215 my ($self, $x, $y, $chld) = @_; 487 my ($self, $x, $y, $chld) = @_;
488 my $old_chld = $self->{children}[$y][$x];
489
216 $self->{childs}[$y][$x] = $chld; 490 $self->{children}[$y][$x] = $chld;
491 $chld->set_parent ($self);
492 $self->update;
217} 493}
218 494
219sub max_row_height { 495sub max_row_height {
220 my ($self, $row) = @_; 496 my ($self, $row) = @_;
221 497
222 my $hs = 0; 498 my $hs = 0;
223 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 499 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
224 my $c = $self->{childs}->[$row]->[$xi]; 500 my $c = $self->{children}->[$row]->[$xi];
225 if ($c) { 501 if ($c) {
226 my ($w, $h) = $c->size_request; 502 my ($w, $h) = $c->size_request;
227 if ($hs < $h) { $hs = $h } 503 if ($hs < $h) { $hs = $h }
228 } 504 }
229 } 505 }
232 508
233sub max_col_width { 509sub max_col_width {
234 my ($self, $col) = @_; 510 my ($self, $col) = @_;
235 511
236 my $ws = 0; 512 my $ws = 0;
237 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 513 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
238 my $c = ($self->{childs}->[$yi] || [])->[$col]; 514 my $c = ($self->{children}->[$yi] || [])->[$col];
239 if ($c) { 515 if ($c) {
240 my ($w, $h) = $c->size_request; 516 my ($w, $h) = $c->size_request;
241 if ($ws < $w) { $ws = $w } 517 if ($ws < $w) { $ws = $w }
242 } 518 }
243 } 519 }
247sub size_request { 523sub size_request {
248 my ($self) = @_; 524 my ($self) = @_;
249 525
250 my ($hs, $ws) = (0, 0); 526 my ($hs, $ws) = (0, 0);
251 527
252 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 528 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
253 $hs += $self->max_row_height ($yi); 529 $hs += $self->max_row_height ($yi);
254 } 530 }
255 531
256 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
257 my $wm = 0; 533 my $wm = 0;
258 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 534 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
259 $wm += $self->max_col_width ($xi) 535 $wm += $self->max_col_width ($xi)
260 } 536 }
261 if ($ws < $wm) { $ws = $wm } 537 if ($ws < $wm) { $ws = $wm }
262 } 538 }
263 539
266 542
267sub _draw { 543sub _draw {
268 my ($self) = @_; 544 my ($self) = @_;
269 545
270 my $y = 0; 546 my $y = 0;
271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 547 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
272 my $x = 0; 548 my $x = 0;
273 549
274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 550 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
275 551
276 my $c = $self->{childs}->[$yi]->[$xi]; 552 my $c = $self->{children}->[$yi]->[$xi];
277 if ($c) { 553 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request 554 $c->move ($x, $y, 0); #TODO: Move to size_request
279 $c->draw if $c; 555 $c->draw if $c;
280 } 556 }
281 557
284 560
285 $y += $self->max_row_height ($yi); 561 $y += $self->max_row_height ($yi);
286 } 562 }
287} 563}
288 564
565#############################################################################
566
289package Crossfire::Client::Widget::VBox; 567package Crossfire::Client::Widget::VBox;
290 568
291our @ISA = Crossfire::Client::Widget::Container::; 569our @ISA = Crossfire::Client::Widget::Container::;
292 570
293use SDL::OpenGL; 571use SDL::OpenGL;
294 572
295sub add {
296 my ($self, $chld) = @_;
297 push @{$self->{childs}}, $chld;
298}
299
300sub size_request { 573sub size_request {
301 my ($self) = @_; 574 my ($self) = @_;
302 575
303 my ($hs, $ws) = (0, 0); 576 my @alloc = map [$_->size_request], @{$self->{children}};
577
578 (
579 (List::Util::max map $_->[0], @alloc),
580 (List::Util::sum map $_->[1], @alloc),
581 )
582}
583
584sub size_allocate {
585 my ($self, $w, $h) = @_;
586
587 $self->w ($w);
588 $self->h ($h);
589
590 my $exp;
591 my @oth;
592 # find expand widget
304 for (@{$self->{childs} || []}) { 593 for (@{$self->{children}}) {
594 if ($_->{expand}) {
595 $exp = $_;
596 last;
597 }
598 push @oth, $_;
599 }
600
601 my ($ow, $oh);
602
603 # get sizes of other widgets
604 for (@oth) {
305 my ($w, $h) = $_->size_request; 605 my ($w, $h) = $_->size_request;
306 $hs += $h; 606 $oh += $h;
307 if ($ws < $w) { $ws = $w } 607 if ($ow < $w) { $ow = $w }
308 } 608 }
309 609
310 return ($ws, $hs); 610 my $y = 0;
311}
312
313sub _draw {
314 my ($self) = @_;
315
316 my ($x, $y);
317 for (@{$self->{childs} || []}) { 611 for (@{$self->{children}}) {
318 $_->move (0, $y, 0); #TODO: move to size_request 612 $_->move (0, $y);
319 $_->draw; 613
614 if ($_ == $exp) {
615 $_->size_allocate ($w, $h - $oh);
616 $y += $h - $oh;
617 } else {
320 my ($w, $h) = $_->size_request; 618 my ($cw, $h) = $_->size_request;
619 $_->size_allocate ($w, $h);
321 $y += $h; 620 $y += $h;
621 }
322 } 622 }
323} 623}
624
625#############################################################################
324 626
325package Crossfire::Client::Widget::Label; 627package Crossfire::Client::Widget::Label;
326 628
327our @ISA = Crossfire::Client::Widget::; 629our @ISA = Crossfire::Client::Widget::;
328 630
329use SDL::OpenGL; 631use SDL::OpenGL;
330 632
331sub new { 633sub new {
332 my ($class, $x, $y, $z, $height, $text) = @_; 634 my ($class, $x, $y, $z, $height, $text) = @_;
333 635
636 # TODO: color, and make height, xyz etc. optional
334 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 637 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
335 638
336 $self->set_text ($text); 639 $self->set_text ($text);
337 640
338 $self 641 $self
340 643
341sub set_text { 644sub set_text {
342 my ($self, $text) = @_; 645 my ($self, $text) = @_;
343 646
344 $self->{text} = $text; 647 $self->{text} = $text;
345
346 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 648 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
649
650 $self->update;
347} 651}
348 652
349sub get_text { 653sub get_text {
350 my ($self, $text) = @_; 654 my ($self, $text) = @_;
351 655
366 670
367 my $tex = $self->{texture}; 671 my $tex = $self->{texture};
368 672
369 glEnable GL_BLEND; 673 glEnable GL_BLEND;
370 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
371 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
372 glBindTexture GL_TEXTURE_2D, $tex->{name}; 677 glBindTexture GL_TEXTURE_2D, $tex->{name};
373 678
374 glColor 1, 0, 1; 679 glColor 1, 0, 0, 1; # TODO color
375 680
376 glBegin GL_QUADS; 681 glBegin GL_QUADS;
377 glTexCoord 0, 0; glVertex 0 , 0; 682 glTexCoord 0, 0; glVertex 0 , 0;
378 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
379 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
382 687
383 glDisable GL_BLEND; 688 glDisable GL_BLEND;
384 glDisable GL_TEXTURE_2D; 689 glDisable GL_TEXTURE_2D;
385} 690}
386 691
692#############################################################################
693
387package Crossfire::Client::Widget::TextView; 694package Crossfire::Client::Widget::TextEntry;
388 695
389use strict;
390
391our @ISA = qw/Crossfire::Client::Widget/; 696our @ISA = Crossfire::Client::Widget::Label::;
392 697
698use SDL;
393use SDL::OpenGL; 699use SDL::OpenGL;
394use SDL::OpenGL::Constants;
395 700
396sub add_line { 701sub key_down {
397 my ($self, $line) = @_; 702 my ($self, $ev) = @_;
398 push @{$self->{lines}}, $line;
399}
400 703
401sub _draw { 704 my $mod = $ev->key_mod;
402 my ($self) = @_; 705 my $sym = $ev->key_sym;
403 706
707 $ev->set_unicode (1);
708 my $uni = $ev->key_unicode;
709
710 my $text = $self->get_text;
711
712 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, '';
714
715 } elsif ($uni) {
716 $text .= chr $uni;
717 }
718 $self->set_text ($text);
404} 719}
720
721#############################################################################
405 722
406package Crossfire::Client::Widget::MapWidget; 723package Crossfire::Client::Widget::MapWidget;
407 724
408use strict; 725use strict;
409 726
418sub key_down { 735sub key_down {
419 print "MAPKEYDOWN\n"; 736 print "MAPKEYDOWN\n";
420} 737}
421 738
422sub key_up { 739sub key_up {
740}
741
742sub size_request {
743
744}
745
746sub size_allocate {
423} 747}
424 748
425sub _draw { 749sub _draw {
426 my ($self) = @_; 750 my ($self) = @_;
427 751
447 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 771 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
448 } 772 }
449 773
450 glEnable GL_TEXTURE_2D; 774 glEnable GL_TEXTURE_2D;
451 glEnable GL_BLEND; 775 glEnable GL_BLEND;
452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
777
778 my $sw4 = ($sw + 3) & ~3;
779 my $lighting = "\x00" x ($sw4 * $sh);
453 780
454 for my $x (0 .. $sw - 1) { 781 for my $x (0 .. $sw - 1) {
455 for my $y (0 .. $sh - 1) { 782 for my $y (0 .. $sh - 1) {
456 783
457 my $cell = $map->[$x + $xofs][$y + $yofs] 784 my $cell = $map->[$x + $xofs][$y + $yofs]
458 or next; 785 or next;
459 786
460 my $darkness = $cell->[0] * (1 / 255); 787 my $darkness = $cell->[0] * (1 / 255);
461 if ($darkness < 0) { 788 if ($darkness < 0) {
462 glColor 0.3, 0.3, 0.3; 789 $darkness = 0.15;
463 } else {
464 glColor $darkness, $darkness, $darkness;
465 } 790 }
791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
466 792
467 for my $num (grep $_, @$cell[1,2,3]) { 793 for my $num (grep $_, @$cell[1,2,3]) {
468 my $tex = $::CONN->{face}[$num]{texture} || next; 794 my $tex = $::CONN->{face}[$num]{texture} || next;
469 795
470 glBindTexture GL_TEXTURE_2D, $tex->{name}; 796 glBindTexture GL_TEXTURE_2D, $tex->{name};
482 glTexCoord 1, 0; glVertex $px + $w, $py; 808 glTexCoord 1, 0; glVertex $px + $w, $py;
483 glEnd; 809 glEnd;
484 } 810 }
485 } 811 }
486 } 812 }
813
814# if (1) { # higher quality darkness
815# $lighting =~ s/(.)/$1$1$1/gs;
816# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
817#
818# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
819#
820# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs;
822# }
823
824 $lighting = new Crossfire::Client::Texture
825 width => $sw4,
826 height => $sh,
827 data => $lighting,
828 internalformat => GL_ALPHA4,
829 format => GL_ALPHA;
830
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
832 glColor 0, 0, 0, 0.75;
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name};
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
841 glEnd;
487 842
488 glDisable GL_TEXTURE_2D; 843 glDisable GL_TEXTURE_2D;
489 glDisable GL_BLEND; 844 glDisable GL_BLEND;
490} 845}
491 846
538 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 893 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
539 $::CONN->send ("command run_stop"); 894 $::CONN->send ("command run_stop");
540 } 895 }
541} 896}
542 897
898#############################################################################
899
900package Crossfire::Client::Widget::Animator;
901
902use SDL::OpenGL;
903
904our @ISA = Crossfire::Client::Widget::Bin::;
905
906sub moveto {
907 my ($self, $x, $y) = @_;
908
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2;
911 $self->{time} = 1;
912
913 ::animation_start $self;
914}
915
916sub animate {
917 my ($self, $interval) = @_;
918
919 $self->{time} -= $interval * $self->{speed};
920 if ($self->{time} <= 0) {
921 $self->{time} = 0;
922 ::animation_stop $self;
923 }
924
925 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
926
927 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
928 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
929}
930
931sub _draw {
932 my ($self) = @_;
933
934 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0;
936 $self->{children}[0]->draw;
937 glPopMatrix;
938}
939
5431; 9401;
544 941

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines