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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines