X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fregwin.c;h=409456231ecd899d1c68e7b2bc3ea73d14aa318e;hb=ba7ff1a7a78b3aa7c2cad9bfce117256638938b1;hp=68b7593164ea5f5bc41a029ec9c3ea089ea2e275;hpb=fc4dd8fa3aab94a5f63c097ed9809c75560abd7d;p=emu8051.git

diff --git a/src/regwin.c b/src/regwin.c
index 68b7593..4094562 100644
--- a/src/regwin.c
+++ b/src/regwin.c
@@ -30,124 +30,113 @@
 #include "cpu8051.h"
 #include "regwin.h"
 
-
 static GtkWidget *regclist;
 
-
 GtkWidget *
-regwin_init( int width, int height )
+regwin_init(void)
 {
-  int i;
-  GtkWidget *fixed_frame;
-
-  fixed_frame = gtk_frame_new(0);
-  gtk_frame_set_shadow_type( GTK_FRAME( fixed_frame ), GTK_SHADOW_ETCHED_OUT );
-  gtk_widget_set_usize( GTK_WIDGET( fixed_frame ), width, height );
-
-  regclist = gtk_clist_new( 1 );
-  gtk_clist_set_selection_mode( GTK_CLIST( regclist ), GTK_SELECTION_SINGLE );
-  gtk_widget_set_usize( GTK_WIDGET( regclist ), width, height );
-  gtk_clist_set_column_justification( GTK_CLIST( regclist ), 0, GTK_JUSTIFY_LEFT );
-  gtk_clist_set_column_width( GTK_CLIST( regclist ), 0, width );
-
-#if ( GTK_MAJOR_VERSION == 2)
-  PangoFontDescription *pango_font;
-  pango_font = pango_font_description_from_string( FIXED_FONT );
-  gtk_widget_modify_font( regclist, pango_font );
-#else
-  {
-    GtkStyle *style;
-    /* Setting font for the widget. */
-    style = gtk_style_new();
-    gdk_font_unref( style->font );
-    
-    /* Load a fixed font */
-    style->font = gdk_font_load( FIXED_FONT );
-    gtk_widget_set_style( GTK_WIDGET( regclist ), style );
-  }
-#endif
+	int i;
+	GtkWidget *scrollwin;
+	PangoFontDescription *pango_font;
+	char *regdummy[] = { 0 };
+
+	scrollwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
+					    GTK_SHADOW_ETCHED_OUT);
+
+	/* Automatically add scrollbars when necessary. */
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_AUTOMATIC);
+
+	regclist = gtk_clist_new(1);
+	gtk_clist_set_selection_mode(GTK_CLIST(regclist), GTK_SELECTION_SINGLE);
+	gtk_clist_set_column_justification(GTK_CLIST(regclist), 0,
+					   GTK_JUSTIFY_LEFT);
+
+	pango_font = pango_font_description_from_string(FIXED_FONT);
+	gtk_widget_modify_font(regclist, pango_font);
+
+	for (i = 0; i < 24; i++)
+		gtk_clist_append(GTK_CLIST(regclist), regdummy);
 
-  char *regdummy[] = { 0 };
-  for ( i = 0; i < 24; i++ ) {
-    gtk_clist_append( GTK_CLIST( regclist ), regdummy );
-  }
-  
-  gtk_container_add( GTK_CONTAINER( fixed_frame ), regclist );
+	gtk_container_add(GTK_CONTAINER(scrollwin), regclist);
 
-  return fixed_frame;
+	return scrollwin;
 }
 
 
 /* Show registers. */
 void
-regwin_Show( void )
+regwin_Show(void)
 {
-  char TextTmp[255];
-  int row = 0;
-  unsigned char PSW = cpu8051_ReadD( _PSW_ );
-  unsigned char Rbank;
-  
-  gtk_clist_freeze( GTK_CLIST( regclist ) );
-  
-  // Main registers
-  sprintf( TextTmp , "PC   = %.4X", cpu8051.pc );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "SP   =   %.2X", cpu8051_ReadD( _SP_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "A    =   %.2X", cpu8051_ReadD( _ACC_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "B    =   %.2X", cpu8051_ReadD( _B_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "DPTR = %.4X", ( cpu8051_ReadD( _DPTRHIGH_ )  << 8 ) +  cpu8051_ReadD( _DPTRLOW_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  
-  // Program Status Word
-  sprintf( TextTmp , "PSW  =   %.2X",PSW);
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-
-  // Ports registers
-  sprintf( TextTmp , "P0   =   %.2X", cpu8051_ReadD( _P0_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "P1   =   %.2X", cpu8051_ReadD( _P1_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "P2   =   %.2X", cpu8051_ReadD( _P2_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "P3   =   %.2X", cpu8051_ReadD( _P3_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-
-  // Misc Registers
-  sprintf( TextTmp , "TCON =   %.2X", cpu8051_ReadD( _TCON_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "TMOD =   %.2X", cpu8051_ReadD( _TMOD_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "SCON =   %.2X", cpu8051_ReadD( _SCON_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "IE   =   %.2X", cpu8051_ReadD( _IE_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "IP   =   %.2X", cpu8051_ReadD( _IP_ ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-
-  // R0-R7 Registers in current Bank
-  Rbank = cpu8051_ReadD( _PSW_ ) & 0x18;
-  sprintf( TextTmp , "Bank =   %.2X", Rbank);
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R0   =   %.2X", cpu8051_ReadD( _R0_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R1   =   %.2X", cpu8051_ReadD( _R1_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R2   =   %.2X", cpu8051_ReadD( _R2_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R3   =   %.2X", cpu8051_ReadD( _R3_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R4   =   %.2X", cpu8051_ReadD( _R4_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R5   =   %.2X", cpu8051_ReadD( _R5_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R6   =   %.2X", cpu8051_ReadD( _R6_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  sprintf( TextTmp , "R7   =   %.2X", cpu8051_ReadD( _R7_ + Rbank ) );
-  gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp );
-  
-  gtk_clist_select_row(GTK_CLIST(regclist),0,0);
-  gtk_clist_thaw( GTK_CLIST( regclist ) );
+	char TextTmp[255];
+	int row = 0;
+	unsigned char PSW = cpu8051_ReadD(_PSW_);
+	unsigned char Rbank;
+
+	gtk_clist_freeze(GTK_CLIST(regclist));
+
+	/* Main registers */
+	sprintf(TextTmp , "PC   = %.4X", cpu8051.pc);
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "SP   =   %.2X", cpu8051_ReadD(_SP_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "A    =   %.2X", cpu8051_ReadD(_ACC_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "B    =   %.2X", cpu8051_ReadD(_B_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "DPTR = %.4X", (cpu8051_ReadD(_DPTRHIGH_) << 8) +
+		cpu8051_ReadD(_DPTRLOW_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+
+	/* Program Status Word */
+	sprintf(TextTmp, "PSW  =   %.2X", PSW);
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+
+	/* Ports registers */
+	sprintf(TextTmp , "P0   =   %.2X", cpu8051_ReadD(_P0_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "P1   =   %.2X", cpu8051_ReadD(_P1_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "P2   =   %.2X", cpu8051_ReadD(_P2_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "P3   =   %.2X", cpu8051_ReadD(_P3_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+
+	/* Misc Registers */
+	sprintf(TextTmp , "TCON =   %.2X", cpu8051_ReadD(_TCON_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "TMOD =   %.2X", cpu8051_ReadD(_TMOD_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "SCON =   %.2X", cpu8051_ReadD(_SCON_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "IE   =   %.2X", cpu8051_ReadD(_IE_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "IP   =   %.2X", cpu8051_ReadD(_IP_));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+
+	/* R0-R7 Registers in current Bank */
+	Rbank = cpu8051_ReadD(_PSW_) & 0x18;
+	sprintf(TextTmp , "Bank =   %.2X", Rbank);
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R0   =   %.2X", cpu8051_ReadD(_R0_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R1   =   %.2X", cpu8051_ReadD(_R1_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R2   =   %.2X", cpu8051_ReadD(_R2_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R3   =   %.2X", cpu8051_ReadD(_R3_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R4   =   %.2X", cpu8051_ReadD(_R4_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R5   =   %.2X", cpu8051_ReadD(_R5_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R6   =   %.2X", cpu8051_ReadD(_R6_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+	sprintf(TextTmp , "R7   =   %.2X", cpu8051_ReadD(_R7_ + Rbank));
+	gtk_clist_set_text(GTK_CLIST(regclist), row++, 0, TextTmp);
+
+	gtk_clist_select_row(GTK_CLIST(regclist), 0, 0);
+	gtk_clist_thaw(GTK_CLIST(regclist));
 }