Skip to content

Commit

Permalink
plugins/debug.c: replace deprecated gtk3 functions
Browse files Browse the repository at this point in the history 
use gtk_container_add instead of gtk_widget_reparent
use gtk_widget_get_preffered_size instead of gtk_widget_size_request
use gtk_widget_set_halign/valign instead of gtk_misc_set_alignment
fix indent

Signed-off-by: Cristina Suteu <[email protected]>
  • Loading branch information
@cristina-suteu
cristina-suteu committed Jan 8, 2024
1 parent 02fd5ac commit 86ac7d1
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions plugins/debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ static void draw_reg_map(int valid_register)
block_bit_option_signals();
/* Reset all bits to the "reseverd" status and clear all options */
for (i = (reg_bit_width - 1); i >= 0; i--){
gtk_widget_reparent(lbl_bits[i], hboxes[i]);
gtk_container_add(GTK_CONTAINER(hboxes[i]),lbl_bits[i]);
gtk_label_set_text((GtkLabel *)bit_descrip_list[i], "Reserved");
gtk_label_set_width_chars((GtkLabel *)bit_descrip_list[i], 13);
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(bit_comboboxes[i]));
Expand Down Expand Up @@ -1046,7 +1046,7 @@ static void draw_reg_map(int valid_register)
for (i = 0; i < p_reg->bgroup_cnt; i++){
p_bit = &p_reg->bgroup_list[i];
for (j = (p_bit->width - 1); j >= 0 ; j--){
gtk_widget_reparent(lbl_bits[p_bit->offset + j], hboxes[p_bit->offset]);
gtk_container_add(GTK_CONTAINER(hboxes[p_bit->offset]), lbl_bits[p_bit->offset + j]);
gtk_box_reorder_child((GtkBox *)hboxes[p_bit->offset], lbl_bits[p_bit->offset + j], -1);
if (j > 0)
gtk_widget_hide(elem_frames[p_bit->offset + j]);
Expand Down Expand Up @@ -1101,7 +1101,7 @@ static void draw_reg_map(int valid_register)
}

/* Set the height of the regmap scrolled window. */
gtk_widget_size_request(reg_map_container, &r);
gtk_widget_get_preferred_size(reg_map_container, NULL, &r);
gtk_widget_set_size_request(scrollwin_regmap, -1, r.height);

unblock_bit_option_signals();
Expand Down Expand Up @@ -1196,7 +1196,8 @@ static void create_reg_map(void)
gtk_widget_set_size_request(lbl_bits[i], 50, -1);
gtk_box_pack_start((GtkBox *)hboxes[i], lbl_bits[i], TRUE, FALSE,
0);
gtk_misc_set_alignment((GtkMisc *)lbl_bits[i], 0.5, 0.0);
gtk_widget_set_halign((GtkWidget*)lbl_bits[i], 0.5);
gtk_widget_set_valign((GtkWidget*)lbl_bits[i], 0.0);
bit_descrip_list[i] = gtk_label_new("Reserved");
gtk_box_pack_start((GtkBox *)vboxes[i], bit_descrip_list[i], TRUE, TRUE,
0);
Expand All @@ -1217,11 +1218,10 @@ static void create_reg_map(void)
gtk_widget_set_size_request(bit_no_read_lbl[i], 50, -1);
gtk_box_pack_start((GtkBox *)vboxes[i], bit_no_read_lbl[i],
FALSE, FALSE, 0);
gtk_misc_set_padding((GtkMisc *)bit_no_read_lbl[i], 0, 10);

gtk_label_set_line_wrap((GtkLabel *)bit_descrip_list[i], TRUE);
gtk_misc_set_alignment((GtkMisc *)bit_descrip_list[i], 0.5, 0.5);
gtk_misc_set_padding((GtkMisc *)bit_descrip_list[i], 0, 10);
gtk_widget_set_halign((GtkWidget*)bit_descrip_list[i], 0.5);
gtk_widget_set_valign((GtkWidget*)bit_descrip_list[i], 0.0);

combo_hid_list[i] = g_signal_connect(G_OBJECT(bit_comboboxes[i]),
"changed", G_CALLBACK(spin_or_combo_changed_cb), NULL);
Expand Down Expand Up @@ -1316,37 +1316,37 @@ static int get_reg_pos(int *regList, int reg_addr)
*/
static int update_regmap(int data)
{
int i;
int bg_value; /* bit group value */
int mask;
int opt_pos;
int new_data = 0;
reg *p_reg;
bgroup *p_bit;

p_reg = &soft_reg;
for (i = 0; i < p_reg->bgroup_cnt; i++){
p_bit = &p_reg->bgroup_list[i];
mask = (1ul << p_bit->width) - 1;
mask = mask << p_bit->offset;
bg_value = (data & mask) >> p_bit->offset;
if (p_bit->options_cnt > 0){
opt_pos = get_option_index(bg_value, p_bit);
if (opt_pos == -1)
opt_pos = 0;
gtk_combo_box_set_active((GtkComboBox *)(bit_comboboxes[p_bit->offset]), opt_pos);
new_data |= p_bit->option_list[opt_pos].value << p_bit->offset;
} else {
if (xmlStrcmp((xmlChar *)p_bit->name, (xmlChar *)"Reserved to 1")) {
gtk_spin_button_set_value((GtkSpinButton *) bit_spinbuttons[p_bit->offset], bg_value);
new_data |= bg_value << p_bit->offset;
int i;
int bg_value; /* bit group value */
int mask;
int opt_pos;
int new_data = 0;
reg *p_reg;
bgroup *p_bit;

p_reg = &soft_reg;
for (i = 0; i < p_reg->bgroup_cnt; i++){
p_bit = &p_reg->bgroup_list[i];
mask = (1ul << p_bit->width) - 1;
mask = mask << p_bit->offset;
bg_value = (data & mask) >> p_bit->offset;
if (p_bit->options_cnt > 0){
opt_pos = get_option_index(bg_value, p_bit);
if (opt_pos == -1)
opt_pos = 0;
gtk_combo_box_set_active((GtkComboBox *)(bit_comboboxes[p_bit->offset]), opt_pos);
new_data |= p_bit->option_list[opt_pos].value << p_bit->offset;
} else {
new_data |= 1ul << p_bit->offset;
if (xmlStrcmp((xmlChar *)p_bit->name, (xmlChar *)"Reserved to 1")) {
gtk_spin_button_set_value((GtkSpinButton *) bit_spinbuttons[p_bit->offset], bg_value);
new_data |= bg_value << p_bit->offset;
} else {
new_data |= 1ul << p_bit->offset;
}
}
}
}
}

return new_data;
return new_data;
}

/*
Expand Down

0 comments on commit 86ac7d1

Please sign in to comment.